From 6eec23c00bc2a3fd0e8c7d5208168b716e94a319 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 9 Aug 2023 15:07:36 +0300 Subject: [PATCH] Fix npe with pulsar and ssl (#9166) --- .../common/internal/client/NettySslInstrumentationHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslInstrumentationHandler.java b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslInstrumentationHandler.java index 24731fc427..774181808f 100644 --- a/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslInstrumentationHandler.java +++ b/instrumentation/netty/netty-4-common/library/src/main/java/io/opentelemetry/instrumentation/netty/v4/common/internal/client/NettySslInstrumentationHandler.java @@ -94,7 +94,8 @@ public final class NettySslInstrumentationHandler extends ChannelDuplexHandler { promise.addListener( future -> { // there won't be any SSL handshake if the channel fails to connect - if (!future.isSuccess()) { + // give up when channelRegistered wasn't called and parentContext is null + if (!future.isSuccess() || parentContext == null) { return; } request = NettySslRequest.create(ctx.channel());