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

DataDog · Jan 28, 2025 · e379305 · e379305
1 parent 8c6ec67
commit e379305
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...entation/kafka-common/src/main/java/datadog/trace/instrumentation/kafka_common/Utils.java b/...entation/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();
   }