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

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 <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2023-12-15 11:42:52 -08:00 committed by GitHub
parent 68d7a2eebe
commit 586eea7ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conventions/src/main/kotlin/otel.java-conventions.gradle.kts
View File

@ -122,7 +122,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
with(ctx.details) { with(ctx.details) {
if (id.group == "io.netty" && id.name != "netty") { if (id.group == "io.netty" && id.name != "netty") {
if (id.version.startsWith("4.1.")) { 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.")) { } else if (id.version.startsWith("4.0.")) {
belongsTo("io.netty:netty-bom:4.0.56.Final", false) belongsTo("io.netty:netty-bom:4.0.56.Final", false)
} }

4
instrumentation/ratpack/ratpack-1.4/javaagent/build.gradle.kts
View File

@ -55,6 +55,10 @@ tasks {
jvmArgs("-Dotel.semconv-stability.opt-in=http") jvmArgs("-Dotel.semconv-stability.opt-in=http")
} }
withType<Test>().configureEach {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}
check { check {
dependsOn(testStableSemconv) dependsOn(testStableSemconv)
} }

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

@ -133,7 +133,10 @@ public abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTe
optionsBuilder.setClientSpanErrorMapper( optionsBuilder.setClientSpanErrorMapper(
(uri, exception) -> { (uri, exception) -> {
if (uri.toString().equals("https://192.0.2.1/")) { 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/")) { } else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61"); return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61");
} else if (uri.getPath().equals("/read-timeout")) { } else if (uri.getPath().equals("/read-timeout")) {