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 #295 from DataDog/ark/enable_async_instrumentation 

Enable executor instrumentation by default
This commit is contained in:
Andrew Kent 2018-04-30 17:39:14 -07:00 committed by GitHub
parent 21e26d9463 3c7d4f5b13
commit 11ecff0726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dd-java-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy
View File

@ -3,9 +3,6 @@ import datadog.trace.agent.test.AgentTestRunner
import spock.lang.Unroll import spock.lang.Unroll
class AkkaActorTest extends AgentTestRunner { class AkkaActorTest extends AgentTestRunner {
static {
System.setProperty("dd.integration.java_concurrent.enabled", "true")
}
@Override @Override
void afterTest() { void afterTest() {

4
dd-java-agent/instrumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy
View File

@ -2,10 +2,6 @@ import datadog.opentracing.DDSpan
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
class ScalaInstrumentationTest extends AgentTestRunner { class ScalaInstrumentationTest extends AgentTestRunner {
static {
System.setProperty("dd.integration.java_concurrent.enabled", "true")
}
@Override @Override
void afterTest() { void afterTest() {
// Ignore failures to instrument sun proxy classes // Ignore failures to instrument sun proxy classes

5
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java
View File

@ -86,11 +86,6 @@ public final class ExecutorInstrumentation extends Instrumenter.Configurable {
super(EXEC_NAME); super(EXEC_NAME);
} }
@Override
protected boolean defaultEnabled() {
return false;
}
@Override @Override
public AgentBuilder apply(final AgentBuilder agentBuilder) { public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder return agentBuilder

5
dd-java-agent/instrumentation/java-concurrent/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java
View File

@ -69,11 +69,6 @@ public final class FutureInstrumentation extends Instrumenter.Configurable {
super(ExecutorInstrumentation.EXEC_NAME); super(ExecutorInstrumentation.EXEC_NAME);
} }
@Override
protected boolean defaultEnabled() {
return false;
}
@Override @Override
public AgentBuilder apply(final AgentBuilder agentBuilder) { public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder return agentBuilder

1
dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy
View File

@ -9,7 +9,6 @@ import spock.lang.Shared
class Play26Test extends AgentTestRunner { class Play26Test extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.java_concurrent.enabled", "true")
System.setProperty("dd.integration.play.enabled", "true") System.setProperty("dd.integration.play.enabled", "true")
} }

1
dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
View File

@ -9,7 +9,6 @@ import spock.lang.Shared
class Play24Test extends AgentTestRunner { class Play24Test extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.java_concurrent.enabled", "true")
System.setProperty("dd.integration.play.enabled", "true") System.setProperty("dd.integration.play.enabled", "true")
} }