Make serviceName check null-safe

Span object stores `localEndpoint.serviceName` empty string as null so `.isEmpty()` throws NullPointerException.
openzipkin · Sep 13, 2019 · 48777fb · 48777fb
1 parent 4688ae7
commit 48777fb
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...lation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java b/...lation-stackdriver/src/main/java/zipkin2/translation/stackdriver/AttributesExtractor.java
@@ -80,7 +80,9 @@ Attributes extract(Span zipkinSpan) {
       }
     }
 
-    if (zipkinSpan.localEndpoint() != null && !zipkinSpan.localEndpoint().serviceName().isEmpty()) {
+    if (zipkinSpan.localEndpoint() != null &&
+        zipkinSpan.localEndpoint().serviceName() != null &&
+        !zipkinSpan.localEndpoint().serviceName().isEmpty()) {
       attributes.putAttributeMap(
           kComponentLabelKey, toAttributeValue(zipkinSpan.localEndpoint().serviceName()));
     }