move netty-* to open-telemetry#11559

SylvainJuge · Jun 12, 2024 · ae87603 · ae87603
1 parent cd85238
commit ae87603
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java b/...ava/io/opentelemetry/javaagent/instrumentation/netty/v3_8/NettyInstrumentationModule.java
@@ -11,13 +11,11 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class NettyInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class NettyInstrumentationModule extends InstrumentationModule {
   public NettyInstrumentationModule() {
     super("netty", "netty-3.8");
   }
@@ -27,11 +25,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     return hasClassesNamed("org.jboss.netty.handler.codec.http.HttpMessage");
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "netty";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java b/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_0/NettyInstrumentationModule.java
@@ -12,14 +12,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.javaagent.instrumentation.netty.v4.common.NettyFutureInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class NettyInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class NettyInstrumentationModule extends InstrumentationModule {
   public NettyInstrumentationModule() {
     super("netty", "netty-4.0");
   }
@@ -33,11 +31,6 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
             not(hasClassesNamed("io.netty.handler.codec.http.CombinedHttpHeaders")));
   }
 
-  @Override
-  public String getModuleGroup() {
-    return "netty";
-  }
-
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(

diff --git a/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java b/...ava/io/opentelemetry/javaagent/instrumentation/netty/v4_1/NettyInstrumentationModule.java
@@ -11,14 +11,12 @@
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
-import io.opentelemetry.javaagent.extension.instrumentation.internal.ExperimentalInstrumentationModule;
 import io.opentelemetry.javaagent.instrumentation.netty.v4.common.NettyFutureInstrumentation;
 import java.util.List;
 import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
-public class NettyInstrumentationModule extends InstrumentationModule
-    implements ExperimentalInstrumentationModule {
+public class NettyInstrumentationModule extends InstrumentationModule {
   public NettyInstrumentationModule() {
     super("netty", "netty-4.1");
   }
@@ -31,8 +29,10 @@ public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
   }
 
   @Override
-  public String getModuleGroup() {
-    return "netty";
+  public boolean isIndyModule() {
+    // netty instrumentation classes are used in other instrumentations which causes class cast
+    // exceptions
+    return false;
   }
 
   @Override