From 3c7d4f5b13d4e61e27594452a00f04de93423a5c Mon Sep 17 00:00:00 2001 From: Andrew Kent Date: Thu, 26 Apr 2018 15:46:11 -0700 Subject: [PATCH] Enable executor instrumentation by default Executor instrumentation does not need to be turned off by default because the instrumentation will not apply unless the TraceScope is activated. --- .../akka-testing/src/test/groovy/AkkaActorTest.groovy | 3 --- .../src/test/groovy/ScalaInstrumentationTest.groovy | 4 ---- .../java/concurrent/ExecutorInstrumentation.java | 5 ----- .../java/concurrent/FutureInstrumentation.java | 5 ----- .../play-2.6-testing/src/test/groovy/Play26Test.groovy | 1 - .../play-2.4/src/test/groovy/Play24Test.groovy | 1 - 6 files changed, 19 deletions(-) diff --git a/dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy b/dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy index 84451a3005..1a1b931a2a 100644 --- a/dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy +++ b/dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy @@ -3,9 +3,6 @@ import datadog.trace.agent.test.AgentTestRunner import spock.lang.Unroll class AkkaActorTest extends AgentTestRunner { - static { - System.setProperty("dd.integration.java_concurrent.enabled", "true") - } @Override void afterTest() { diff --git a/dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy b/dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy index 527daf4d96..3ff528cae8 100644 --- a/dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy @@ -2,10 +2,6 @@ import datadog.opentracing.DDSpan import datadog.trace.agent.test.AgentTestRunner class ScalaInstrumentationTest extends AgentTestRunner { - static { - System.setProperty("dd.integration.java_concurrent.enabled", "true") - } - @Override void afterTest() { // Ignore failures to instrument sun proxy classes diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java index 7646d8e8b0..36e4a04b77 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java @@ -86,11 +86,6 @@ public final class ExecutorInstrumentation extends Instrumenter.Configurable { super(EXEC_NAME); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java index d80fab4353..175f6a746d 100644 --- a/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java +++ b/dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java @@ -69,11 +69,6 @@ public final class FutureInstrumentation extends Instrumenter.Configurable { super(ExecutorInstrumentation.EXEC_NAME); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public AgentBuilder apply(final AgentBuilder agentBuilder) { return agentBuilder diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy index 049f00e637..1f6aa195bf 100644 --- a/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy +++ b/dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy @@ -9,7 +9,6 @@ import spock.lang.Shared class Play26Test extends AgentTestRunner { static { - System.setProperty("dd.integration.java_concurrent.enabled", "true") System.setProperty("dd.integration.play.enabled", "true") } diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy index d2f6f287b4..99f37cbd82 100644 --- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy +++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy @@ -9,7 +9,6 @@ import spock.lang.Shared class Play24Test extends AgentTestRunner { static { - System.setProperty("dd.integration.java_concurrent.enabled", "true") System.setProperty("dd.integration.play.enabled", "true") }