Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use ObservationThreadLocalAccessor.KEY where possible

Browse Source 
Closes gh-29439
This commit is contained in:
Johnny Lim
2022-11-07 00:39:19 +09:00
committed by Brian Clozel
parent 287d6dec8b
commit 710cf1f486
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-web/src/main/java/org/springframework/web/filter/reactive/ServerHttpObservationFilter.java
View File

@@ -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<String> 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) {