Remove netty-4.1-common (open-telemetry#5985)

* Remove netty-4.1-common * reactor-netty-1.0
RashmiRam · May 23, 2022 · 8f55a6c · 8f55a6c
1 parent c073c9f
commit 8f55a6c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 14 deletions.
diff --git a/instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts
diff --git a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts
@@ -25,7 +25,7 @@ muzzle {
 
 dependencies {
   library("io.netty:netty-codec-http:4.1.0.Final")
-  api(project(":instrumentation:netty:netty-4.1-common:javaagent"))
+  api(project(":instrumentation:netty:netty-4-common:javaagent"))
 
   testInstrumentation(project(":instrumentation:netty:netty-3.8:javaagent"))
   testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

diff --git a/...rumentation/netty/v4_1/AttributeKeys.java → ...rumentation/netty/v4_1/AttributeKeys.java b/...rumentation/netty/v4_1/AttributeKeys.java → ...rumentation/netty/v4_1/AttributeKeys.java
diff --git a/...4_1/InstrumentedAddressResolverGroup.java → ...4_1/InstrumentedAddressResolverGroup.java b/...4_1/InstrumentedAddressResolverGroup.java → ...4_1/InstrumentedAddressResolverGroup.java
diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts
@@ -6,17 +6,21 @@ muzzle {
   pass {
     group.set("io.projectreactor.netty")
     module.set("reactor-netty")
-    versions.set("[0.9.0.RELEASE,1.0.0)")
+    versions.set("[0.8.2.RELEASE,1.0.0)")
+    assertInverse.set(true)
+    excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
   }
   fail {
     group.set("io.projectreactor.netty")
     module.set("reactor-netty-http")
     versions.set("[1.0.0,)")
+    assertInverse.set(true)
+    excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
   }
 }
 
 dependencies {
-  implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
+  implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
   library("io.projectreactor.netty:reactor-netty:0.9.0.RELEASE")
 
   testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent"))

diff --git a/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts b/instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts
@@ -7,20 +7,23 @@ muzzle {
     group.set("io.projectreactor.netty")
     module.set("reactor-netty")
     versions.set("[,1.0.0)")
+    assertInverse.set(true)
+    excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
   }
   pass {
     group.set("io.projectreactor.netty")
     module.set("reactor-netty-http")
     versions.set("[1.0.0,)")
     assertInverse.set(true)
+    excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
   }
 }
 
 dependencies {
   compileOnly("com.google.auto.value:auto-value-annotations")
   annotationProcessor("com.google.auto.value:auto-value")
 
-  implementation(project(":instrumentation:netty:netty-4.1-common:javaagent"))
+  implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
   implementation(project(":instrumentation:reactor:reactor-3.1:library"))
 
   library("io.projectreactor.netty:reactor-netty-http:1.0.0")

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -320,7 +320,6 @@ include(":instrumentation:mongo:mongo-common:testing")
 include(":instrumentation:netty:netty-3.8:javaagent")
 include(":instrumentation:netty:netty-4.0:javaagent")
 include(":instrumentation:netty:netty-4.1:javaagent")
-include(":instrumentation:netty:netty-4.1-common:javaagent")
 include(":instrumentation:netty:netty-4-common:javaagent")
 include(":instrumentation:netty:netty-common:javaagent")
 include(":instrumentation:okhttp:okhttp-2.2:javaagent")