Cheer pick 2.3.4 (#193)

* prepare to release 3.0.3 * cheery pick from Fix issue 177 * Fix mvc extract spancontext * Fix zipkin report throwable
sofastack · Mar 22, 2019 · f4e3d45 · f4e3d45
1 parent bda08c1
commit f4e3d45
Show file tree

Hide file tree

Showing 29 changed files with 136 additions and 105 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>tracer-all-parent</artifactId>
-    <version>3.0.3-SNAPSHOT</version>
+    <version>3.0.3</version>
     <packaging>pom</packaging>
     <name>tracer-all-parent</name>
     <description>Alipay SOFATracer Log Implemented by OpenTracing</description>
@@ -33,7 +33,7 @@
 
     <properties>
         <opentracing.version>0.22.0</opentracing.version>
-        <sofa.tracer.version>3.0.3-SNAPSHOT</sofa.tracer.version>
+        <sofa.tracer.version>3.0.3</sofa.tracer.version>
         <java.compiler.source.version>1.8</java.compiler.source.version>
         <java.compiler.target.version>1.8</java.compiler.target.version>
         <jmh.version>1.9.3</jmh.version>

diff --git a/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-datasource-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-httpclient-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-okhttp-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/sofa-tracer-plugins/sofa-tracer-springmvc-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-springmvc-plugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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
@@ -19,11 +19,11 @@
 import com.alipay.common.tracer.core.SofaTracer;
 import com.alipay.common.tracer.core.configuration.SofaTracerConfiguration;
 import com.alipay.common.tracer.core.context.span.SofaTracerSpanContext;
+import com.alipay.common.tracer.core.registry.AbstractTextB3Formatter;
 import com.alipay.common.tracer.core.registry.ExtendFormat;
 import com.alipay.common.tracer.core.span.CommonSpanTags;
 import com.alipay.common.tracer.core.span.SofaTracerSpan;
 import com.alipay.common.tracer.core.utils.StringUtils;
-
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -66,11 +66,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
             // sr
             springMvcSpan = springMvcTracer.serverReceive(spanContext);
 
-            if (!isRootSpan(request)) {
-                springMvcSpan.getSofaTracerSpanContext()
-                    .setSpanId(spanContext.nextChildContextId());
-            }
-
             if (StringUtils.isBlank(this.appName)) {
                 this.appName = SofaTracerConfiguration
                     .getProperty(SofaTracerConfiguration.TRACER_APPNAME_KEY);
@@ -103,18 +98,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
         }
     }
 
-    private boolean isRootSpan(HttpServletRequest request) {
-        Enumeration headerNames = request.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            String key = (String) headerNames.nextElement();
-            String value = request.getHeader(key);
-            if (key.equals("X-B3-TraceId") && StringUtils.isNotBlank(value)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     @Override
     public void destroy() {
         // no operation
@@ -142,7 +125,7 @@ public SofaTracerSpanContext getSpanContextFromRequest(HttpServletRequest reques
             headers.put(key, value);
         }
         // Delay the initialization of the SofaTracerSpanContext to execute the serverReceive method
-        if (headers.isEmpty() || !headers.containsKey("X-B3-TraceId")) {
+        if (headers.isEmpty() || !isContainSofaTracerMark(headers)) {
             return null;
         }
 
@@ -152,6 +135,18 @@ public SofaTracerSpanContext getSpanContextFromRequest(HttpServletRequest reques
         return spanContext;
     }
 
+    /**
+     * To check is contain sofaTracer mark
+     * @param headers
+     * @return
+     */
+    private boolean isContainSofaTracerMark(HashMap<String, String> headers) {
+        return (headers.containsKey(AbstractTextB3Formatter.TRACE_ID_KEY_HEAD.toLowerCase()) || headers
+            .containsKey(AbstractTextB3Formatter.TRACE_ID_KEY_HEAD))
+               && (headers.containsKey(AbstractTextB3Formatter.SPAN_ID_KEY_HEAD.toLowerCase()) || headers
+                   .containsKey(AbstractTextB3Formatter.SPAN_ID_KEY_HEAD));
+    }
+
     class ResponseWrapper extends HttpServletResponseWrapper {
 
         int contentLength = 0;

diff --git a/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml b/sofa-tracer-plugins/sofa-tracer-zipkin-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...in/java/com/alipay/sofa/tracer/plugins/zipkin/ZipkinSofaTracerRestTemplateCustomizer.java b/...in/java/com/alipay/sofa/tracer/plugins/zipkin/ZipkinSofaTracerRestTemplateCustomizer.java
@@ -65,4 +65,4 @@ public ClientHttpResponse intercept(HttpRequest request, byte[] body,
             return execution.execute(request, gzipped.toByteArray());
         }
     }
-}
+}
diff --git a/.../src/main/java/com/alipay/sofa/tracer/plugins/zipkin/sender/ZipkinRestTemplateSender.java b/.../src/main/java/com/alipay/sofa/tracer/plugins/zipkin/sender/ZipkinRestTemplateSender.java
@@ -16,6 +16,7 @@
  */
 package com.alipay.sofa.tracer.plugins.zipkin.sender;
 
+import com.alipay.common.tracer.core.appender.self.SelfLog;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
@@ -64,9 +65,7 @@ public Call<Void> sendSpans(List<byte[]> encodedSpans) {
             byte[] message = BytesMessageEncoder.JSON.encode(encodedSpans);
             post(message);
         } catch (Throwable e) {
-            if (e instanceof Error) {
-                throw (Error) e;
-            }
+            SelfLog.error("Failed to report span to remote server. Current rest url is " + url, e);
         }
         return null;
     }

diff --git a/tracer-all/pom.xml b/tracer-all/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>tracer-all</artifactId>
-    <version>3.0.3-SNAPSHOT</version>
+    <version>3.0.3</version>
     <packaging>jar</packaging>
 
     <name>SOFATracer in one without SOFABoot starter</name>

diff --git a/tracer-core/pom.xml b/tracer-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>tracer-all-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>3.0.3-SNAPSHOT</version>
+        <version>3.0.3</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...er-core/src/main/java/com/alipay/common/tracer/core/registry/AbstractTextB3Formatter.java b/...er-core/src/main/java/com/alipay/common/tracer/core/registry/AbstractTextB3Formatter.java
@@ -27,32 +27,32 @@ public abstract class AbstractTextB3Formatter implements RegistryExtractorInject
     /**
      * 128/64 bit traceId lower-hex string (required)
      */
-    static final String TRACE_ID_KEY_HEAD       = "X-B3-TraceId";
+    public static final String TRACE_ID_KEY_HEAD       = "X-B3-TraceId";
     /**
      * 64 bit spanId lower-hex string (required)
      */
-    static final String SPAN_ID_KEY_HEAD        = "X-B3-SpanId";
+    public static final String SPAN_ID_KEY_HEAD        = "X-B3-SpanId";
     /**
      * 64 bit parentSpanId lower-hex string (absent on root span)
      */
-    static final String PARENT_SPAN_ID_KEY_HEAD = "X-B3-ParentSpanId";
+    public static final String PARENT_SPAN_ID_KEY_HEAD = "X-B3-ParentSpanId";
     /**
      * "1" means report this span to the tracing system, "0" means do not. (absent means defer the
      * decision to the receiver of this header).
      */
-    static final String SAMPLED_KEY_HEAD        = "X-B3-Sampled";
+    public static final String SAMPLED_KEY_HEAD        = "X-B3-Sampled";
     /**
      * "1" implies sampled and is a request to override collection-tier sampling policy.
      */
-    static final String FLAGS_KEY_HEAD          = "X-B3-Flags";
+    static final String        FLAGS_KEY_HEAD          = "X-B3-Flags";
     /**
      * Baggage items prefix
      */
-    static final String BAGGAGE_KEY_PREFIX      = "baggage-";
+    static final String        BAGGAGE_KEY_PREFIX      = "baggage-";
     /**
      * System Baggage items prefix
      */
-    static final String BAGGAGE_SYS_KEY_PREFIX  = "baggage-sys-";
+    static final String        BAGGAGE_SYS_KEY_PREFIX  = "baggage-sys-";
 
     @Override
     public SofaTracerSpanContext extract(TextMap carrier) {