From 65c831a2ab259997dd00cfa4b34fc8d0160a67a4 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Fri, 29 Apr 2016 13:25:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/chainbuild/entity/CallChainTreeNode.java | 2 +- .../chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/CallChainTreeNode.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/CallChainTreeNode.java index 5234947fb..557aa0d60 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/CallChainTreeNode.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/entity/CallChainTreeNode.java @@ -219,6 +219,6 @@ public class CallChainTreeNode { } public String getTreeNodeId() { - return traceLevelId + "@~" + viewPointId; + return traceLevelId + "@" + viewPointId; } } diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java index 211308bc1..968fa8b91 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/filter/impl/JDBCBusinessKeyHandleFilter.java @@ -4,8 +4,12 @@ import com.ai.cloud.skywalking.analysis.chainbuild.SpanEntry; import com.ai.cloud.skywalking.analysis.chainbuild.filter.SpanNodeProcessFilter; import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode; import com.ai.cloud.skywalking.analysis.chainbuild.util.SubLevelSpanCostCounter; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class JDBCBusinessKeyHandleFilter extends SpanNodeProcessFilter { + private Logger logger = LogManager.getLogger(JDBCBusinessKeyHandleFilter.class); + @Override public void doFilter(SpanEntry spanEntry, ChainNode node, SubLevelSpanCostCounter costMap) { String businessKey = spanEntry.getBusinessKey(); @@ -29,7 +33,7 @@ public class JDBCBusinessKeyHandleFilter extends SpanNodeProcessFilter { this.doNext(spanEntry, node, costMap); } - private String subBusinessKey(String businessKey, String key,String keyWord) { + private String subBusinessKey(String businessKey, String key, String keyWord) { int whereIndex = key.indexOf(keyWord); if (whereIndex != -1) { businessKey = businessKey.substring(0, whereIndex - 1).trim();