Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove netty-4.1-common #5985

Merged
merged 2 commits into from
May 6, 2022
Merged

Remove netty-4.1-common #5985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb29beb
Remove netty-4.1-common
trask May 5, 2022
ef430f2
reactor-netty-1.0
trask May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions instrumentation/netty/netty-4.1-common/javaagent/build.gradle.kts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion instrumentation/netty/netty-4.1/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
0 ...rumentation/netty/v4_1/AttributeKeys.java → ...rumentation/netty/v4_1/AttributeKeys.java
View file
Open in desktop
File renamed without changes.
0 ...4_1/InstrumentedAddressResolverGroup.java → ...4_1/InstrumentedAddressResolverGroup.java
View file
Open in desktop
File renamed without changes.
8 changes: 6 additions & 2 deletions instrumentation/reactor/reactor-netty/reactor-netty-0.9/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
5 changes: 4 additions & 1 deletion instrumentation/reactor/reactor-netty/reactor-netty-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down