From 5167d5a5f963f83d3b57661593c3b352169b7fe0 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Wed, 11 Nov 2015 11:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9SpanStack=E7=9A=84nextSubSpan?= =?UTF-8?q?LevelId=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java | 3 +-- .../main/java/com/ai/cloud/skywalking/context/Context.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java index af703ac47..b29365dc6 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/buriedpoint/RPCBuriedPointSender.java @@ -17,8 +17,7 @@ public class RPCBuriedPointSender implements IBuriedPointSender { // 3.将新创建的Context存放到ThreadLocal栈中。 Context.getOrCreate().append(spanData); // 4 并将当前的Context返回回去 - return new ContextData(new Span(spanData.getTraceId(), spanData.getParentLevel()/* + - "." + spanData.getLevelId()*/)); + return new ContextData(new Span(spanData.getTraceId(), spanData.getParentLevel())); } public void afterSend() { diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java index 49b1e9a88..6c4995d55 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/context/Context.java @@ -42,7 +42,7 @@ public class Context { public void push(Span span) { if (!isEmpty()) { - spans.push(new SpanNode(span, spans.peek().getLevelId())); + spans.push(new SpanNode(span, spans.peek().getNextSubSpanLevelId())); } else { spans.push(new SpanNode(span)); } @@ -79,7 +79,7 @@ public class Context { return data; } - public int getLevelId() { + public int getNextSubSpanLevelId() { return nextSubSpanLevelId; }