Merge branch 'master' into feature/debugging

.gitignore

@@ -7,3 +7,4 @@ target/
 .settings/
 .DS_Store
 *~
+packages/

apm-application-toolkit/apm-toolkit-trace-context/pom.xml

-<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>

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>

apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/register/instance/InstanceRegisterSerialWorker.java

 package org.skywalking.apm.collector.agentstream.worker.register.instance;
 
-import org.skywalking.apm.collector.agentstream.worker.register.IdAutoIncrement;
-import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine;
 import org.skywalking.apm.collector.agentstream.worker.register.instance.dao.IInstanceDAO;
 import org.skywalking.apm.collector.storage.dao.DAOContainer;
+import org.skywalking.apm.collector.storage.define.DataDefine;
+import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine;
 import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine;
 import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker;
 import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider;
@@ -11,7 +11,6 @@ import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext;
 import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException;
 import org.skywalking.apm.collector.stream.worker.Role;
 import org.skywalking.apm.collector.stream.worker.WorkerException;
-import org.skywalking.apm.collector.storage.define.DataDefine;
 import org.skywalking.apm.collector.stream.worker.selector.ForeverFirstSelector;
 import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector;
 import org.slf4j.Logger;
@@ -40,16 +39,25 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker {
             IInstanceDAO dao = (IInstanceDAO)DAOContainer.INSTANCE.get(IInstanceDAO.class.getName());
             int instanceId = dao.getInstanceId(instance.getApplicationId(), instance.getAgentUUID());
             if (instanceId == 0) {
-                int min = dao.getMinInstanceId();
-                if (min == 0) {
+//                int min = dao.getMinInstanceId();
+//                if (min == 0) {
+//                    instance.setId("1");
+//                    instance.setInstanceId(1);
+//                } else {
+//                    int max = dao.getMaxInstanceId();
+//                    instanceId = IdAutoIncrement.INSTANCE.increment(min, max);
+//                    instance.setId(String.valueOf(instanceId));
+//                    instance.setInstanceId(instanceId);
+//                }
+                int max = dao.getMaxInstanceId();
+                if (max == 0) {
                     instance.setId("1");
                     instance.setInstanceId(1);
                 } else {
-                    int max = dao.getMaxInstanceId();
-                    instanceId = IdAutoIncrement.INSTANCE.increment(min, max);
-                    instance.setId(String.valueOf(instanceId));
-                    instance.setInstanceId(instanceId);
+                    instance.setId(String.valueOf(max + 1));
+                    instance.setInstanceId(max + 1);
                 }
+
                 dao.save(instance);
             }
         }

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>
@@ -152,6 +146,7 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <outputDirectory>${project.basedir}/../../packages</outputDirectory>
                             <shadedArtifactAttached>false</shadedArtifactAttached>
                             <createDependencyReducedPom>true</createDependencyReducedPom>
                             <createSourcesJar>true</createSourcesJar>

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,

apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def

 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

apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml

-<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>

apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def

-tracecontext=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation
\ No newline at end of file

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>