Skip to content

Enable executor instrumentation by default #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
realark merged 1 commit into from
May 1, 2018
Merged

Enable executor instrumentation by default #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...a-agent/instrumentation/java-concurrent/akka-testing/src/test/groovy/AkkaActorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 0 additions & 4 deletions ...rumentation/java-concurrent/scala-testing/src/test/groovy/ScalaInstrumentationTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .../src/main/java/datadog/trace/instrumentation/java/concurrent/ExecutorInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,6 @@ public ExecutorInstrumentation() {
super(EXEC_NAME);
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
5 changes: 0 additions & 5 deletions ...nt/src/main/java/datadog/trace/instrumentation/java/concurrent/FutureInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ public FutureInstrumentation() {
super(ExecutorInstrumentation.EXEC_NAME);
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/play-2.4/play-2.6-testing/src/test/groovy/Play26Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down