From e93db035442c07fa32efb7beb9ba7b5b81b3c9c7 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Fri, 7 Jul 2017 16:10:02 +0200
Subject: [PATCH] Updated reactor code

---
 .../cloud/sleuth/instrument/reactor/SpanSubscriber.java      | 5 ++---
 .../instrument/reactor/TraceReactorAutoConfiguration.java    | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriber.java b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriber.java
index fa11e4c6d..eaa976613 100644
--- a/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriber.java
+++ b/spring-cloud-sleuth-reactor/src/main/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriber.java
@@ -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);
 
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 7dd144479..60ab0de42 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
@@ -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,