Polishing.

Use existing constants. See #4218
spring-projects · Oct 24, 2022 · fd0a554 · fd0a554
1 parent d4daa30
commit fd0a554
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.../src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java b/.../src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java
@@ -31,6 +31,7 @@
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import reactor.core.CoreSubscriber;
 
 /**
@@ -85,8 +86,7 @@ public RequestContext getContext() {
 
 			Observation currentObservation = observationRegistry.getCurrentObservation();
 			if (currentObservation != null) {
-				// Aligned with ObservationThreadLocalAccessor.KEY
-				requestContext.put("micrometer.observation", currentObservation);
+				requestContext.put(ObservationThreadLocalAccessor.KEY, currentObservation);
 			}
 
 			return requestContext;

diff --git a/.../java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java b/.../java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
@@ -29,6 +29,7 @@
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 
 /**
  * Implement MongoDB's {@link CommandListener} using Micrometer's {@link Observation} API.
@@ -42,11 +43,6 @@ public class MongoObservationCommandListener implements CommandListener {
 
 	private static final Log log = LogFactory.getLog(MongoObservationCommandListener.class);
 
-	/**
-	 * Aligns with ObservationThreadLocalAccessor.KEY.
-	 */
-	private static final String MICROMETER_OBSERVATION_KEY = "micrometer.observation";
-
 	private final ObservationRegistry observationRegistry;
 	private final @Nullable ConnectionString connectionString;
 
@@ -119,7 +115,7 @@ public void commandStarted(CommandStartedEvent event) {
 
 		observation.start();
 
-		requestContext.put(MICROMETER_OBSERVATION_KEY, observation);
+		requestContext.put(ObservationThreadLocalAccessor.KEY, observation);
 
 		if (log.isDebugEnabled()) {
 			log.debug(
@@ -136,7 +132,7 @@ public void commandSucceeded(CommandSucceededEvent event) {
 			return;
 		}
 
-		Observation observation = requestContext.getOrDefault(MICROMETER_OBSERVATION_KEY, null);
+		Observation observation = requestContext.getOrDefault(ObservationThreadLocalAccessor.KEY, null);
 		if (observation == null) {
 			return;
 		}
@@ -160,7 +156,7 @@ public void commandFailed(CommandFailedEvent event) {
 			return;
 		}
 
-		Observation observation = requestContext.getOrDefault(MICROMETER_OBSERVATION_KEY, null);
+		Observation observation = requestContext.getOrDefault(ObservationThreadLocalAccessor.KEY, null);
 		if (observation == null) {
 			return;
 		}
@@ -185,7 +181,7 @@ public void commandFailed(CommandFailedEvent event) {
 	@Nullable
 	private static Observation observationFromContext(RequestContext context) {
 
-		Observation observation = context.getOrDefault(MICROMETER_OBSERVATION_KEY, null);
+		Observation observation = context.getOrDefault(ObservationThreadLocalAccessor.KEY, null);
 
 		if (observation != null) {
 

diff --git a/...rc/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java b/...rc/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java
@@ -73,7 +73,7 @@ public SampleTestRunnerConsumer yourCode() {
 					.verifyComplete();
 
 			repository.findByLastname("Matthews") //
-					.contextWrite(Context.of("micrometer.observation", intermediate)) //
+					.contextWrite(Context.of(ObservationThreadLocalAccessor.KEY, intermediate)) //
 					.as(StepVerifier::create).assertNext(actual -> {
 
 						assertThat(actual).extracting("firstname", "lastname").containsExactly("Dave", "Matthews");