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.
MODIFY
dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy
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() {

MODIFY
dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy
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

MODIFY
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java
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

MODIFY
dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy
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")
}

MODIFY
dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
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")
}

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.