From 7a923fa253801022daf70b59233916818983766a Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 22 Dec 2015 07:15:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9Config=E7=B1=BB=E4=B8=AD?= =?UTF-8?q?=E7=9A=84ApplicationId=E6=88=90ApplicationCode=202.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9TraceId=E7=9A=84=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= =?UTF-8?q?=EF=BC=8C=E5=B0=86-=E8=BF=9E=E6=8E=A5=E7=AC=A6=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skywalking/buriedpoint/ThreadBuriedPointSender.java | 4 ++-- .../main/java/com/ai/cloud/skywalking/conf/Config.java | 2 +- .../com/ai/cloud/skywalking/util/ContextGenerator.java | 8 ++++---- .../com/ai/cloud/skywalking/util/TraceIdGenerator.java | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java index 29bfa9934..11562187a 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java @@ -28,11 +28,11 @@ public class ThreadBuriedPointSender implements IBuriedPointSender { // 从ThreadLocal中取出上下文 final Span parentSpanData = Context.getLastSpan(); if (parentSpanData == null) { - spanData = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_ID, + spanData = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); } else { // 如果不为空，则将当前的Context存放到上下文 - spanData = new Span(parentSpanData.getTraceId(), Config.SkyWalking.APPLICATION_ID, + spanData = new Span(parentSpanData.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); spanData.setParentLevel(parentSpanData.getParentLevel() + "." + parentSpanData.getLevelId()); spanData.setLevelId(threadSeqId); 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 5bae26cad..c8d8b6efc 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 @@ -5,7 +5,7 @@ public class Config { public static class SkyWalking { public static String USER_ID; - public static String APPLICATION_ID; + public static String APPLICATION_CODE; } public static class BuriedPoint { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java index b945728f8..0958d9d26 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java @@ -31,10 +31,10 @@ public final class ContextGenerator { // 校验传入的参数是否为空，如果为空，则新创建一个 if (context == null || StringUtil.isEmpty(context.getTraceId())) { // 不存在，新创建一个Context - spanData = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_ID, Config.SkyWalking.USER_ID); + spanData = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); } else { // 如果不为空，则将当前的Context存放到上下文 - spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(), Config.SkyWalking.APPLICATION_ID, Config.SkyWalking.USER_ID); + spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); } initNewSpanData(spanData, id); @@ -58,12 +58,12 @@ public final class ContextGenerator { // 2 校验Context，Context是否存在 if (parentSpan == null) { // 不存在，新创建一个Context - span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_ID, Config.SkyWalking.USER_ID); + span = new Span(TraceIdGenerator.generate(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); } else { // 根据ParentContextData的TraceId和RPCID // LevelId是由SpanNode类的nextSubSpanLevelId字段进行初始化的. // 所以在这里不需要初始化 - span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_ID, Config.SkyWalking.USER_ID); + span = new Span(parentSpan.getTraceId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID); if (!StringUtil.isEmpty(parentSpan.getParentLevel())) { span.setParentLevel(parentSpan.getParentLevel() + "." + parentSpan.getLevelId()); } else { 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 1fc259806..81b8011da 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 @@ -24,9 +24,9 @@ public final class TraceIdGenerator { ThreadTraceIdSequence.set(seq); return System.currentTimeMillis() - + "." + PROCESS_UUID - + "." + BuriedPointMachineUtil.getProcessNo() - + "." + Thread.currentThread().getId() - + "." + seq; + + PROCESS_UUID + + BuriedPointMachineUtil.getProcessNo() + + Thread.currentThread().getId() + + seq; } }