Skip to content

Commit f806ecc

Browse files
Fix ratpack latest dep test in 1.32.x branch (#10585)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent fc364b5 commit f806ecc

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

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)