diff --git a/apm-application-toolkit/apm-toolkit-trace-context/pom.xml b/apm-application-toolkit/apm-toolkit-trace-context/pom.xml
deleted file mode 100644
index 5048fd84472675f06c2eab9be2e3d8cd94983677..0000000000000000000000000000000000000000
--- a/apm-application-toolkit/apm-toolkit-trace-context/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
- apm-application-toolkit
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- apm-toolkit-trace-context
- jar
-
- http://maven.apache.org
-
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
-
-
- attach-sources
-
- jar
-
-
-
- 2.4
-
-
-
-
-
-
- bintray-wu-sheng-sky-walking-repository
- wu-sheng-sky-walking-repository
-
- https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace-context/;publish=1
-
-
-
-
diff --git a/apm-application-toolkit/apm-toolkit-trace-context/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java b/apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
similarity index 100%
rename from apm-application-toolkit/apm-toolkit-trace-context/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
rename to apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
diff --git a/apm-application-toolkit/pom.xml b/apm-application-toolkit/pom.xml
index b8f68ffd72ea5462235ebbdba5c12af0772e6dd4..0399f5766cac977dcfdc79c295b784962a076cc8 100644
--- a/apm-application-toolkit/pom.xml
+++ b/apm-application-toolkit/pom.xml
@@ -17,7 +17,6 @@
apm-toolkit-log4j-1.x
apm-toolkit-log4j-2.x
apm-toolkit-logback-1.x
- apm-toolkit-trace-context
apm-toolkit-opentracing
apm-toolkit-trace
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 388873e7b70ceb49a1ed66ce5734126e0222742f..f0176149e187417cae63cccd42fd296bb3643e77 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -119,12 +119,6 @@
${project.version}
-
- org.skywalking
- apm-toolkit-trace-context-activation
- ${project.version}
-
-
org.skywalking
apm-toolkit-opentracing-activation
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java
index 17f4741332a30dba97c821c5941866c9f91dbdfb..fd6b9c6e6b45b54f3b02dc585a24aa14a5eadbd9 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java
@@ -9,8 +9,12 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAro
public class ActiveSpanTagInterceptor implements StaticMethodsAroundInterceptor {
@Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class>[] parameterTypes,
MethodInterceptResult result) {
- AbstractSpan activeSpan = ContextManager.activeSpan();
- activeSpan.tag(String.valueOf(allArguments[0]), String.valueOf(allArguments[1]));
+ AbstractSpan activeSpan = null;
+ try {
+ activeSpan = ContextManager.activeSpan();
+ activeSpan.tag(String.valueOf(allArguments[0]), String.valueOf(allArguments[1]));
+ } catch (NullPointerException e) {
+ }
}
@Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class>[] parameterTypes,
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
similarity index 100%
rename from apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
rename to apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
similarity index 100%
rename from apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
rename to apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def
index 42ba1a8e60521e8590174b8d245f7f09c7bb85fe..7f6e4970b881310b0daa299838fb2fe3747e22f7 100644
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def
+++ b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def
@@ -1,2 +1,3 @@
trace-annotation=org.skywalking.apm.toolkit.activation.trace.ActiveSpanTagActivation
trace-annotation=org.skywalking.apm.toolkit.activation.trace.TraceAnnotationActivation
+trace-context=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml
deleted file mode 100644
index 9d358a67ca8094d7f7bd8de1e06bf84a2a4d8d11..0000000000000000000000000000000000000000
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- apm-toolkit-activation
- org.skywalking
- 3.2-2017
-
- 4.0.0
-
- apm-toolkit-trace-context-activation
- jar
-
- apm-toolkit-trace-context-activation
-
diff --git a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def b/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
deleted file mode 100644
index 0284210fdfdf19b57caf73139b9425d870efed12..0000000000000000000000000000000000000000
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
+++ /dev/null
@@ -1 +0,0 @@
-tracecontext=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation
\ No newline at end of file
diff --git a/apm-sniffer/apm-toolkit-activation/pom.xml b/apm-sniffer/apm-toolkit-activation/pom.xml
index 32b2aa533012bf3f84e79ffd34c0e6ef43825a74..1aadcdcbb1683fec672299cbda17b5a476a50a73 100644
--- a/apm-sniffer/apm-toolkit-activation/pom.xml
+++ b/apm-sniffer/apm-toolkit-activation/pom.xml
@@ -13,7 +13,6 @@
apm-toolkit-log4j-1.x-activation
apm-toolkit-log4j-2.x-activation
apm-toolkit-logback-1.x-activation
- apm-toolkit-trace-context-activation
apm-toolkit-opentracing-activation
apm-toolkit-trace-activation