Merge remote-tracking branch 'origin/master'

samples/skywalking-auth/src/main/resources/sky-walking.auth

@@ -6,8 +6,6 @@ skywalking.application_code=test
 skywalking.auth_system_env_name=SKYWALKING_RUN
 #skywalking数据编码
 skywalking.charset=UTF-8
-#skywalking SDK的版本
-skywalking.sdk_version=1.0a2
 
 #是否打印数据
 buriedpoint.printf=false

skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java

@@ -12,8 +12,6 @@ public class Config {
         public static boolean AUTH_OVERRIDE = false;
 
         public static String CHARSET = "UTF-8";
-
-        public static String SDK_VERSION = "";
     }
 
     public static class BuriedPoint {

skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java

@@ -1,6 +1,7 @@
 package com.ai.cloud.skywalking.conf;
 
 public class Constants {
+	public static String SDK_VERSION = "1.0a2";
 
     public static final String HEALTH_DATA_SPILT_PATTERN = "^~";
 

skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java

@@ -2,7 +2,6 @@ package com.ai.cloud.skywalking.model;
 
 import com.ai.cloud.skywalking.api.IBuriedPointType;
 import com.ai.cloud.skywalking.util.StringUtil;
-import com.sun.xml.internal.txw2.IllegalSignatureException;
 
 public class Identification {
     private String viewPoint;
@@ -57,7 +56,7 @@ public class Identification {
 
         public IdentificationBuilder spanType(IBuriedPointType spanType) {
             if (StringUtil.isEmpty(spanType.getTypeName())) {
-                throw new IllegalSignatureException("Span Type name cannot be null");
+                throw new IllegalArgumentException("Span Type name cannot be null");
             }
             sendData.spanType = spanType.getTypeName();
             sendData.callType = spanType.getCallType().toString();

skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java

@@ -1,9 +1,9 @@
 package com.ai.cloud.skywalking.util;
 
-import com.ai.cloud.skywalking.conf.Config;
-
 import java.util.UUID;
 
+import com.ai.cloud.skywalking.conf.Constants;
+
 public final class TraceIdGenerator {
     private static final ThreadLocal<Integer> ThreadTraceIdSequence = new ThreadLocal<Integer>();
 
@@ -25,10 +25,10 @@ public final class TraceIdGenerator {
         seq++;
         ThreadTraceIdSequence.set(seq);
 
-        return Config.SkyWalking.SDK_VERSION + "." + System.currentTimeMillis()
-                + PROCESS_UUID
-                + BuriedPointMachineUtil.getProcessNo()
-                + Thread.currentThread().getId()
-                + seq;
+        return Constants.SDK_VERSION + "." + System.currentTimeMillis()
+        		 + "."+ PROCESS_UUID
+        		 + "."+ BuriedPointMachineUtil.getProcessNo()
+                 + "."+ Thread.currentThread().getId()
+                 + "."+ seq;
     }
 }