Skip to content

Commit 586eea7

Browse files
fix(deps): update dependency io.netty:netty-bom to v4.1.104.final (#10058)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 68d7a2e commit 586eea7

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
122122
with(ctx.details) {
123123
if (id.group == "io.netty" && id.name != "netty") {
124124
if (id.version.startsWith("4.1.")) {
125-
belongsTo("io.netty:netty-bom:4.1.101.Final", false)
125+
belongsTo("io.netty:netty-bom:4.1.104.Final", false)
126126
} else if (id.version.startsWith("4.0.")) {
127127
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
128128
}

instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ tasks {
5555
jvmArgs("-Dotel.semconv-stability.opt-in=http")
5656
}
5757

58+
withType<Test>().configureEach {
59+
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
60+
}
61+
5862
check {
5963
dependsOn(testStableSemconv)
6064
}

instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,10 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
133133
optionsBuilder.setClientSpanErrorMapper(
134134
(uri, exception) -> {
135135
if (uri.toString().equals("https://192.0.2.1/")) {
136-
return new ConnectTimeoutException("connection timed out: /192.0.2.1:443");
136+
return new ConnectTimeoutException(
137+
"connection timed out"
138+
+ (Boolean.getBoolean("testLatestDeps") ? " after 2000 ms" : "")
139+
+ ": /192.0.2.1:443");
137140
} else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
138141
return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61");
139142
} else if (uri.getPath().equals("/read-timeout")) {

0 commit comments

Comments
 (0)