From 2ef6ef46155f35de5083851d61ff9465ccc113ce Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 22 Jan 2016 18:03:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84CID=E5=92=8CC=5FNID=E7=9A=84=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=A7=84=E5=88=99=E4=BB=A5=E5=8F=8A=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/filter/impl/TokenGenerateFilter.java | 2 +- .../cloud/skywalking/analysis/model/ChainInfo.java | 2 +- .../skywalking/analysis/util/TokenGenerator.java | 12 ++++++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/filter/impl/TokenGenerateFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/filter/impl/TokenGenerateFilter.java index a4e133a74..49c6b5421 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/filter/impl/TokenGenerateFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/filter/impl/TokenGenerateFilter.java @@ -11,7 +11,7 @@ public class TokenGenerateFilter extends SpanNodeProcessFilter { @Override public void doFilter(SpanEntry spanEntry, ChainNode node, CostMap costMap) { - String nodeToken = TokenGenerator.generate(node.getParentLevelId() + "." + node.getLevelId() + + String nodeToken = TokenGenerator.generateNodeToken(node.getParentLevelId() + "." + node.getLevelId() + "-" + node.getViewPoint()); node.setNodeToken(nodeToken); diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/ChainInfo.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/ChainInfo.java index 379e5183d..4dad26100 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/ChainInfo.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/ChainInfo.java @@ -83,7 +83,7 @@ public class ChainInfo implements Writable { for (ChainNode node : nodes) { chainTokenDesc.append(node.getParentLevelId() + "." + node.getLevelId() + "-" + node.getNodeToken() + ";"); } - this.cid = TokenGenerator.generate(chainTokenDesc.toString()) + "-"; + this.cid = TokenGenerator.generateCID(chainTokenDesc.toString()); } public ChainStatus getChainStatus() { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/util/TokenGenerator.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/util/TokenGenerator.java index 321baa8db..0ac0e481e 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/util/TokenGenerator.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/util/TokenGenerator.java @@ -12,8 +12,16 @@ public class TokenGenerator { private TokenGenerator() { //Non } + + public static String generateCID(String originData) { + return "CID_" + generate(originData); + } + + public static String generateNodeToken(String originData){ + return "C_NID_" + generate(originData); + } - public static String generate(String originData) { + private static String generate(String originData) { StringBuilder result = new StringBuilder(); if (originData != null) { try { @@ -31,6 +39,6 @@ public class TokenGenerator { System.exit(-1); } } - return "CID:" + result.toString().toUpperCase(); + return result.toString().toUpperCase(); } }