Skip to content

Commit 5d2a36e

Browse files
authored
Disable netty instrumentation on spring webflux (#208)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 974df5e commit 5d2a36e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/NettyChannelPipelineInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
2222
import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
2323
import static net.bytebuddy.matcher.ElementMatchers.named;
24+
import static net.bytebuddy.matcher.ElementMatchers.not;
2425
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
2526

2627
import io.netty.channel.ChannelHandler;
@@ -45,7 +46,8 @@ public class NettyChannelPipelineInstrumentation implements TypeInstrumentation
4546

4647
@Override
4748
public ElementMatcher<ClassLoader> classLoaderOptimization() {
48-
return hasClassesNamed("io.netty.channel.ChannelPipeline");
49+
return hasClassesNamed("io.netty.channel.ChannelPipeline")
50+
.and(not(hasClassesNamed("org.springframework.web.reactive.HandlerAdapter")));
4951
}
5052

5153
@Override

instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/NettyChannelPipelineInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
2222
import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
2323
import static net.bytebuddy.matcher.ElementMatchers.named;
24+
import static net.bytebuddy.matcher.ElementMatchers.not;
2425
import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
2526

2627
import io.netty.channel.ChannelHandler;
@@ -45,7 +46,8 @@ public class NettyChannelPipelineInstrumentation implements TypeInstrumentation
4546

4647
@Override
4748
public ElementMatcher<ClassLoader> classLoaderOptimization() {
48-
return hasClassesNamed("io.netty.channel.ChannelPipeline");
49+
return hasClassesNamed("io.netty.channel.ChannelPipeline")
50+
.and(not(hasClassesNamed("org.springframework.web.reactive.HandlerAdapter")));
4951
}
5052

5153
@Override

0 commit comments

Comments
 (0)