GH-2736: Fix Possible Observation NPEs

Resolves #2736
spring-projects · Jul 12, 2023 · a067eaa · a067eaa
1 parent f079ed3
commit a067eaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/...rc/main/java/org/springframework/kafka/support/micrometer/KafkaRecordReceiverContext.java b/...rc/main/java/org/springframework/kafka/support/micrometer/KafkaRecordReceiverContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public class KafkaRecordReceiverContext extends ReceiverContext<ConsumerRecord<?
 	public KafkaRecordReceiverContext(ConsumerRecord<?, ?> record, String listenerId, Supplier<String> clusterId) {
 		super((carrier, key) -> {
 			Header header = carrier.headers().lastHeader(key);
-			if (header == null) {
+			if (header == null || header.value() == null) {
 				return null;
 			}
 			return new String(header.value(), StandardCharsets.UTF_8);

diff --git a/.../src/main/java/org/springframework/kafka/support/micrometer/KafkaRecordSenderContext.java b/.../src/main/java/org/springframework/kafka/support/micrometer/KafkaRecordSenderContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,8 @@ public class KafkaRecordSenderContext extends SenderContext<ProducerRecord<?, ?>
 	private final ProducerRecord<?, ?> record;
 
 	public KafkaRecordSenderContext(ProducerRecord<?, ?> record, String beanName, Supplier<String> clusterId) {
-		super((carrier, key, value) -> record.headers().add(key, value.getBytes(StandardCharsets.UTF_8)));
+		super((carrier, key, value) -> record.headers().add(key,
+				value == null ? null : value.getBytes(StandardCharsets.UTF_8)));
 		setCarrier(record);
 		this.beanName = beanName;
 		this.record = record;