From b4be2b18e4aaef5ff65bf386359d69d51d8a56fe Mon Sep 17 00:00:00 2001 From: Brian Devins-Suresh Date: Fri, 20 Mar 2020 14:57:08 -0400 Subject: [PATCH] Clarify muzzle specific checks --- .../netty38/ChannelFutureListenerInstrumentation.java | 1 + .../instrumentation/netty38/NettyChannelInstrumentation.java | 2 ++ .../netty38/NettyChannelPipelineInstrumentation.java | 1 + 3 files changed, 4 insertions(+) diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index 224d04650a..bb9cb66b62 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -41,6 +41,7 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.ChannelFutureListener", + // 3.10: NoSuchMethodError: org.jboss.netty.handler.codec.http.HttpRequest.setHeader "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); } diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java index 8bf14125a5..12ab34dd1d 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelInstrumentation.java @@ -34,7 +34,9 @@ public class NettyChannelInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.Channel", + // 3.7: cannot find symbol method headers() for type HttpRequest "org.jboss.netty.handler.codec.http.DefaultHttpHeaders", // Not in 3.7 + // 3.10: NoSuchMethodError: org.jboss.netty.handler.codec.http.HttpRequest.setHeader "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); } diff --git a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java index dea115942b..be466677ed 100644 --- a/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java +++ b/dd-java-agent/instrumentation/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/NettyChannelPipelineInstrumentation.java @@ -50,6 +50,7 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default { // Optimization for expensive typeMatcher. return hasClassesNamed( "org.jboss.netty.channel.ChannelPipeline", + // 3.10: NoSuchMethodError: org.jboss.netty.handler.codec.http.HttpRequest.setHeader "org.jboss.netty.channel.StaticChannelPipeline" // Not in 3.10 ); }