From dd8e066249941ea50c89c942d98e782c8b13620e Mon Sep 17 00:00:00 2001
From: ascrutae <nzt48.xin@gmail.com>
Date: Mon, 4 Sep 2017 16:08:58 +0800
Subject: [PATCH] Combine context trace project and context trace project

---
 .../apm-toolkit-trace-context/pom.xml         | 45 -------------------
 .../apm/toolkit/trace/TraceContext.java       |  0
 apm-application-toolkit/pom.xml               |  1 -
 apm-sniffer/apm-agent/pom.xml                 |  6 ---
 .../trace/ActiveSpanTagInterceptor.java       |  8 +++-
 .../trace/TraceContextActivation.java         |  0
 .../trace/TraceContextInterceptor.java        |  0
 .../src/main/resources/skywalking-plugin.def  |  1 +
 .../pom.xml                                   | 15 -------
 .../src/main/resources/skywalking-plugin.def  |  1 -
 apm-sniffer/apm-toolkit-activation/pom.xml    |  1 -
 11 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 apm-application-toolkit/apm-toolkit-trace-context/pom.xml
 rename apm-application-toolkit/{apm-toolkit-trace-context => apm-toolkit-trace}/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java (100%)
 rename apm-sniffer/apm-toolkit-activation/{apm-toolkit-trace-context-activation => apm-toolkit-trace-activation}/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java (100%)
 rename apm-sniffer/apm-toolkit-activation/{apm-toolkit-trace-context-activation => apm-toolkit-trace-activation}/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java (100%)
 delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml
 delete mode 100644 apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def

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 5048fd8447..0000000000
--- a/apm-application-toolkit/apm-toolkit-trace-context/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>apm-application-toolkit</artifactId>
-        <groupId>org.skywalking</groupId>
-        <version>3.2-2017</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>apm-toolkit-trace-context</artifactId>
-    <packaging>jar</packaging>
-
-    <url>http://maven.apache.org</url>
-
-    <build>
-        <plugins>
-            <plugin>
-                <!-- 源码插件 -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <!-- 发布时自动将源码同时发布的配置 -->
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <version>2.4</version>
-            </plugin>
-        </plugins>
-    </build>
-
-    <distributionManagement>
-        <repository>
-            <id>bintray-wu-sheng-sky-walking-repository</id>
-            <name>wu-sheng-sky-walking-repository</name>
-            <url>
-                https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace-context/;publish=1
-            </url>
-        </repository>
-    </distributionManagement>
-</project>
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 b8f68ffd72..0399f5766c 100644
--- a/apm-application-toolkit/pom.xml
+++ b/apm-application-toolkit/pom.xml
@@ -17,7 +17,6 @@
         <module>apm-toolkit-log4j-1.x</module>
         <module>apm-toolkit-log4j-2.x</module>
         <module>apm-toolkit-logback-1.x</module>
-        <module>apm-toolkit-trace-context</module>
         <module>apm-toolkit-opentracing</module>
         <module>apm-toolkit-trace</module>
     </modules>
diff --git a/apm-sniffer/apm-agent/pom.xml b/apm-sniffer/apm-agent/pom.xml
index 388873e7b7..f0176149e1 100644
--- a/apm-sniffer/apm-agent/pom.xml
+++ b/apm-sniffer/apm-agent/pom.xml
@@ -119,12 +119,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.skywalking</groupId>
-            <artifactId>apm-toolkit-trace-context-activation</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.skywalking</groupId>
             <artifactId>apm-toolkit-opentracing-activation</artifactId>
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 17f4741332..fd6b9c6e6b 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 42ba1a8e60..7f6e4970b8 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 9d358a67ca..0000000000
--- a/apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>apm-toolkit-activation</artifactId>
-        <groupId>org.skywalking</groupId>
-        <version>3.2-2017</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>apm-toolkit-trace-context-activation</artifactId>
-    <packaging>jar</packaging>
-
-    <name>apm-toolkit-trace-context-activation</name>
-</project>
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 0284210fdf..0000000000
--- 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 32b2aa5330..1aadcdcbb1 100644
--- a/apm-sniffer/apm-toolkit-activation/pom.xml
+++ b/apm-sniffer/apm-toolkit-activation/pom.xml
@@ -13,7 +13,6 @@
         <module>apm-toolkit-log4j-1.x-activation</module>
         <module>apm-toolkit-log4j-2.x-activation</module>
         <module>apm-toolkit-logback-1.x-activation</module>
-        <module>apm-toolkit-trace-context-activation</module>
         <module>apm-toolkit-opentracing-activation</module>
         <module>apm-toolkit-trace-activation</module>
     </modules>
-- 
GitLab