Prevent possible NPE calculating Kafka record header size (#8292)

ygree · web-flow · commit e3793055b54b · 2025-01-28T08:40:55.000+01:00
diff --git a/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java b/dd-java-agent/instrumentation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java
@@ -14,7 +14,8 @@ public static long computePayloadSizeBytes(ConsumerRecord<?, ?> val) {
     Headers headers = val.headers();
     if (headers != null)
       for (Header h : headers) {
-        headersSize += h.value().length + h.key().getBytes(StandardCharsets.UTF_8).length;
+        int valueSize = h.value() == null ? 0 : h.value().length;
+        headersSize += valueSize + h.key().getBytes(StandardCharsets.UTF_8).length;
       }
     return headersSize + val.serializedKeySize() + val.serializedValueSize();
   }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ public static long computePayloadSizeBytes(ConsumerRecord<?, ?> val) {`
`14`	`14`	`Headers headers = val.headers();`
`15`	`15`	`if (headers != null)`
`16`	`16`	`for (Header h : headers) {`
`17`		`- headersSize += h.value().length + h.key().getBytes(StandardCharsets.UTF_8).length;`
	`17`	`+ int valueSize = h.value() == null ? 0 : h.value().length;`
	`18`	`+ headersSize += valueSize + h.key().getBytes(StandardCharsets.UTF_8).length;`
`18`	`19`	`}`
`19`	`20`	`return headersSize + val.serializedKeySize() + val.serializedValueSize();`
`20`	`21`	`}`