From 1facd500099c7f2fe7e4bcae640ce9633e13d69f Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 12 Jan 2016 14:47:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E8=AF=B4=E6=98=8E=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?TID=E7=9A=84=E6=A0=BC=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/sky-walking.auth | 2 -- .../java/com/ai/cloud/skywalking/conf/Config.java | 2 -- .../com/ai/cloud/skywalking/conf/Constants.java | 1 + .../ai/cloud/skywalking/util/TraceIdGenerator.java | 14 +++++++------- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/samples/skywalking-auth/src/main/resources/sky-walking.auth b/samples/skywalking-auth/src/main/resources/sky-walking.auth index 1f039a045..5ff536049 100644 --- a/samples/skywalking-auth/src/main/resources/sky-walking.auth +++ b/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 diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java index 52a93542c..9b5689696 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Config.java +++ b/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 { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java index 234541c54..8d2382096 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/conf/Constants.java +++ b/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 = "^~"; diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java index 605f0664e..0884e10ae 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java +++ b/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 ThreadTraceIdSequence = new ThreadLocal(); @@ -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; } } From 63d7967f47b1b74ef611812c28035d36381d01c5 Mon Sep 17 00:00:00 2001 From: wusheng Date: Tue, 12 Jan 2016 14:54:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/cloud/skywalking/model/Identification.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java index deee44c1c..a3d762818 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java +++ b/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();