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

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-12-28 11:34:02 +01:00
parent 5dcf8572a3 2ac0b6187a
commit ef4537800a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporter.java
View File

@@ -67,7 +67,7 @@ public class ZipkinSpanReporter implements SpanReporter {
//TODO: Consider adding support for the debug flag (related to #496)
Span convertedSpan = span;
for (SpanAdjuster adjuster : this.spanAdjusters) {
convertedSpan = adjuster.adjust(span);
convertedSpan = adjuster.adjust(convertedSpan);
}
zipkin2.Span.Builder zipkinSpan = zipkin2.Span.newBuilder();
zipkinSpan.localEndpoint(this.endpointLocator.local());

10
spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin2/ZipkinSpanReporterTests.java
View File

@@ -17,6 +17,7 @@
package org.springframework.cloud.sleuth.zipkin2;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import javax.annotation.PostConstruct;
@@ -265,16 +266,17 @@ public class ZipkinSpanReporterTests {
public void should_adjust_span_before_reporting_it() {
this.parent.logEvent(Span.CLIENT_RECV);
ZipkinSpanReporter spanListener = new ZipkinSpanReporter(this.zipkinReporter,
this.endpointLocator, null, Collections.<SpanAdjuster>singletonList(
span -> Span.builder().from(span).name("foo").build())) {
this.endpointLocator, null, Arrays.asList(
span -> Span.builder().from(span).name("foo").build(),
span -> Span.builder().from(span).name(span.getName() + "bar").build())) {
@Override String defaultInstanceId() {
return "foo";
return "foobar";
}
};
zipkin2.Span result = spanListener.convert(this.parent);
assertThat(result.name()).isEqualTo("foo");
assertThat(result.name()).isEqualTo("foobar");
}
/** Zipkin will take care of processing the shared flag wrt timestamp authority */