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

Added logging

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-10-04 11:51:13 +02:00
parent f32397f351
commit 0abfcb3933
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectWebFluxTests.java
View File

@@ -40,6 +40,9 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.reactive.function.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import reactor.core.publisher.Mono;
import zipkin2.Span;
import zipkin2.reporter.Reporter;
@@ -58,9 +61,12 @@ public class SleuthSpanCreatorAspectWebFluxTests {
@Autowired
ArrayListSpanReporter reporter;
private static final ConcurrentLinkedQueue<Long> spanIdsInHttpTrace = new ConcurrentLinkedQueue<>();
@Before
public void setup() {
this.reporter.clear();
spanIdsInHttpTrace.clear();
}
@LocalServerPort
@@ -68,8 +74,6 @@ public class SleuthSpanCreatorAspectWebFluxTests {
private final WebClient webClient = WebClient.create();
private static final ConcurrentLinkedQueue<Long> spanIdsInHttpTrace = new ConcurrentLinkedQueue<>();
@Test
public void shouldReturnSpanFromWebFluxTraceContext() {
@@ -239,6 +243,8 @@ public class SleuthSpanCreatorAspectWebFluxTests {
@RequestMapping("/test")
static class TestEndpoint {
private static final Logger log = LoggerFactory.getLogger(TestEndpoint.class);
@Autowired
Tracer tracer;
@@ -252,22 +258,26 @@ public class SleuthSpanCreatorAspectWebFluxTests {
@GetMapping("/pingFromContext")
public Mono<Long> pingFromContext() {
return Mono.subscriberContext().flatMap(
context -> Mono.just(tracer.currentSpan().context().spanId()));
return Mono.subscriberContext()
.doOnSuccess(context -> log.info("Ping from context"))
.flatMap(context -> Mono.just(tracer.currentSpan().context().spanId()));
}
@GetMapping("/continueSpan")
public Mono<Long> continueSpan() {
log.info("continueSpan");
return testBean.continueSpanInTraceContext();
}
@GetMapping("/newSpan1")
public Mono<Long> newSpan1() {
log.info("newSpan1");
return testBean.newSpanInTraceContext();
}
@GetMapping("/newSpan2")
public Mono<Long> newSpan2() {
log.info("newSpan2");
return testBean.newSpanInSubscriberContext();
}
@@ -275,6 +285,8 @@ public class SleuthSpanCreatorAspectWebFluxTests {
static class TestBean {
private static final Logger log = LoggerFactory.getLogger(TestBean.class);
private final Tracer tracer;
public TestBean(Tracer tracer) {
@@ -283,17 +295,22 @@ public class SleuthSpanCreatorAspectWebFluxTests {
@ContinueSpan
public Mono<Long> continueSpanInTraceContext() {
log.info("Continue");
return Mono.defer(() -> Mono.just(tracer.currentSpan().context().spanId()));
}
@NewSpan(name = "newSpanInTraceContext")
public Mono<Long> newSpanInTraceContext() {
log.info("New Span in Trace Context");
return Mono.defer(() -> Mono.just(tracer.currentSpan().context().spanId()));
}
@NewSpan(name = "newSpanInSubscriberContext")
public Mono<Long> newSpanInSubscriberContext() {
return Mono.subscriberContext().flatMap(context -> Mono
log.info("New Span in Subscriber Context");
return Mono.subscriberContext()
.doOnSuccess(context -> log.info("New Span in deferred Trace Context"))
.flatMap(context -> Mono
.defer(() -> Mono.just(tracer.currentSpan().context().spanId())));
}