Fix NPE when kafka consumer info is not available (#7195)

DataDog · Jun 14, 2024 · 35451a2 · 35451a2
1 parent e82f7c8
commit 35451a2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.../java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java b/.../java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java
@@ -65,7 +65,7 @@ public static void trackCommitOffset(
         @Advice.This ConsumerCoordinator coordinator,
         @Advice.Return RequestFuture<Void> requestFuture,
         @Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> 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;