diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java index 01d92cfc810..5a299a30bda 100644 --- a/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java @@ -65,7 +65,7 @@ public static void trackCommitOffset( @Advice.This ConsumerCoordinator coordinator, @Advice.Return RequestFuture requestFuture, @Advice.Argument(0) final Map offsets) { - if (requestFuture.failed()) { + if (requestFuture == null || requestFuture.failed()) { return; } if (offsets == null) { @@ -75,6 +75,10 @@ public static void trackCommitOffset( InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class) .get(coordinator); + if (kafkaConsumerInfo == null) { + return; + } + String consumerGroup = kafkaConsumerInfo.getConsumerGroup(); Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata(); String clusterId = null;