Skip to content

Enable Play, Hystrix, and JaxRS Client Instrumentation #332

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 3 commits into from
May 23, 2018
Merged

Enable Play, Hystrix, and JaxRS Client Instrumentation #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c11de30
Enable Play Instrumentation
May 22, 2018
066aac7
Enable Hystrix
May 23, 2018
d90de57
Enable JaxRS Instrumentation
May 23, 2018
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
5 changes: 0 additions & 5 deletions ....4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ public HystrixCommandInstrumentation() {
super("hystrix");
}

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

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

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

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
9 changes: 4 additions & 5 deletions dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
import static datadog.trace.agent.test.TestUtils.runUnderTrace

class HystrixTest extends AgentTestRunner {
static {
System.setProperty("dd.integration.hystrix.enabled", "true")
// Uncomment for debugging:
// System.setProperty("hystrix.command.default.execution.timeout.enabled", "false")
}
// Uncomment for debugging:
// static {
// System.setProperty("hystrix.command.default.execution.timeout.enabled", "false")
// }

def "test command #action"() {
setup:
Expand Down
5 changes: 0 additions & 5 deletions ...-client/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ public JaxRsClientInstrumentation() {
super("jax-rs", "jaxrs", "jax-rs-client");
}

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

@Override
protected AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ import java.util.concurrent.atomic.AtomicReference
import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack

class JaxRsClientTest extends AgentTestRunner {
static {
System.setProperty("dd.integration.jax-rs.enabled", "true")
}

def receivedHeaders = new AtomicReference<Headers>()
def server = ratpack {
handlers {
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ import play.test.Helpers
import spock.lang.Shared

class Play26Test extends AgentTestRunner {
static {
System.setProperty("dd.integration.play.enabled", "true")
}

@Shared
int port = TestUtils.randomOpenPort()
@Shared
Expand Down
5 changes: 0 additions & 5 deletions ...tation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ public PlayInstrumentation() {
super("play");
}

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

@Override
public AgentBuilder apply(final AgentBuilder agentBuilder) {
return agentBuilder
Expand Down
4 changes: 0 additions & 4 deletions 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 @@ -8,10 +8,6 @@ import play.test.Helpers
import spock.lang.Shared

class Play24Test extends AgentTestRunner {
static {
System.setProperty("dd.integration.play.enabled", "true")
}

@Shared
int port = TestUtils.randomOpenPort()
@Shared
Expand Down