Merge branch 'master' into feature/sampling

README.md

@@ -43,11 +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.
-<img src="https://sky-walking.github.io/page-resources/3.0/topological_graph.png?forceUpdate=0"/>
+- Topological graph of application clusters based on Spring Cloud.
+<img src="https://sky-walking.github.io/page-resources/3.1/topological_graph.png?forceUpdate=0"/>
+
+- Topological graph of application clusters based on dubbox and [motan](https://github.com/weibocom/motan).
+<img src="https://sky-walking.github.io/page-resources/3.1/topological_graph_test_project.png?forceUpdate=0"/>
 
 - Trace query.
-<img src="https://sky-walking.github.io/page-resources/3.0/trace_segment.png"/>
+<img src="https://sky-walking.github.io/page-resources/3.1/trace_segment.png"/>
 
 - Span detail.
 <img src="https://sky-walking.github.io/page-resources/3.0/span.png" />

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++;

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