From 6b71340b5bbcd92081a10f166732cc74cb49139b Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 24 Aug 2018 09:32:51 +1000 Subject: [PATCH] Enable new netty instrumentation by default Enabled the others in a separate PR and forgot to come back and enable this. --- .../netty40/ChannelFutureListenerInstrumentation.java | 5 ----- .../netty41/ChannelFutureListenerInstrumentation.java | 5 ----- 2 files changed, 10 deletions(-) diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index e93085ee171..cf304035612 100644 --- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -31,11 +31,6 @@ public ChannelFutureListenerInstrumentation() { super("netty", "netty-4.0"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public ElementMatcher typeMatcher() { return not(isInterface()) diff --git a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 2ed585e401a..a7763bb0964 100644 --- a/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -31,11 +31,6 @@ public ChannelFutureListenerInstrumentation() { super("netty", "netty-4.0"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public ElementMatcher typeMatcher() { return not(isInterface())