From 4f853f5f0c543a61eb19359459d814f92cae593b Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 4 Nov 2019 13:41:33 -0800 Subject: [PATCH] Rename config key for beta/experimental instrumentation. Postfix the existing config names with `-beta` for `servlet` and `jdbc`. To avoid any risk that the config was explicitly enabled for an unrelated reason resulting in unexpected behavior when upgrading to the latest version. --- .../datadog/trace/instrumentation/jdbc/DataSourceDecorator.java | 2 +- .../trace/instrumentation/jdbc/DataSourceInstrumentation.java | 2 +- .../jdbc/src/test/groovy/JDBCInstrumentationTest.groovy | 2 +- .../servlet/dispatcher/RequestDispatcherDecorator.java | 2 +- .../servlet/dispatcher/RequestDispatcherInstrumentation.java | 2 +- .../servlet/dispatcher/ServletContextInstrumentation.java | 2 +- .../trace/instrumentation/servlet/filter/FilterDecorator.java | 2 +- .../instrumentation/servlet/filter/FilterInstrumentation.java | 2 +- .../instrumentation/servlet/http/HttpServletDecorator.java | 2 +- .../servlet/http/HttpServletInstrumentation.java | 2 +- .../servlet/http/HttpServletResponseDecorator.java | 2 +- .../servlet/http/HttpServletResponseInstrumentation.java | 2 +- .../instrumentation/servlet/src/test/groovy/FilterTest.groovy | 2 +- .../servlet/src/test/groovy/HttpServletResponseTest.groovy | 2 +- .../servlet/src/test/groovy/HttpServletTest.groovy | 2 +- .../servlet/src/test/groovy/RequestDispatcherTest.groovy | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java index 78e7fb2ca0..d4e75e1455 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceDecorator.java @@ -7,7 +7,7 @@ public class DataSourceDecorator extends BaseDecorator { @Override protected String[] instrumentationNames() { - return new String[] {"jdbc", "jdbc-datasource"}; + return new String[] {"jdbc-beta", "jdbc-datasource"}; } @Override diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index f8fca4461a..43091ae449 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -25,7 +25,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class DataSourceInstrumentation extends Instrumenter.Default { public DataSourceInstrumentation() { - super("jdbc", "jdbc-datasource"); + super("jdbc-beta", "jdbc-datasource"); } @Override diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy index be5bb81393..c3c6630d7b 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/JDBCInstrumentationTest.groovy @@ -26,7 +26,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class JDBCInstrumentationTest extends AgentTestRunner { static { - System.setProperty("dd.integration.jdbc.enabled", "true") + System.setProperty("dd.integration.jdbc-beta.enabled", "true") } @Shared diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java index b20f3c19e7..1e0550cfbe 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherDecorator.java @@ -7,7 +7,7 @@ public class RequestDispatcherDecorator extends BaseDecorator { @Override protected String[] instrumentationNames() { - return new String[] {"servlet", "servlet-dispatcher"}; + return new String[] {"servlet-beta", "servlet-dispatcher"}; } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index d05600564e..662ddc629b 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -31,7 +31,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class RequestDispatcherInstrumentation extends Instrumenter.Default { public RequestDispatcherInstrumentation() { - super("servlet", "servlet-dispatcher"); + super("servlet-beta", "servlet-dispatcher"); } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java index b252acf5c6..3426135c6b 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/ServletContextInstrumentation.java @@ -22,7 +22,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class ServletContextInstrumentation extends Instrumenter.Default { public ServletContextInstrumentation() { - super("servlet", "servlet-dispatcher"); + super("servlet-beta", "servlet-dispatcher"); } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java index d627403a40..c5dfc98f19 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterDecorator.java @@ -7,7 +7,7 @@ public class FilterDecorator extends BaseDecorator { @Override protected String[] instrumentationNames() { - return new String[] {"servlet", "servlet-filter"}; + return new String[] {"servlet-beta", "servlet-filter"}; } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index 6520624d53..f94814b908 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -27,7 +27,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class FilterInstrumentation extends Instrumenter.Default { public FilterInstrumentation() { - super("servlet", "servlet-filter"); + super("servlet-beta", "servlet-filter"); } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java index c9ad9b2875..b4a8d93324 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletDecorator.java @@ -7,7 +7,7 @@ public class HttpServletDecorator extends BaseDecorator { @Override protected String[] instrumentationNames() { - return new String[] {"servlet", "servlet-service"}; + return new String[] {"servlet-beta", "servlet-service"}; } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java index 83fbfc866f..faba631452 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java @@ -32,7 +32,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class HttpServletInstrumentation extends Instrumenter.Default { public HttpServletInstrumentation() { - super("servlet", "servlet-service"); + super("servlet-beta", "servlet-service"); } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java index be986c1ad3..782aa99247 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseDecorator.java @@ -7,7 +7,7 @@ public class HttpServletResponseDecorator extends BaseDecorator { @Override protected String[] instrumentationNames() { - return new String[] {"servlet", "servlet-response"}; + return new String[] {"servlet-beta", "servlet-response"}; } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index ca8f1ba734..68ae6400b0 100644 --- a/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -29,7 +29,7 @@ import net.bytebuddy.matcher.ElementMatcher; @AutoService(Instrumenter.class) public final class HttpServletResponseInstrumentation extends Instrumenter.Default { public HttpServletResponseInstrumentation() { - super("servlet", "servlet-response"); + super("servlet-beta", "servlet-response"); } @Override diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy index 6a6f7ecc5d..fc7ccb5aa5 100644 --- a/dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy +++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/FilterTest.groovy @@ -11,7 +11,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class FilterTest extends AgentTestRunner { static { - System.setProperty("dd.integration.servlet.enabled", "true") + System.setProperty("dd.integration.servlet-beta.enabled", "true") } def "test doFilter no-parent"() { diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy index 93b77c4efc..9073a8044b 100644 --- a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy +++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletResponseTest.groovy @@ -11,7 +11,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class HttpServletResponseTest extends AgentTestRunner { static { - System.setProperty("dd.integration.servlet.enabled", "true") + System.setProperty("dd.integration.servlet-beta.enabled", "true") } @Subject diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy index f2d650add0..1c5251509a 100644 --- a/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy +++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/HttpServletTest.groovy @@ -8,7 +8,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class HttpServletTest extends AgentTestRunner { static { - System.setProperty("dd.integration.servlet.enabled", "true") + System.setProperty("dd.integration.servlet-beta.enabled", "true") } def req = Mock(HttpServletRequest) { diff --git a/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy b/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy index 2cc2a28088..b5a5e0f3c6 100644 --- a/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy +++ b/dd-java-agent/instrumentation/servlet/src/test/groovy/RequestDispatcherTest.groovy @@ -8,7 +8,7 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class RequestDispatcherTest extends AgentTestRunner { static { - System.setProperty("dd.integration.servlet.enabled", "true") + System.setProperty("dd.integration.servlet-beta.enabled", "true") } def dispatcher = new RequestDispatcherUtils(Mock(HttpServletRequest), Mock(HttpServletResponse))