Exposes DependencyLinkSpan.from for use in spark job

Adrian Cole · Adrian Cole · commit b3e38a9110ab · 2016-07-14T19:24:17.000+08:00
diff --git a/zipkin/src/main/java/zipkin/internal/DependencyLinkSpan.java b/zipkin/src/main/java/zipkin/internal/DependencyLinkSpan.java
@@ -13,7 +13,11 @@
  */
 package zipkin.internal;
 
-import static java.lang.String.format;
+import zipkin.Annotation;
+import zipkin.BinaryAnnotation;
+import zipkin.Constants;
+import zipkin.Span;
+
 import static zipkin.internal.Util.checkNotNull;
 import static zipkin.internal.Util.equal;
 
@@ -66,6 +70,24 @@ public static Builder builder(Long parentId, long spanId){
     return new Builder(parentId, spanId);
   }
 
+  public static DependencyLinkSpan from(Span s) {
+    DependencyLinkSpan.Builder linkSpan = DependencyLinkSpan.builder(s.parentId, s.id);
+    for (BinaryAnnotation a : s.binaryAnnotations) {
+      if (a.key.equals(Constants.CLIENT_ADDR) && a.endpoint != null) {
+        linkSpan.caService(a.endpoint.serviceName);
+      } else if (a.key.equals(Constants.SERVER_ADDR) && a.endpoint != null) {
+        linkSpan.saService(a.endpoint.serviceName);
+      }
+    }
+    for (Annotation a : s.annotations) {
+      if (a.value.equals(Constants.SERVER_RECV) && a.endpoint != null) {
+        linkSpan.srService(a.endpoint.serviceName);
+        break;
+      }
+    }
+    return linkSpan.build();
+  }
+
   public static final class Builder {
     private final Long parentId;
     private final long spanId;
diff --git a/zipkin/src/main/java/zipkin/storage/InMemorySpanStore.java b/zipkin/src/main/java/zipkin/storage/InMemorySpanStore.java
@@ -26,7 +26,6 @@
 import java.util.TreeSet;
 import zipkin.Annotation;
 import zipkin.BinaryAnnotation;
-import zipkin.Constants;
 import zipkin.DependencyLink;
 import zipkin.Span;
 import zipkin.internal.ApplyTimestampAndDuration;
@@ -168,21 +167,7 @@ public List<DependencyLink> getDependencies(long endTs, @Nullable Long lookback)
             timestamp > endTs) {
           continue;
         }
-        DependencyLinkSpan.Builder linkSpan = DependencyLinkSpan.builder(s.parentId, s.id);
-        for (BinaryAnnotation a : s.binaryAnnotations) {
-          if (a.key.equals(Constants.CLIENT_ADDR) && a.endpoint != null) {
-            linkSpan.caService(a.endpoint.serviceName);
-          } else if (a.key.equals(Constants.SERVER_ADDR) && a.endpoint != null) {
-            linkSpan.saService(a.endpoint.serviceName);
-          }
-        }
-        for (Annotation a : s.annotations) {
-          if (a.value.equals(Constants.SERVER_RECV) && a.endpoint != null) {
-            linkSpan.srService(a.endpoint.serviceName);
-            break;
-          }
-        }
-        linkSpans.add(linkSpan.build());
+        linkSpans.add(DependencyLinkSpan.from(s));
       }
 
       linksBuilder.putTrace(linkSpans.iterator());
