From 710cf1f4861a499bac85fed1603261d9e955d68d Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 7 Nov 2022 00:39:19 +0900 Subject: [PATCH] Use ObservationThreadLocalAccessor.KEY where possible Closes gh-29439 --- .../web/filter/reactive/ServerHttpObservationFilter.java | 8 ++------ .../web/reactive/function/client/DefaultWebClient.java | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java b/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java index ce9e20abde7..a3c228eb463 100644 --- a/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java +++ b/spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java @@ -21,6 +21,7 @@ import java.util.Set; import io.micrometer.observation.Observation; import io.micrometer.observation.ObservationRegistry; +import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor; import org.reactivestreams.Publisher; import reactor.core.publisher.Mono; @@ -59,11 +60,6 @@ public class ServerHttpObservationFilter implements WebFilter { private static final Set DISCONNECTED_CLIENT_EXCEPTIONS = Set.of("AbortedException", "ClientAbortException", "EOFException", "EofException"); - /** - * Aligned with ObservationThreadLocalAccessor#KEY from micrometer-core. - */ - private static final String MICROMETER_OBSERVATION_KEY = "micrometer.observation"; - private final ObservationRegistry observationRegistry; private final ServerRequestObservationConvention observationConvention; @@ -123,7 +119,7 @@ public class ServerHttpObservationFilter implements WebFilter { observationContext.setConnectionAborted(true); observation.stop(); }) - .contextWrite(context -> context.put(MICROMETER_OBSERVATION_KEY, observation)); + .contextWrite(context -> context.put(ObservationThreadLocalAccessor.KEY, observation)); } private void onTerminalSignal(Observation observation, ServerWebExchange exchange) { diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java index 681f92b5167..9d13740cc74 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/client/DefaultWebClient.java @@ -33,6 +33,7 @@ import java.util.function.Supplier; import io.micrometer.observation.Observation; import io.micrometer.observation.ObservationRegistry; +import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor; import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -75,11 +76,6 @@ class DefaultWebClient implements WebClient { private static final DefaultClientRequestObservationConvention DEFAULT_OBSERVATION_CONVENTION = new DefaultClientRequestObservationConvention(); - /** - * Aligned with ObservationThreadLocalAccessor#KEY from micrometer-core. - */ - private static final String MICROMETER_OBSERVATION = "micrometer.observation"; - private final ExchangeFunction exchangeFunction; private final UriBuilderFactory uriBuilderFactory; @@ -463,7 +459,7 @@ class DefaultWebClient implements WebClient { DEFAULT_OBSERVATION_CONVENTION, () -> observationContext, observationRegistry); observationContext.setCarrier(requestBuilder); observation - .parentObservation(contextView.getOrDefault(MICROMETER_OBSERVATION, null)) + .parentObservation(contextView.getOrDefault(ObservationThreadLocalAccessor.KEY, null)) .start(); ClientRequest request = requestBuilder.build(); observationContext.setUriTemplate((String) request.attribute(URI_TEMPLATE_ATTRIBUTE).orElse(null));