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

We no longer set SA for peer.service

Browse Source 
fixes #619
This commit is contained in:
Marcin Grzejszczak
2017-07-06 14:04:51 +02:00
parent 050dfe9bdf
commit f08b3057ab
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListener.java
View File

@@ -16,6 +16,14 @@
package org.springframework.cloud.sleuth.zipkin;
import org.springframework.cloud.commons.util.IdUtils;
import org.springframework.cloud.sleuth.Log;
import org.springframework.cloud.sleuth.NoOpSpanAdjuster;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanAdjuster;
import org.springframework.cloud.sleuth.SpanReporter;
import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils;
import zipkin.Annotation;
import zipkin.BinaryAnnotation;
import zipkin.Constants;
@@ -27,15 +35,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import org.springframework.cloud.commons.util.IdUtils;
import org.springframework.cloud.sleuth.Log;
import org.springframework.cloud.sleuth.NoOpSpanAdjuster;
import org.springframework.cloud.sleuth.Span;
import org.springframework.cloud.sleuth.SpanAdjuster;
import org.springframework.cloud.sleuth.SpanReporter;
import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils;
/**
* Listener of Sleuth events. Reports to Zipkin via {@link ZipkinSpanReporter}.
*
@@ -149,10 +148,10 @@ public class ZipkinSpanListener implements SpanReporter {
zipkinSpan.addBinaryAnnotation(component);
}
private void ensureServerAddr(Span span, zipkin.Span.Builder zipkinSpan, Endpoint localEndpoint) {
private void ensureServerAddr(Span span, zipkin.Span.Builder zipkinSpan) {
if (span.tags().containsKey(Span.SPAN_PEER_SERVICE_TAG_NAME)) {
zipkinSpan.addBinaryAnnotation(BinaryAnnotation.address(Constants.SERVER_ADDR,
localEndpoint.toBuilder().serviceName(
Endpoint.builder().serviceName(
span.tags().get(Span.SPAN_PEER_SERVICE_TAG_NAME)).build()));
}
}
@@ -178,7 +177,7 @@ public class ZipkinSpanListener implements SpanReporter {
ensureLocalComponent(span, zipkinSpan, endpoint);
}
if (hasClientSend) {
ensureServerAddr(span, zipkinSpan, endpoint);
ensureServerAddr(span, zipkinSpan);
}
if (instanceIdToTag && this.environment != null) {
setInstanceIdIfPresent(zipkinSpan, endpoint, Span.INSTANCEID);

11
spring-cloud-sleuth-zipkin/src/test/java/org/springframework/cloud/sleuth/zipkin/ZipkinSpanListenerTests.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.sleuth.zipkin;
import org.assertj.core.api.Condition;
import zipkin.Constants;
import java.util.ArrayList;
@@ -41,6 +42,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.mock.env.MockEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
import zipkin.Endpoint;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;
@@ -219,7 +221,14 @@ public class ZipkinSpanListenerTests {
assertThat(result.binaryAnnotations)
.filteredOn("key", Constants.SERVER_ADDR)
.isNotEmpty();
.extracting(input -> input.endpoint)
.hasSize(1)
.has(new Condition<List<? extends Endpoint>>() {
@Override public boolean matches(List<? extends Endpoint> value) {
Endpoint endpoint = value.get(0);
return endpoint.serviceName.equals("fooservice") && endpoint.ipv4 == 0;
}
});
}
@Test