From 586eea7ed91e90279a809611872a7e08202313b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:42:52 -0800 Subject: [PATCH] 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 --- conventions/src/main/kotlin/otel.java-conventions.gradle.kts | 2 +- .../ratpack/ratpack-1.4/javaagent/build.gradle.kts | 4 ++++ .../ratpack/client/AbstractRatpackHttpClientTest.java | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts index f182515463..324b76366d 100644 --- a/conventions/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/conventions/src/main/kotlin/otel.java-conventions.gradle.kts @@ -122,7 +122,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule { with(ctx.details) { if (id.group == "io.netty" && id.name != "netty") { if (id.version.startsWith("4.1.")) { - belongsTo("io.netty:netty-bom:4.1.101.Final", false) + belongsTo("io.netty:netty-bom:4.1.104.Final", false) } else if (id.version.startsWith("4.0.")) { belongsTo("io.netty:netty-bom:4.0.56.Final", false) } diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts b/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts index fdf6590173..8ff9e2107a 100644 --- a/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts +++ b/instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts @@ -55,6 +55,10 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=http") } + withType().configureEach { + systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean) + } + check { dependsOn(testStableSemconv) } diff --git a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java index cb8e575b97..bde6ead5f3 100644 --- a/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java +++ b/instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java @@ -133,7 +133,10 @@ public abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTe optionsBuilder.setClientSpanErrorMapper( (uri, exception) -> { if (uri.toString().equals("https://192.0.2.1/")) { - return new ConnectTimeoutException("connection timed out: /192.0.2.1:443"); + return new ConnectTimeoutException( + "connection timed out" + + (Boolean.getBoolean("testLatestDeps") ? " after 2000 ms" : "") + + ": /192.0.2.1:443"); } else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) { return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61"); } else if (uri.getPath().equals("/read-timeout")) {