Merge pull request #455 from DataDog/tyler/enable-integrations

Enable netty by default
DataDog · Aug 23, 2018 · 5a62159 · 5a62159
2 parents 36b49c7 + 69c04ea
commit 5a62159
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 22 deletions.
diff --git a/.../main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/.../main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
@@ -43,11 +43,6 @@ public NettyChannelPipelineInstrumentation() {
     super("netty", "netty-4.0");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));

diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy
@@ -17,9 +17,6 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static org.asynchttpclient.Dsl.asyncHttpClient
 
 class Netty40ClientTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.netty.enabled", "true")
-  }
 
   @AutoCleanup
   @Shared

diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy
@@ -31,9 +31,6 @@ import okhttp3.Request
 import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class Netty40ServerTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.netty.enabled", "true")
-  }
 
   OkHttpClient client = OkHttpUtils.client()
 

diff --git a/.../main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java b/.../main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
@@ -43,11 +43,6 @@ public NettyChannelPipelineInstrumentation() {
     super("netty", "netty-4.1");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
     return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));

diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
@@ -18,9 +18,6 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
 import static org.asynchttpclient.Dsl.asyncHttpClient
 
 class Netty41ClientTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.netty.enabled", "true")
-  }
 
   @AutoCleanup
   @Shared

diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy
@@ -31,9 +31,6 @@ import okhttp3.Request
 import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
 
 class Netty41ServerTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.netty.enabled", "true")
-  }
 
   OkHttpClient client = OkHttpUtils.client()