File tree Expand file tree Collapse file tree 2 files changed +11
-1
lines changed
conventions/src/main/kotlin
testing-common/src/main/java/io/opentelemetry/instrumentation/testing Expand file tree Collapse file tree 2 files changed +11
-1
lines changed Original file line number Diff line number Diff 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 }
Original file line number Diff line number Diff line change 4242 */
4343public 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 ) {
You can’t perform that action at this time.
0 commit comments