diff --git a/instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts deleted file mode 100644 index 370c74a584e1..000000000000 --- a/instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id("otel.javaagent-instrumentation") -} - -dependencies { - api(project(":instrumentation:netty:netty-4-common:javaagent")) - - compileOnly("io.netty:netty-codec-http:4.1.0.Final") -} diff --git a/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts b/instrumentation/netty/netty-4.1/javaagent/build.gradle.kts index f66c4ca38c6e..18b4a3181fc3 100644 --- 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/instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java similarity index 100% rename from instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java rename to instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java diff --git a/instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java b/instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java similarity index 100% rename from instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java rename to instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_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 index 7aa8951298bb..d09df7f39573 100644 --- 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 index 17d450e5fc69..c4947e3d44d2 100644 --- 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,12 +7,15 @@ 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") } } @@ -20,7 +23,7 @@ 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 index a3fc0cbdabca..120713163c05 100644 --- 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")