Unverified Commit 9c049684 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Try to fix #886 (#892) 

* Try to fix #886

* Try to fix ci.

* Fix a style check.
parent f75b067b

apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingContext.java

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
package org.apache.skywalking.apm.toolkit.opentracing;



import io.opentracing.SpanContext;



import java.util.Map;



/**
@@ -30,7 +31,7 @@ import java.util.Map; 
public class SkywalkingContext implements SpanContext {

    public static final SkywalkingContext INSTANCE = new SkywalkingContext();



    private SkywalkingContext() {

    public SkywalkingContext() {

    }



    @Override

apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingSpanBuilder.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import io.opentracing.Span; 
import io.opentracing.SpanContext;

import io.opentracing.Tracer;

import io.opentracing.tag.Tags;



import java.util.LinkedList;

import java.util.List;

apm-application-toolkit/apm-toolkit-opentracing/src/main/java/org/apache/skywalking/apm/toolkit/opentracing/SkywalkingTracer.java

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public class SkywalkingTracer implements Tracer { 
    @NeedSnifferActivation

    @Override

    public <C> SpanContext extract(Format<C> format, C carrier) {

        return new TextMapContext();

        return new SkywalkingContext();

    }



    @Override

apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/opentracing/tracer/SkywalkingTracerExtractInterceptor.java

+13 −12
Original line number Diff line number Diff line
@@ -21,16 +21,17 @@ package org.apache.skywalking.apm.toolkit.activation.opentracing.tracer; 


import io.opentracing.propagation.Format;

import io.opentracing.propagation.TextMap;

import java.lang.reflect.Method;

import java.util.Iterator;

import java.util.Map;

import org.apache.skywalking.apm.agent.core.context.ContextCarrier;

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

import org.apache.skywalking.apm.agent.core.context.CarrierItem;

import org.apache.skywalking.apm.agent.core.context.ContextCarrier;

import org.apache.skywalking.apm.agent.core.context.ContextManager;

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor;

import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult;

import org.apache.skywalking.apm.toolkit.opentracing.TextMapContext;

import org.apache.skywalking.apm.toolkit.opentracing.SkywalkingContext;



import java.lang.reflect.Method;

import java.util.Iterator;

import java.util.Map;



public class SkywalkingTracerExtractInterceptor implements InstanceMethodsAroundInterceptor {

    @Override
@@ -61,7 +62,7 @@ public class SkywalkingTracerExtractInterceptor implements InstanceMethodsAround 
            }

            ContextManager.extract(contextCarrier);

        }

        return new TextMapContext();

        return new SkywalkingContext();

    }



    @Override

apm-sniffer/apm-toolkit-activation/apm-toolkit-opentracing-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/opentracing/SkywalkingSpanActivationTest.java

+33 −22
Original line number Diff line number Diff line
@@ -23,10 +23,12 @@ import io.opentracing.Tracer; 
import io.opentracing.propagation.Format;

import io.opentracing.propagation.TextMap;

import io.opentracing.tag.Tags;



import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

import java.util.Map;



import org.apache.skywalking.apm.agent.test.helper.SegmentHelper;

import org.apache.skywalking.apm.agent.test.tools.SegmentRefAssert;

import org.apache.skywalking.apm.agent.test.tools.SegmentStorage;
@@ -192,11 +194,13 @@ public class SkywalkingSpanActivationTest { 


        final Map<String, String> values = new HashMap<String, String>();

        TextMap carrier = new TextMap() {

            @Override public Iterator<Map.Entry<String, String>> iterator() {

            @Override

            public Iterator<Map.Entry<String, String>> iterator() {

                return null;

            }



            @Override public void put(String key, String value) {

            @Override

            public void put(String key, String value) {

                values.put(key, value);

            }
@@ -219,11 +223,13 @@ public class SkywalkingSpanActivationTest { 
        startSpan();

        final Map<String, String> values = new HashMap<String, String>();

        TextMap carrier = new TextMap() {

            @Override public Iterator<Map.Entry<String, String>> iterator() {

            @Override

            public Iterator<Map.Entry<String, String>> iterator() {

                return values.entrySet().iterator();

            }



            @Override public void put(String key, String value) {

            @Override

            public void put(String key, String value) {

                values.put(key, value);

            }
@@ -255,11 +261,13 @@ public class SkywalkingSpanActivationTest { 


        final Map<String, String> values = new HashMap<String, String>();

        TextMap carrier = new TextMap() {

            @Override public Iterator<Map.Entry<String, String>> iterator() {

            @Override

            public Iterator<Map.Entry<String, String>> iterator() {

                return values.entrySet().iterator();

            }



            @Override public void put(String key, String value) {

            @Override

            public void put(String key, String value) {

                values.put(key, value);

            }
@@ -284,7 +292,8 @@ public class SkywalkingSpanActivationTest { 
        constructorInterceptor.onConstruct(continuationHolder, null);

        assertTrue(continuationHolder.getSkyWalkingDynamicField() instanceof ContextSnapshot);

        new Thread() {

            @Override public void run() {

            @Override

            public void run() {

                MockEnhancedInstance enhancedInstance = new MockEnhancedInstance();

                try {

                    startSpan(enhancedInstance);
@@ -341,11 +350,13 @@ public class SkywalkingSpanActivationTest { 
    private class MockEnhancedInstance implements EnhancedInstance {

        public Object object;



        @Override public Object getSkyWalkingDynamicField() {

        @Override

        public Object getSkyWalkingDynamicField() {

            return object;

        }



        @Override public void setSkyWalkingDynamicField(Object value) {

        @Override

        public void setSkyWalkingDynamicField(Object value) {

            this.object = value;

        }

    }