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

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Adrian Cole
2020-05-26 19:47:01 +08:00
parent 32baa11183 3685cc2d7c
commit 18415d6877
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/annotation/ReactorSleuthMethodInvocationProcessor.java
View File

@@ -146,7 +146,9 @@ class ReactorSleuthMethodInvocationProcessor
Span span;
Tracer tracer = this.processor.tracer();
if (this.span == null) {
span = tracer.newTrace();
// If we aren't continuing a trace from this flow, use nextSpan so that it
// can consider the "current span" (typically, backed by a thread-local)
span = tracer.nextSpan();
this.processor.newSpanParser().parse(this.invocation, this.newSpan, span);
span.start();
}

22
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectFluxTests.java
View File

@@ -25,6 +25,8 @@ import java.util.stream.Collectors;
import brave.Span;
import brave.Tracer;
import brave.handler.SpanHandler;
import brave.propagation.CurrentTraceContext;
import brave.propagation.CurrentTraceContext.Scope;
import brave.propagation.TraceContext;
import brave.sampler.Sampler;
import brave.test.TestSpanHandler;
@@ -53,12 +55,18 @@ public class SleuthSpanCreatorAspectFluxTests {
@Autowired
TestBeanInterface testBean;
@Autowired
CurrentTraceContext currentTraceContext;
@Autowired
Tracer tracer;
@Autowired
TestSpanHandler spans;
TraceContext context = TraceContext.newBuilder().traceId(1).spanId(1).sampled(true)
.build();
private static String toHexString(Long value) {
then(value).isNotNull();
return StringUtils.leftPad(Long.toHexString(value), 16, '0');
@@ -84,6 +92,20 @@ public class SleuthSpanCreatorAspectFluxTests {
this.testBean.reset();
}
@Test
public void newSpan_shouldContinueExistingTrace() {
try (Scope scope = this.currentTraceContext.newScope(context)) {
Flux<String> flux = this.testBean.testMethod();
verifyNoSpansUntilFluxComplete(flux);
}
Awaitility.await().untilAsserted(() -> {
then(this.spans).hasSize(1);
then(this.spans.get(0).traceId()).isEqualTo(context.traceIdString());
then(this.spans.get(0).parentId()).isEqualTo(context.spanIdString());
});
}
@Test
public void shouldCreateSpanWhenAnnotationOnInterfaceMethod() {
Flux<String> flux = this.testBean.testMethod();