open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove netty-4.1-common (#5985) 

* Remove netty-4.1-common

* reactor-netty-1.0
This commit is contained in:
Trask Stalnaker 2022-05-06 11:51:02 -07:00 committed by GitHub
parent 817afee505
commit cfe4a22307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts
View File

@ -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")
}

2
instrumentation/netty/netty-4.1/javaagent/build.gradle.kts
View File

@ -25,7 +25,7 @@ muzzle {
dependencies { dependencies {
library("io.netty:netty-codec-http:4.1.0.Final") 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-3.8:javaagent"))
testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent")) testInstrumentation(project(":instrumentation:netty:netty-4.0:javaagent"))

0
instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java → instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AttributeKeys.java
View File

0
instrumentation/netty/netty-4.1-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java → instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/InstrumentedAddressResolverGroup.java
View File

8
instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts
View File

@ -6,17 +6,21 @@ muzzle {
pass { pass {
group.set("io.projectreactor.netty") group.set("io.projectreactor.netty")
module.set("reactor-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 { fail {
group.set("io.projectreactor.netty") group.set("io.projectreactor.netty")
module.set("reactor-netty-http") module.set("reactor-netty-http")
versions.set("[1.0.0,)") versions.set("[1.0.0,)")
assertInverse.set(true)
excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
} }
} }
dependencies { 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") library("io.projectreactor.netty:reactor-netty:0.9.0.RELEASE")
testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent")) testInstrumentation(project(":instrumentation:reactor:reactor-netty:reactor-netty-1.0:javaagent"))

5
instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts
View File

@ -7,12 +7,15 @@ muzzle {
group.set("io.projectreactor.netty") group.set("io.projectreactor.netty")
module.set("reactor-netty") module.set("reactor-netty")
versions.set("[,1.0.0)") versions.set("[,1.0.0)")
assertInverse.set(true)
excludeInstrumentationModule("io.opentelemetry.javaagent.instrumentation.netty.v4_1.NettyInstrumentationModule")
} }
pass { pass {
group.set("io.projectreactor.netty") group.set("io.projectreactor.netty")
module.set("reactor-netty-http") module.set("reactor-netty-http")
versions.set("[1.0.0,)") versions.set("[1.0.0,)")
assertInverse.set(true) 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") compileOnly("com.google.auto.value:auto-value-annotations")
annotationProcessor("com.google.auto.value:auto-value") 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")) implementation(project(":instrumentation:reactor:reactor-3.1:library"))
library("io.projectreactor.netty:reactor-netty-http:1.0.0") library("io.projectreactor.netty:reactor-netty-http:1.0.0")

1
settings.gradle.kts
View File

@ -320,7 +320,6 @@ include(":instrumentation:mongo:mongo-common:testing")
include(":instrumentation:netty:netty-3.8:javaagent") include(":instrumentation:netty:netty-3.8:javaagent")
include(":instrumentation:netty:netty-4.0:javaagent") include(":instrumentation:netty:netty-4.0:javaagent")
include(":instrumentation:netty:netty-4.1: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-4-common:javaagent")
include(":instrumentation:netty:netty-common:javaagent") include(":instrumentation:netty:netty-common:javaagent")
include(":instrumentation:okhttp:okhttp-2.2:javaagent") include(":instrumentation:okhttp:okhttp-2.2:javaagent")