From 485870e14114cfebc0f3d1c3e7ace7b2ea3960db Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Thu, 7 Jan 2016 15:59:12 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8D=E5=AF=B9ContextData?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=BA=8F=E5=88=97=E5=8C=96=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AF=B9ParentLevelId=E8=BF=9B=E8=A1=8C=E5=88=A4?= =?UTF-8?q?=E7=A9=BA=E5=A4=84=E7=90=86=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/skywalking/model/ContextData.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java b/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java index fbae131ce..5ad869d47 100644 --- a/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java +++ b/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/ContextData.java @@ -23,11 +23,11 @@ public class ContextData { public ContextData(String contextDataStr) { // 反序列化参数 String[] value = contextDataStr.split("-"); - if(value == null || value.length != 4){ - throw new IllegalArgumentException("illegal context data."); + if (value == null || value.length != 4) { + throw new IllegalArgumentException("illegal context data."); } this.traceId = value[0]; - this.parentLevel = value[1]; + this.parentLevel = value[1].trim(); this.levelId = Integer.valueOf(value[2]); this.spanType = value[3]; @@ -51,6 +51,18 @@ public class ContextData { @Override public String toString() { - return traceId + "-" + parentLevel + "-" + levelId + "-" + spanType; + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(traceId); + stringBuilder.append("-"); + if (parentLevel != null && parentLevel.length() > 0) { + stringBuilder.append(" "); + } else { + stringBuilder.append(parentLevel); + } + stringBuilder.append("-"); + stringBuilder.append(levelId); + stringBuilder.append("-"); + stringBuilder.append(spanType); + return stringBuilder.toString(); } }