Fix upgrade zipkin2 (#60)

* adapter SOFARpc span model to zipkin span model
sofastack · Aug 29, 2018 · 8d02193 · 8d02193
1 parent ee6c0e5
commit 8d02193
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/...gin/src/main/java/com/alipay/sofa/tracer/plugins/springmvc/SpringMvcSofaTracerFilter.java b/...gin/src/main/java/com/alipay/sofa/tracer/plugins/springmvc/SpringMvcSofaTracerFilter.java
@@ -133,6 +133,7 @@ public SofaTracerSpanContext getSpanContextFromRequest(HttpServletRequest reques
         SofaTracer tracer = springMvcTracer.getSofaTracer();
         SofaTracerSpanContext spanContext = (SofaTracerSpanContext) tracer.extract(
             ExtendFormat.Builtin.B3_HTTP_HEADERS, new SpringMvcHeadersCarrier(headers));
+        spanContext.setSpanId(spanContext.nextChildContextId());
         return spanContext;
     }
 

diff --git a/tracer-sofa-boot-starter/pom.xml b/tracer-sofa-boot-starter/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>io.zipkin.zipkin2</groupId>
             <artifactId>zipkin</artifactId>
-            <version>2.11.1</version>
+            <version>2.11.3</version>
             <optional>true</optional>
         </dependency>
         <dependency>

diff --git a/.../src/main/java/com/alipay/sofa/tracer/boot/zipkin/ZipkinSofaTracerSpanRemoteReporter.java b/.../src/main/java/com/alipay/sofa/tracer/boot/zipkin/ZipkinSofaTracerSpanRemoteReporter.java
@@ -16,11 +16,11 @@
  */
 package com.alipay.sofa.tracer.boot.zipkin;
 
+import com.alipay.common.tracer.core.SofaTracer;
 import com.alipay.common.tracer.core.context.span.SofaTracerSpanContext;
 import com.alipay.common.tracer.core.listener.SpanReportListener;
 import com.alipay.common.tracer.core.span.LogData;
 import com.alipay.common.tracer.core.span.SofaTracerSpan;
-import com.alipay.common.tracer.core.utils.CommonUtils;
 import com.alipay.common.tracer.core.utils.StringUtils;
 import com.alipay.common.tracer.core.utils.TracerUtils;
 import com.alipay.sofa.tracer.boot.zipkin.sender.ZipkinRestTemplateSender;
@@ -45,16 +45,18 @@
  */
 public class ZipkinSofaTracerSpanRemoteReporter implements SpanReportListener, Flushable, Closeable {
 
-    private static String                  processId    = TracerUtils.getPID();
+    private static String                  processId           = TracerUtils.getPID();
 
     private final ZipkinRestTemplateSender sender;
 
     private final AsyncReporter<Span>      delegate;
 
+    private static final String            SOFARPC_TRACER_TYPE = "RPC_TRACER";
+
     /***
      * cache and performance improve
      */
-    private int                            ipAddressInt = -1;
+    private int                            ipAddressInt        = -1;
 
     public ZipkinSofaTracerSpanRemoteReporter(RestTemplate restTemplate, String baseUrl) {
         this.sender = new ZipkinRestTemplateSender(restTemplate, baseUrl);
@@ -89,17 +91,16 @@ public void close() {
     private Span convertToZipkinSpan(SofaTracerSpan sofaTracerSpan) {
         Span.Builder zipkinSpanBuilder = Span.newBuilder();
         zipkinSpanBuilder.timestamp(sofaTracerSpan.getStartTime() * 1000);
+        // Zipkin is in nanosecond  cr-cs
+        zipkinSpanBuilder
+            .duration((sofaTracerSpan.getEndTime() - sofaTracerSpan.getStartTime()) * 1000);
         //Annotations
         Endpoint endpoint = getZipkinEndpoint(sofaTracerSpan.getOperationName());
         this.addZipkinAnnotations(zipkinSpanBuilder, sofaTracerSpan, endpoint);
         this.addZipkinBinaryAnnotationsWithTags(zipkinSpanBuilder, sofaTracerSpan);
         this.addZipkinBinaryAnnotationsWithBaggage(zipkinSpanBuilder, sofaTracerSpan);
-        // Zipkin is in nanosecond  cr-cs
-        zipkinSpanBuilder
-            .duration((sofaTracerSpan.getEndTime() - sofaTracerSpan.getStartTime()) * 1000);
         //traceId
         SofaTracerSpanContext sofaTracerSpanContext = sofaTracerSpan.getSofaTracerSpanContext();
-
         /**
          * Changes:
          * 1.From using zipkin span's traceId alone, to using both traceid and traceIdHigh
@@ -110,37 +111,36 @@ private Span convertToZipkinSpan(SofaTracerSpan sofaTracerSpan) {
          *   off the pid in tail of the traceId, because it does not know the pid of the sender.
          *   resulting in over range when convert it to long type.
          */
-        long[] traceIds = CommonUtils.hexToDualLong(sofaTracerSpanContext.getTraceId());
 
-        zipkinSpanBuilder.traceId(traceIds[0], traceIds[1]);
-        zipkinSpanBuilder.kind(Span.Kind.SERVER);
+        // v2 span model will padLeft automatic
+        zipkinSpanBuilder.traceId(sofaTracerSpanContext.getTraceId());
         String parentSpanId = sofaTracerSpanContext.getParentId();
         if (sofaTracerSpan.isServer() && parentSpanId != null
             && StringUtils.isNotBlank(parentSpanId)) {
-            if (CommonUtils.isHexString(parentSpanId)) {
-                zipkinSpanBuilder.parentId(CommonUtils.hexToLong(parentSpanId));
-            } else {
-                zipkinSpanBuilder.parentId(spanIdToLong(parentSpanId));
-            }
+            // v2 span model Unsets the {@link Span#parentId()} if the input is 0.
+            zipkinSpanBuilder.parentId(spanIdToLong(parentSpanId));
         } else if (sofaTracerSpan.getParentSofaTracerSpan() != null) {
             SofaTracerSpanContext parentSofaTracerSpanContext = sofaTracerSpan
                 .getParentSofaTracerSpan().getSofaTracerSpanContext();
             if (parentSofaTracerSpanContext != null) {
                 parentSpanId = parentSofaTracerSpanContext.getSpanId();
                 if (parentSpanId != null && StringUtils.isNotBlank(parentSpanId)) {
-                    if (CommonUtils.isHexString(parentSpanId)) {
-                        zipkinSpanBuilder.parentId(CommonUtils.hexToLong(parentSpanId));
-                    } else {
-                        zipkinSpanBuilder.parentId(spanIdToLong(parentSpanId));
-                    }
+                    zipkinSpanBuilder.parentId(spanIdToLong(parentSpanId));
                 }
             }
-
         }
 
         //spanId
         String spanId = sofaTracerSpanContext.getSpanId();
         zipkinSpanBuilder.id(spanIdToLong(spanId));
+        //kind
+        SofaTracer sofaTracer = sofaTracerSpan.getSofaTracer();
+        // adapter SOFARpc span model
+        if (SOFARPC_TRACER_TYPE.equals(sofaTracer.getTracerType())) {
+            zipkinSpanBuilder.kind(Span.Kind.CLIENT);
+        } else {
+            zipkinSpanBuilder.kind(sofaTracerSpan.isClient() ? Span.Kind.CLIENT : Span.Kind.SERVER);
+        }
         //name
         String operationName = sofaTracerSpan.getOperationName();
         if (StringUtils.isNotBlank(operationName)) {