diff --git a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java index 3f203641e..d8c6b244a 100644 --- a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java +++ b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/ReactorSleuth.java @@ -4,16 +4,17 @@ import java.util.function.Function; import java.util.function.Predicate; import org.reactivestreams.Publisher; +import org.springframework.cloud.sleuth.Tracer; + import reactor.core.Fuseable; import reactor.core.Scannable; import reactor.core.publisher.Operators; -import org.springframework.cloud.sleuth.Tracer; - /** * Reactive Span pointcuts factories * * @author Stephane Maldini + * @since 1.3.0 */ public abstract class ReactorSleuth { @@ -35,7 +36,6 @@ public abstract class ReactorSleuth { if(scannable instanceof Fuseable && sub instanceof Fuseable.QueueSubscription){ return sub; } - return new SpanSubscriber<>( sub, sub.currentContext(), diff --git a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java index 91c74662b..f86cc2b71 100644 --- a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java +++ b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java @@ -1,8 +1,8 @@ package org.springframework.cloud.sleuth.instrument.reactor; +import javax.annotation.PostConstruct; import java.util.concurrent.ScheduledExecutorService; import java.util.function.Supplier; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -16,7 +16,6 @@ import org.springframework.cloud.sleuth.autoconfig.TraceAutoConfiguration; import org.springframework.cloud.sleuth.instrument.async.TraceableScheduledExecutorService; import org.springframework.context.annotation.Configuration; -import reactor.core.Fuseable; import reactor.core.publisher.Hooks; import reactor.core.publisher.Mono; import reactor.core.scheduler.Schedulers; @@ -44,7 +43,7 @@ public class TraceReactorAutoConfiguration { @PostConstruct public void setupHooks() { - Hooks.onLastOperator(ReactorSleuth.spanOperator(tracer)); + Hooks.onLastOperator(ReactorSleuth.spanOperator(this.tracer)); Schedulers.setFactory(new Schedulers.Factory() { @Override public ScheduledExecutorService decorateScheduledExecutorService( String schedulerType,