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

Added tests for sequence operations; fixes gh-825

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-01-20 22:53:38 +01:00
parent 34251b617f
commit 053b87ce01
1 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/reactor/SpanSubscriberTests.java
View File

@@ -135,7 +135,6 @@ public class SpanSubscriberTests {
final AtomicReference<Span> spanInOperation = new AtomicReference<>();
log.info("Hello");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
Flux.just(1, 2, 3).publishOn(Schedulers.single()).log("reactor.1")
.map(d -> d + 1).map(d -> d + 1).publishOn(Schedulers.newSingle("secondThread")).log("reactor.2")
@@ -171,6 +170,44 @@ public class SpanSubscriberTests {
then(this.tracer.currentSpan()).isNull();
}
@Test
public void checkSequenceOfOperations() {
Span parentSpan = this.tracer.nextSpan().name("foo").start();
log.info("Hello");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(parentSpan)) {
final Long traceId = Mono.fromCallable(tracer::currentSpan)
.map(span -> span.context().traceId())
.block();
then(traceId).isNotNull();
final Long secondTraceId = Mono.fromCallable(tracer::currentSpan)
.map(span -> span.context().traceId())
.block();
then(secondTraceId).isEqualTo(traceId); // different trace ids here
}
}
@Test
public void checkTraceIdDuringZipOperation() {
Span initSpan = this.tracer.nextSpan().name("foo").start();
final AtomicReference<Long> spanInOperation = new AtomicReference<>();
final AtomicReference<Long> spanInZipOperation = new AtomicReference<>();
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(initSpan)) {
Mono.fromCallable(tracer::currentSpan)
.map(span -> span.context().traceId())
.doOnNext(spanInOperation::set)
.zipWith(
Mono.fromCallable(tracer::currentSpan)
.map(span -> span.context().traceId())
.doOnNext(spanInZipOperation::set))
.block();
}
then(spanInZipOperation).hasValue(initSpan.context().traceId()); // ok here
then(spanInOperation).hasValue(initSpan.context().traceId()); // Expecting <AtomicReference[null]> to have value: <1L> but did not.
}
@AfterClass
public static void cleanup() {
Hooks.resetOnLastOperator();