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.121.final (#13760) 

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] 2025-05-08 08:27:41 -07:00 committed by GitHub
parent 7e3d81f848
commit 5016efb831
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 1 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

@ -143,7 +143,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.119.Final", false)
belongsTo("io.netty:netty-bom:4.1.121.Final", false)
} else if (id.version.startsWith("4.0.")) {
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
}

10
testing-common/src/main/java/io/opentelemetry/instrumentation/testing/InstrumentationTestRunner.java
View File

@ -42,6 +42,16 @@ import org.awaitility.core.ConditionTimeoutException;
*/
public abstract class InstrumentationTestRunner {
static {
// In netty-4.1.121.Final unsafe usage is disabled by default on jdk24. This triggers using
// a different pooled buffer implementation which apparently breaks when initializing ssl. Here
// we switch to unpooled buffers to avoid that bug. We do this here because this code is
// executed early for both agent and library tests.
if (Double.parseDouble(System.getProperty("java.specification.version")) >= 24) {
System.setProperty("io.opentelemetry.testing.internal.io.netty.allocator.type", "unpooled");
}
}
private final TestInstrumenters testInstrumenters;
protected InstrumentationTestRunner(OpenTelemetry openTelemetry) {