From 8a3c7494b27d8dc6921c339f1186d8f22062594a Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Wed, 10 Oct 2018 15:35:43 +0200
Subject: [PATCH] Added moar logging

---
 .../SleuthSpanCreatorAspectWebFluxTests.java  | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
index 802c9fdf0..168942ea5 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
@@ -63,13 +63,14 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 	private static final Log log = LogFactory
 			.getLog(SleuthSpanCreatorAspectWebFluxTests.class);
 
-	private static final ConcurrentLinkedQueue<Long> spanIdsInHttpTrace = new ConcurrentLinkedQueue<>();
-
 	private final WebClient webClient = WebClient.create();
 
 	@Autowired
 	Tracer tracer;
 
+	@Autowired
+	AccessLoggingHttpTraceRepository repository;
+
 	@Autowired
 	ArrayListSpanReporter reporter;
 
@@ -84,7 +85,7 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 	@Before
 	public void setup() {
 		this.reporter.clear();
-		spanIdsInHttpTrace.clear();
+		this.repository.clear();
 	}
 
 	@Test
@@ -198,7 +199,7 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 
 	@Test
 	public void shouldSetupCorrectSpanInHttpTrace() {
-		spanIdsInHttpTrace.clear();
+		repository.clear();
 
 		Mono<Long> mono = webClient.get().uri("http://localhost:" + port + "/test/ping")
 				.retrieve().bodyToMono(Long.class);
@@ -212,8 +213,9 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 			then(spans).hasSize(1);
 			then(spans.get(0).kind()).isEqualTo(Span.Kind.SERVER);
 			then(spans.get(0).name()).isEqualTo("get /test/ping");
+			then(this.repository.getSpan()).isNotNull();
 			then(spans.get(0).id()).isEqualTo(toHexString(newSpanId))
-					.isEqualTo(toHexString(spanIdsInHttpTrace.poll()));
+					.isEqualTo(repository.getSpan().context().traceIdString());
 			then(this.tracer.currentSpan()).isNull();
 		});
 	}
@@ -247,21 +249,33 @@ public class SleuthSpanCreatorAspectWebFluxTests {
 
 	static class AccessLoggingHttpTraceRepository implements HttpTraceRepository {
 
+		private static final Log log = LogFactory
+				.getLog(AccessLoggingHttpTraceRepository.class);
+
 		@Autowired
 		Tracer tracer;
 
+		brave.Span span;
+
 		@Override
 		public List<HttpTrace> findAll() {
+			log.info("Find all executed");
 			return null;
 		}
 
 		@Override
 		public void add(HttpTrace trace) {
-			if (tracer.currentSpan() != null) {
-				spanIdsInHttpTrace.add(tracer.currentSpan().context().spanId());
-			}
+			this.span = this.tracer.currentSpan();
+			log.info("Setting span [" + this.span + "]");
 		}
 
+		public brave.Span getSpan() {
+			return this.span;
+		}
+
+		public void clear() {
+			this.span = null;
+		}
 	}
 
 	@RestController