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

Check for null in endpoint port

Browse Source 
Fixes gh-280
This commit is contained in:
Dave Syer
2016-05-20 12:27:45 +02:00
parent 650bf6d1f8
commit 6ae8dfa21c
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-cloud-sleuth-zipkin-stream/src/main/java/org/springframework/cloud/sleuth/zipkin/stream/ConvertToZipkinSpanList.java
View File

@@ -39,9 +39,8 @@ import zipkin.Span.Builder;
* @since 1.0.0
*/
final class ConvertToZipkinSpanList {
private static final List<String> ZIPKIN_START_EVENTS = Arrays.asList(
Constants.CLIENT_RECV, Constants.SERVER_RECV
);
private static final List<String> ZIPKIN_START_EVENTS = Arrays
.asList(Constants.CLIENT_RECV, Constants.SERVER_RECV);
private static final Log log = org.apache.commons.logging.LogFactory
.getLog(ConvertToZipkinSpanList.class);
@@ -68,9 +67,10 @@ final class ConvertToZipkinSpanList {
* <li>Create binary annotations based on data from Span object.
* </ul>
*
* When logging {@link Constants#CLIENT_SEND}, instrumentation should also log the {@link Constants#SERVER_ADDR}
* Check <a href="https://github.com/openzipkin/zipkin-java/blob/master/zipkin/src/main/java/zipkin/Constants.java#L28">Zipkin code</a>
* for more information
* When logging {@link Constants#CLIENT_SEND}, instrumentation should also log the
* {@link Constants#SERVER_ADDR} Check <a href=
* "https://github.com/openzipkin/zipkin-java/blob/master/zipkin/src/main/java/zipkin/Constants.java#L28">
* Zipkin code</a> for more information
*/
// VisibleForTesting
static zipkin.Span convert(Span span, Host host) {
@@ -95,7 +95,7 @@ final class ConvertToZipkinSpanList {
if (span.getParents().size() > 0) {
if (span.getParents().size() > 1) {
log.debug("zipkin doesn't support spans with multiple parents. Omitting "
+ "other parents for " + span);
+ "other parents for " + span);
}
zipkinSpan.parentId(span.getParents().get(0));
}
@@ -106,13 +106,11 @@ final class ConvertToZipkinSpanList {
return zipkinSpan.build();
}
private static void ensureLocalComponent(Span span, Builder zipkinSpan,
Endpoint ep) {
private static void ensureLocalComponent(Span span, Builder zipkinSpan, Endpoint ep) {
if (span.tags().containsKey(Constants.LOCAL_COMPONENT)) {
return;
}
String processId = span.getProcessId() != null
? span.getProcessId().toLowerCase()
String processId = span.getProcessId() != null ? span.getProcessId().toLowerCase()
: ZipkinMessageListener.UNKNOWN_PROCESS_ID;
zipkinSpan.addBinaryAnnotation(
BinaryAnnotation.create(Constants.LOCAL_COMPONENT, processId, ep));
@@ -120,10 +118,12 @@ final class ConvertToZipkinSpanList {
private static void ensureServerAddr(Span span, zipkin.Span.Builder zipkinSpan,
Endpoint ep) {
String serviceName = span.tags().containsKey(Span.SPAN_PEER_SERVICE_TAG_NAME) ?
span.tags().get(Span.SPAN_PEER_SERVICE_TAG_NAME) : ep.serviceName;
zipkinSpan.addBinaryAnnotation(BinaryAnnotation.address(Constants.SERVER_ADDR,
Endpoint.create(serviceName, ep.ipv4, ep.port)));
String serviceName = span.tags().containsKey(Span.SPAN_PEER_SERVICE_TAG_NAME)
? span.tags().get(Span.SPAN_PEER_SERVICE_TAG_NAME) : ep.serviceName;
Endpoint endpoint = ep.port == null ? Endpoint.create(serviceName, ep.ipv4)
: Endpoint.create(serviceName, ep.ipv4, ep.port);
zipkinSpan.addBinaryAnnotation(
BinaryAnnotation.address(Constants.SERVER_ADDR, endpoint));
}
private static boolean notClientOrServer(Span span) {

9
spring-cloud-sleuth-zipkin-stream/src/test/java/org/springframework/cloud/sleuth/zipkin/stream/ConvertToZipkinSpanListTests.java
View File

@@ -43,6 +43,15 @@ public class ConvertToZipkinSpanListTests {
assertThat(result).isEmpty();
}
@Test
public void nullEndpointPort() {
this.host.setPort(0);
Span span = span("sleuth");
span.logEvent(Constants.CLIENT_SEND);
zipkin.Span result = ConvertToZipkinSpanList.convert(span, host);
assertThat(result).isNotNull();
}
@Test
public void retainsValidSpans() {
Spans spans = new Spans(this.host,