Skip to content

Commit 35451a2

Browse files
authored
Fix NPE when kafka consumer info is not available (#7195)
1 parent e82f7c8 commit 35451a2

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/ConsumerCoordinatorInstrumentation.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public static void trackCommitOffset(
6565
@Advice.This ConsumerCoordinator coordinator,
6666
@Advice.Return RequestFuture<Void> requestFuture,
6767
@Advice.Argument(0) final Map<TopicPartition, OffsetAndMetadata> offsets) {
68-
if (requestFuture.failed()) {
68+
if (requestFuture == null || requestFuture.failed()) {
6969
return;
7070
}
7171
if (offsets == null) {
@@ -75,6 +75,10 @@ public static void trackCommitOffset(
7575
InstrumentationContext.get(ConsumerCoordinator.class, KafkaConsumerInfo.class)
7676
.get(coordinator);
7777

78+
if (kafkaConsumerInfo == null) {
79+
return;
80+
}
81+
7882
String consumerGroup = kafkaConsumerInfo.getConsumerGroup();
7983
Metadata consumerMetadata = kafkaConsumerInfo.getClientMetadata();
8084
String clusterId = null;

0 commit comments

Comments
 (0)