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

Updated reactor code

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-07-07 16:10:02 +02:00
parent 27217619da
commit e93db03544
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriber.java
View File

@@ -6,10 +6,10 @@ import org.reactivestreams.Subscriber;
import org.reactivestreams.Subscription;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.Tracer;
import reactor.core.CoreSubscriber;
import reactor.util.Logger;
import reactor.util.Loggers;
import reactor.util.context.Context;
import reactor.util.context.Contextualized;
/**
* A trace representation of the {@link Subscriber}
@@ -18,8 +18,7 @@ import reactor.util.context.Contextualized;
* @author Marcin Grzejszczak
* @since 1.3.0
*/
class SpanSubscriber extends AtomicBoolean
implements Subscriber<Object>, Subscription, Contextualized {
class SpanSubscriber extends AtomicBoolean implements Subscription, CoreSubscriber<Object> {
private static final Logger log = Loggers.getLogger(SpanSubscriber.class);

3
spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/TraceReactorAutoConfiguration.java
View File

@@ -18,7 +18,6 @@ import org.springframework.context.annotation.Configuration;
import reactor.core.publisher.Hooks;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;
import reactor.util.context.Context;
/**
* {@link org.springframework.boot.autoconfigure.EnableAutoConfiguration Auto-configuration}
@@ -44,7 +43,7 @@ public class TraceReactorAutoConfiguration {
@PostConstruct
public void setupHooks() {
Hooks.onNewSubscriber((pub, sub) ->
new SpanSubscriber(sub, Context.from(sub), this.tracer, pub.toString()));
new SpanSubscriber(sub, sub.currentContext(), this.tracer, pub.toString()));
Schedulers.setFactory(new Schedulers.Factory() {
@Override public ScheduledExecutorService decorateScheduledExecutorService(
String schedulerType,