Skip to content

Commit 5016efb

Browse files
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 <[email protected]>
1 parent 7e3d81f commit 5016efb

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ abstract class NettyAlignmentRule : ComponentMetadataRule {
143143
with(ctx.details) {
144144
if (id.group == "io.netty" && id.name != "netty") {
145145
if (id.version.startsWith("4.1.")) {
146-
belongsTo("io.netty:netty-bom:4.1.119.Final", false)
146+
belongsTo("io.netty:netty-bom:4.1.121.Final", false)
147147
} else if (id.version.startsWith("4.0.")) {
148148
belongsTo("io.netty:netty-bom:4.0.56.Final", false)
149149
}

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@
4242
*/
4343
public abstract class InstrumentationTestRunner {
4444

45+
static {
46+
// In netty-4.1.121.Final unsafe usage is disabled by default on jdk24. This triggers using
47+
// a different pooled buffer implementation which apparently breaks when initializing ssl. Here
48+
// we switch to unpooled buffers to avoid that bug. We do this here because this code is
49+
// executed early for both agent and library tests.
50+
if (Double.parseDouble(System.getProperty("java.specification.version")) >= 24) {
51+
System.setProperty("io.opentelemetry.testing.internal.io.netty.allocator.type", "unpooled");
52+
}
53+
}
54+
4555
private final TestInstrumenters testInstrumenters;
4656

4757
protected InstrumentationTestRunner(OpenTelemetry openTelemetry) {

0 commit comments

Comments
 (0)