kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 修改Config类中的ApplicationId成ApplicationCode 

2. 修改TraceId的生成规则，将-连接符去掉
This commit is contained in:
zhangxin10 2015-12-22 07:15:52 +08:00
parent cd60b5adf7
commit 7a923fa253
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/ThreadBuriedPointSender.java
View File

@ -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);

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

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

8
skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java
View File

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

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

@ -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;
}
}