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

Started spans created via annotations; fixes gh-855

Browse Source
This commit is contained in:
Marcin Grzejszczak
2018-02-13 10:04:19 +01:00
parent a17f247730
commit 561a39370d
2 changed files with 19 additions and 6 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/SleuthAdvisorConfig.java
View File

@@ -16,10 +16,10 @@
package org.springframework.cloud.sleuth.annotation;
import javax.annotation.PostConstruct;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.PostConstruct;
import brave.Span;
import brave.Tracer;
@@ -195,7 +195,7 @@ class SleuthInterceptor implements IntroductionInterceptor, BeanFactoryAware {
}
Span span = tracing().tracer().currentSpan();
if (newSpan != null || span == null) {
span = spanCreator().createSpan(invocation, newSpan);
span = spanCreator().createSpan(invocation, newSpan).start();
}
String log = log(continueSpan);
boolean hasLog = StringUtils.hasText(log);

21
spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/annotation/SleuthSpanCreatorAspectTests.java
View File

@@ -59,6 +59,7 @@ public class SleuthSpanCreatorAspectTests {
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("test-method");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -68,6 +69,7 @@ public class SleuthSpanCreatorAspectTests {
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("test-method2");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -77,6 +79,7 @@ public class SleuthSpanCreatorAspectTests {
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("custom-name-on-test-method3");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -86,6 +89,7 @@ public class SleuthSpanCreatorAspectTests {
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("custom-name-on-test-method4");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -98,6 +102,7 @@ public class SleuthSpanCreatorAspectTests {
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("custom-name-on-test-method5");
then(spans.get(0).tags()).containsEntry("testTag", "test");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -108,6 +113,7 @@ public class SleuthSpanCreatorAspectTests {
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("custom-name-on-test-method6");
then(spans.get(0).tags()).containsEntry("testTag6", "test");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -117,6 +123,7 @@ public class SleuthSpanCreatorAspectTests {
List<zipkin2.Span> spans = this.reporter.getSpans();
then(spans).hasSize(1);
then(spans.get(0).name()).isEqualTo("custom-name-on-test-method8");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -129,13 +136,14 @@ public class SleuthSpanCreatorAspectTests {
then(spans.get(0).tags())
.containsEntry("class", "TestBean")
.containsEntry("method", "testMethod9");
then(spans.get(0).duration()).isNotZero();
}
@Test
public void shouldContinueSpanWithLogWhenAnnotationOnInterfaceMethod() {
Span span = this.tracer.nextSpan().name("foo");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) {
this.testBean.testMethod10("test");
} finally {
span.finish();
@@ -149,13 +157,14 @@ public class SleuthSpanCreatorAspectTests {
then(spans.get(0).annotations()
.stream().map(Annotation::value).collect(Collectors.toList()))
.contains("customTest.before", "customTest.after");
then(spans.get(0).duration()).isNotZero();
}
@Test
public void shouldContinueSpanWhenKeyIsUsedOnSpanTagWhenAnnotationOnInterfaceMethod() {
Span span = this.tracer.nextSpan().name("foo");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) {
this.testBean.testMethod10_v2("test");
} finally {
span.finish();
@@ -169,13 +178,14 @@ public class SleuthSpanCreatorAspectTests {
then(spans.get(0).annotations()
.stream().map(Annotation::value).collect(Collectors.toList()))
.contains("customTest.before", "customTest.after");
then(spans.get(0).duration()).isNotZero();
}
@Test
public void shouldContinueSpanWithLogWhenAnnotationOnClassMethod() {
Span span = this.tracer.nextSpan().name("foo");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) {
// tag::continue_span_execution[]
this.testBean.testMethod11("test");
// end::continue_span_execution[]
@@ -193,6 +203,7 @@ public class SleuthSpanCreatorAspectTests {
then(spans.get(0).annotations()
.stream().map(Annotation::value).collect(Collectors.toList()))
.contains("customTest.before", "customTest.after");
then(spans.get(0).duration()).isNotZero();
}
@Test
@@ -208,13 +219,14 @@ public class SleuthSpanCreatorAspectTests {
then(spans.get(0).tags())
.containsEntry("testTag12", "test")
.containsEntry("error", "test exception 12");
then(spans.get(0).duration()).isNotZero();
}
@Test
public void shouldAddErrorTagWhenExceptionOccurredInContinueSpan() {
Span span = this.tracer.nextSpan().name("foo");
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span)) {
try (Tracer.SpanInScope ws = this.tracer.withSpanInScope(span.start())) {
// tag::continue_span_execution[]
this.testBean.testMethod13();
// end::continue_span_execution[]
@@ -232,6 +244,7 @@ public class SleuthSpanCreatorAspectTests {
.stream().map(Annotation::value).collect(Collectors.toList()))
.contains("testMethod13.before", "testMethod13.afterFailure",
"testMethod13.after");
then(spans.get(0).duration()).isNotZero();
}
@Test