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 index 61ec23b6c59..935692fee4c 100644 --- 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(); }