From 69ccf4bbb8c98bfdc848deaa638f3ded0750f016 Mon Sep 17 00:00:00 2001 From: pengys5 <8082209@qq.com> Date: Fri, 16 Jun 2017 13:35:46 +0800 Subject: [PATCH 1/3] fixed #220 1. Change dag graph layout from hierarchical to relationship 2. Change node style from square to round --- .../collector/worker/tracedag/TraceDagDataBuilder.java | 9 ++++----- .../src/main/resources/collector.config | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java index 9ac0d1603..ed616bd5c 100644 --- a/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java +++ b/apm-collector/apm-collector-worker/src/main/java/org/skywalking/apm/collector/worker/tracedag/TraceDagDataBuilder.java @@ -2,6 +2,8 @@ package org.skywalking.apm.collector.worker.tracedag; import com.google.gson.JsonArray; import com.google.gson.JsonObject; +import java.util.HashMap; +import java.util.Map; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.skywalking.apm.collector.worker.Const; @@ -9,9 +11,6 @@ import org.skywalking.apm.collector.worker.node.NodeCompIndex; import org.skywalking.apm.collector.worker.node.NodeMappingIndex; import org.skywalking.apm.collector.worker.noderef.NodeRefIndex; -import java.util.HashMap; -import java.util.Map; - /** * @author pengys5 */ @@ -28,7 +27,7 @@ public class TraceDagDataBuilder { private JsonArray lineArray = new JsonArray(); public JsonObject build(JsonArray nodeCompArray, JsonArray nodesMappingArray, JsonArray nodeRefsArray, - JsonArray resSumArray) { + JsonArray resSumArray) { changeMapping2Map(nodesMappingArray); changeNodeComp2Map(nodeCompArray); resSumMerge(resSumArray); @@ -57,7 +56,7 @@ public class TraceDagDataBuilder { } private Integer findOrCreateNode(String peers) { - if (nodeIdMap.containsKey(peers)) { + if (nodeIdMap.containsKey(peers) && !peers.equals(Const.USER_CODE)) { return nodeIdMap.get(peers); } else { nodeId++; diff --git a/apm-collector/apm-collector-worker/src/main/resources/collector.config b/apm-collector/apm-collector-worker/src/main/resources/collector.config index d7433d244..c007f3ef7 100644 --- a/apm-collector/apm-collector-worker/src/main/resources/collector.config +++ b/apm-collector/apm-collector-worker/src/main/resources/collector.config @@ -27,7 +27,7 @@ es.cluster.nodes=127.0.0.1:9300 #auto: create index when it doesn't exist. # forced: delete and create. # manual: do nothing. -es.index.initialize.mode=forced +es.index.initialize.mode=auto # Config of shards or replicas in Elasticsearch. es.index.shards.number=2 es.index.replicas.number=0 From 12d10768a2da8ad6447dd72176802ab361fae251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 16 Jun 2017 18:00:37 +0800 Subject: [PATCH 2/3] Add links to 3.1 topological graphs --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57dc3a153..10060a4eb 100644 --- a/README.md +++ b/README.md @@ -43,8 +43,11 @@ _In chronological order_ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. # Screenshots -- Topological graph of application clusters. - +- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan). + + +- Topological graph of application clusters based on Spring Cloud. + - Trace query. From ea70bfba27d263e9f8379b09a3d80d8cff9f4bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Fri, 16 Jun 2017 21:35:35 +0800 Subject: [PATCH 3/3] Adjust links to 3.1 snapshots --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 10060a4eb..3462db0f4 100644 --- a/README.md +++ b/README.md @@ -43,14 +43,14 @@ _In chronological order_ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wu.sheng@foxmail.com. # Screenshots -- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan). - - - Topological graph of application clusters based on Spring Cloud. +- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan). + + - Trace query. - + - Span detail.