Remove some no longer needed netty instrumentation (#7732)

Will follow-up with some related clean-up of `WRITE_CONTEXT` (wanted to split the changes for clearer review).
open-telemetry · Feb 6, 2023 · 9979d8f · 9979d8f
1 parent e638201
commit 9979d8f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 115 deletions.
diff --git a/...in/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelInstrumentation.java b/...in/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/ChannelInstrumentation.java
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java b/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java
@@ -35,7 +35,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new BootstrapInstrumentation(),
-        new ChannelInstrumentation(),
         new NettyFutureInstrumentation(),
         new NettyChannelPipelineInstrumentation(),
         new AbstractChannelHandlerContextInstrumentation());

diff --git a/...in/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelInstrumentation.java b/...in/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/ChannelInstrumentation.java
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java b/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java
@@ -32,7 +32,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(
         new BootstrapInstrumentation(),
-        new ChannelInstrumentation(),
         new NettyFutureInstrumentation(),
         new NettyChannelPipelineInstrumentation(),
         new AbstractChannelHandlerContextInstrumentation());