Commit f0a91d45 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #96 from ascrutae/feature/3.0 

fix context data cannot transport to provider side issue
parents bbdede77 7e701394

skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracer.java

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ import java.nio.ByteBuffer; 
 * Created by wusheng on 2016/12/20.

 */

public class SkyWalkingTracer implements Tracer {

    private static String TRACE_HEAD_NAME = "SkyWalking-TRACING-NAME";

    private static String TRACE_HEAD_NAME = "SW-TRACING-NAME";



    public static Tracer INSTANCE = new SkyWalkingTracer();

skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/StringUtil.java

+8 −1
Original line number Diff line number Diff line
@@ -17,13 +17,20 @@ public final class StringUtil { 
        }

        int length = strings.length - 1;

        for (final String s : strings) {

            if (s == null) {

                continue;

            }

            length += s.length();

        }

        final StringBuilder sb = new StringBuilder(length);

        if (strings[0] != null) {

            sb.append(strings[0]);

        }

        for (int i = 1; i < strings.length; ++i) {

            if (!isEmpty(strings[i])) {

                sb.append(delimiter).append(strings[i]);

            } else {

                sb.append(delimiter);

            }

        }

        return sb.toString();

skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ public class DubboInterceptorTest { 
            public void call(TraceSegment traceSegment) {

                assertThat(traceSegment.getSpans().size(), is(1));

                assertConsumerSpan(traceSegment.getSpans().get(0));

                testParam.assertSelf("0", "127.0.0.1");

                testParam.assertSelf("127.0.0.1");

            }

        });

    }

skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/RequestParamForTestBelow283.java

+2 −4
Original line number Diff line number Diff line
@@ -14,11 +14,9 @@ public class RequestParamForTestBelow283 extends SWBaseBean { 
    /**

     * This method assert that {@link SWBaseBean#getTraceContext()} if it's not null and context data

     * will end with the expect span id.

     *

     * @param expectSpanId expect span id

     */

    public void assertSelf(String expectSpanId, String expectHost) {

    public void assertSelf(String expectHost) {

        assertNotNull(getTraceContext());

        assertThat(getTraceContext(), endsWith(expectSpanId + "|" + expectHost));

        assertThat(getTraceContext(), endsWith(expectHost));

    }

}

skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInvokeInterceptor.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class MotanConsumerInvokeInterceptor implements InstanceMethodsAroundInte 
    /**

     * Attachment key of the serialized context data.

     */

    private static final String ATTACHMENT_KEY_OF_CONTEXT_DATA = "contextData";

    private static final String ATTACHMENT_KEY_OF_CONTEXT_DATA = "SWTraceContext";



    /**

     * Motan component