SpringCloud/spring-cloud-sleuth
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 1860 - WebFluxSleuthOperators should use ContextView (#1881)

Browse Source 
* Adds variant of WebFluxSleuthOperators methods which use ContextView
* Have existing methods using Context invoke the new methods

Fixes gh-1860
This commit is contained in:
blake-bauman
2021-03-15 11:52:23 -07:00
committed by GitHub
parent 630229c632
commit d090ce3255
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-cloud-sleuth-instrumentation/src/main/java/org/springframework/cloud/sleuth/instrument/web/WebFluxSleuthOperators.java
View File

@@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory;
import reactor.core.publisher.Signal; import reactor.core.publisher.Signal;
import reactor.core.publisher.SignalType; import reactor.core.publisher.SignalType;
import reactor.util.context.Context; import reactor.util.context.Context;
import reactor.util.context.ContextView;
import org.springframework.cloud.sleuth.CurrentTraceContext; import org.springframework.cloud.sleuth.CurrentTraceContext;
import org.springframework.cloud.sleuth.Span; import org.springframework.cloud.sleuth.Span;
@@ -94,6 +95,15 @@ public final class WebFluxSleuthOperators {
* @param runnable - lambda to execute within the tracing context * @param runnable - lambda to execute within the tracing context
*/ */
public static void withSpanInScope(Context context, Runnable runnable) { public static void withSpanInScope(Context context, Runnable runnable) {
withSpanInScope((ContextView) context, runnable);
}
/**
* Wraps a runnable with a span.
* @param context - Reactor context that contains the {@link TraceContext}
* @param runnable - lambda to execute within the tracing context
*/
public static void withSpanInScope(ContextView context, Runnable runnable) {
CurrentTraceContext currentTraceContext = context.get(CurrentTraceContext.class); CurrentTraceContext currentTraceContext = context.get(CurrentTraceContext.class);
TraceContext traceContext = traceContextOrNew(context); TraceContext traceContext = traceContextOrNew(context);
try (CurrentTraceContext.Scope scope = currentTraceContext.maybeScope(traceContext)) { try (CurrentTraceContext.Scope scope = currentTraceContext.maybeScope(traceContext)) {
@@ -109,12 +119,23 @@ public final class WebFluxSleuthOperators {
* @return value from the callable * @return value from the callable
*/ */
public static <T> T withSpanInScope(Context context, Callable<T> callable) { public static <T> T withSpanInScope(Context context, Callable<T> callable) {
return withSpanInScope((ContextView) context, callable);
}
/**
* Wraps a callable with a span.
* @param context - Reactor context that contains the {@link TraceContext}
* @param callable - lambda to execute within the tracing context
* @param <T> callable's return type
* @return value from the callable
*/
public static <T> T withSpanInScope(ContextView context, Callable<T> callable) {
CurrentTraceContext currentTraceContext = context.get(CurrentTraceContext.class); CurrentTraceContext currentTraceContext = context.get(CurrentTraceContext.class);
TraceContext traceContext = traceContextOrNew(context); TraceContext traceContext = traceContextOrNew(context);
return withContext(callable, currentTraceContext, traceContext); return withContext(callable, currentTraceContext, traceContext);
} }
private static TraceContext traceContextOrNew(Context context) { private static TraceContext traceContextOrNew(ContextView context) {
Tracer tracer = context.get(Tracer.class); Tracer tracer = context.get(Tracer.class);
if (!context.hasKey(TraceContext.class)) { if (!context.hasKey(TraceContext.class)) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {