From 7c7b150b83857b22a9cbc4a3cc974d013ea2eacb Mon Sep 17 00:00:00 2001
From: Chris Bono <cbono@vmware.com>
Date: Mon, 3 Oct 2022 16:05:26 -0500
Subject: [PATCH] Fix breaking changes from Micrometer Tracing snapshot

---
 .../java/org/springframework/pulsar/core/PulsarTemplate.java    | 2 +-
 .../pulsar/listener/DefaultPulsarMessageListenerContainer.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java b/spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java
index 105d8530..4595c069 100644
--- a/spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java
+++ b/spring-pulsar/src/main/java/org/springframework/pulsar/core/PulsarTemplate.java
@@ -216,7 +216,7 @@ public class PulsarTemplate<T>
 		}
 		else {
 			observation = PulsarTemplateObservation.TEMPLATE_OBSERVATION.observation(this.observationConvention,
-					DefaultPulsarTemplateObservationConvention.INSTANCE, senderContext, this.observationRegistry);
+					DefaultPulsarTemplateObservationConvention.INSTANCE, () -> senderContext, this.observationRegistry);
 		}
 		return observation;
 	}
diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java b/spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java
index aa61fed8..26df8f2f 100644
--- a/spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java
+++ b/spring-pulsar/src/main/java/org/springframework/pulsar/listener/DefaultPulsarMessageListenerContainer.java
@@ -369,7 +369,7 @@ public class DefaultPulsarMessageListenerContainer<T> extends AbstractPulsarMess
 								observation = PulsarListenerObservation.LISTENER_OBSERVATION.observation(
 										this.containerProperties.getObservationConvention(),
 										DefaultPulsarListenerObservationConvention.INSTANCE,
-										new PulsarMessageReceiverContext(message, getBeanName()),
+										() -> new PulsarMessageReceiverContext(message, getBeanName()),
 										this.observationRegistry);
 							}
 							observation.observe(() -> {