open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1080 from DataDog/tyler/rename-beta-configs 

Rename config key for beta/experimental instrumentation.
This commit is contained in:
Tyler Benson 2019-11-05 08:44:33 -08:00 committed by GitHub
parent da8aa5c7c1 4f853f5f0c
commit 2d3b644c84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java
View File

@ -7,7 +7,7 @@ public class DataSourceDecorator extends BaseDecorator {
@Override @Override
protected String[] instrumentationNames() { protected String[] instrumentationNames() {
return new String[] {"jdbc", "jdbc-datasource"}; return new String[] {"jdbc-beta", "jdbc-datasource"};
} }
@Override @Override

2
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java
View File

@ -25,7 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class DataSourceInstrumentation extends Instrumenter.Default { public final class DataSourceInstrumentation extends Instrumenter.Default {
public DataSourceInstrumentation() { public DataSourceInstrumentation() {
super("jdbc", "jdbc-datasource"); super("jdbc-beta", "jdbc-datasource");
} }
@Override @Override

2
dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy
View File

@ -26,7 +26,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
class JDBCInstrumentationTest extends AgentTestRunner { class JDBCInstrumentationTest extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.jdbc.enabled", "true") System.setProperty("dd.integration.jdbc-beta.enabled", "true")
} }
@Shared @Shared

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java
View File

@ -7,7 +7,7 @@ public class RequestDispatcherDecorator extends BaseDecorator {
@Override @Override
protected String[] instrumentationNames() { protected String[] instrumentationNames() {
return new String[] {"servlet", "servlet-dispatcher"}; return new String[] {"servlet-beta", "servlet-dispatcher"};
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java
View File

@ -31,7 +31,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class RequestDispatcherInstrumentation extends Instrumenter.Default { public final class RequestDispatcherInstrumentation extends Instrumenter.Default {
public RequestDispatcherInstrumentation() { public RequestDispatcherInstrumentation() {
super("servlet", "servlet-dispatcher"); super("servlet-beta", "servlet-dispatcher");
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java
View File

@ -22,7 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class ServletContextInstrumentation extends Instrumenter.Default { public final class ServletContextInstrumentation extends Instrumenter.Default {
public ServletContextInstrumentation() { public ServletContextInstrumentation() {
super("servlet", "servlet-dispatcher"); super("servlet-beta", "servlet-dispatcher");
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java
View File

@ -7,7 +7,7 @@ public class FilterDecorator extends BaseDecorator {
@Override @Override
protected String[] instrumentationNames() { protected String[] instrumentationNames() {
return new String[] {"servlet", "servlet-filter"}; return new String[] {"servlet-beta", "servlet-filter"};
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java
View File

@ -27,7 +27,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class FilterInstrumentation extends Instrumenter.Default { public final class FilterInstrumentation extends Instrumenter.Default {
public FilterInstrumentation() { public FilterInstrumentation() {
super("servlet", "servlet-filter"); super("servlet-beta", "servlet-filter");
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java
View File

@ -7,7 +7,7 @@ public class HttpServletDecorator extends BaseDecorator {
@Override @Override
protected String[] instrumentationNames() { protected String[] instrumentationNames() {
return new String[] {"servlet", "servlet-service"}; return new String[] {"servlet-beta", "servlet-service"};
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java
View File

@ -32,7 +32,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class HttpServletInstrumentation extends Instrumenter.Default { public final class HttpServletInstrumentation extends Instrumenter.Default {
public HttpServletInstrumentation() { public HttpServletInstrumentation() {
super("servlet", "servlet-service"); super("servlet-beta", "servlet-service");
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java
View File

@ -7,7 +7,7 @@ public class HttpServletResponseDecorator extends BaseDecorator {
@Override @Override
protected String[] instrumentationNames() { protected String[] instrumentationNames() {
return new String[] {"servlet", "servlet-response"}; return new String[] {"servlet-beta", "servlet-response"};
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java
View File

@ -29,7 +29,7 @@ import net.bytebuddy.matcher.ElementMatcher;
@AutoService(Instrumenter.class) @AutoService(Instrumenter.class)
public final class HttpServletResponseInstrumentation extends Instrumenter.Default { public final class HttpServletResponseInstrumentation extends Instrumenter.Default {
public HttpServletResponseInstrumentation() { public HttpServletResponseInstrumentation() {
super("servlet", "servlet-response"); super("servlet-beta", "servlet-response");
} }
@Override @Override

2
dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy
View File

@ -11,7 +11,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
class FilterTest extends AgentTestRunner { class FilterTest extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.servlet.enabled", "true") System.setProperty("dd.integration.servlet-beta.enabled", "true")
} }
def "test doFilter no-parent"() { def "test doFilter no-parent"() {

2
dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy
View File

@ -11,7 +11,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
class HttpServletResponseTest extends AgentTestRunner { class HttpServletResponseTest extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.servlet.enabled", "true") System.setProperty("dd.integration.servlet-beta.enabled", "true")
} }
@Subject @Subject

2
dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy
View File

@ -8,7 +8,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
class HttpServletTest extends AgentTestRunner { class HttpServletTest extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.servlet.enabled", "true") System.setProperty("dd.integration.servlet-beta.enabled", "true")
} }
def req = Mock(HttpServletRequest) { def req = Mock(HttpServletRequest) {

2
dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy
View File

@ -8,7 +8,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
class RequestDispatcherTest extends AgentTestRunner { class RequestDispatcherTest extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.servlet.enabled", "true") System.setProperty("dd.integration.servlet-beta.enabled", "true")
} }
def dispatcher = new RequestDispatcherUtils(Mock(HttpServletRequest), Mock(HttpServletResponse)) def dispatcher = new RequestDispatcherUtils(Mock(HttpServletRequest), Mock(HttpServletResponse))