Skip to content
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

Jump to bottom

Enable netty by default #455

Merged
merged 1 commit into from
Aug 23, 2018
Merged

Enable netty by default #455

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 0 additions & 5 deletions .../main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ public NettyChannelPipelineInstrumentation() {
super("netty", "netty-4.1");
}

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

@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));
Expand Down
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
import static org.asynchttpclient.Dsl.asyncHttpClient

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

@AutoCleanup
@Shared
Expand Down
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ import okhttp3.Request
import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces

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

OkHttpClient client = OkHttpUtils.client()

Expand Down
5 changes: 0 additions & 5 deletions .../main/java/datadog/trace/instrumentation/netty41/NettyChannelPipelineInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ public NettyChannelPipelineInstrumentation() {
super("netty", "netty-4.1");
}

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

@Override
public ElementMatcher<TypeDescription> typeMatcher() {
return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));
Expand Down
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer
import static org.asynchttpclient.Dsl.asyncHttpClient

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

@AutoCleanup
@Shared
Expand Down
3 changes: 0 additions & 3 deletions dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ import okhttp3.Request
import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces

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

OkHttpClient client = OkHttpUtils.client()

Expand Down