[incubator-skywalking] branch extend-indicator updated: Support All in trace analysis listener.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch extend-indicator
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/extend-indicator by this push:
     new 3e0fd4f  Support All in trace analysis listener.
3e0fd4f is described below

commit 3e0fd4f6c9c6cc8452029265ee1f3e22932b0bd7
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Sep 11 10:42:46 2018 +0800

    Support All in trace analysis listener.
---
 .../oap/server/core/analysis/DispatcherManager.java         |  3 +++
 .../parser/listener/endpoint/MultiScopesSpanListener.java   |  1 +
 .../provider/parser/listener/endpoint/SourceBuilder.java    | 13 +++++++++++++
 3 files changed, 17 insertions(+)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
index 6f059c7..cd6c508 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/DispatcherManager.java
@@ -19,6 +19,7 @@
 package org.apache.skywalking.oap.server.core.analysis;
 
 import java.util.*;
+import org.apache.skywalking.oap.server.core.analysis.generated.all.AllDispatcher;
 import org.apache.skywalking.oap.server.core.analysis.generated.endpoint.EndpointDispatcher;
 import org.apache.skywalking.oap.server.core.analysis.generated.endpointrelation.EndpointRelationDispatcher;
 import org.apache.skywalking.oap.server.core.analysis.generated.service.ServiceDispatcher;
@@ -45,6 +46,8 @@ public class DispatcherManager {
     public DispatcherManager() {
         this.dispatcherMap = new HashMap<>();
 
+        this.dispatcherMap.put(Scope.All, new AllDispatcher());
+
         this.dispatcherMap.put(Scope.Service, new ServiceDispatcher());
         this.dispatcherMap.put(Scope.ServiceInstance, new ServiceInstanceDispatcher());
         this.dispatcherMap.put(Scope.Endpoint, new EndpointDispatcher());
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
index cbbf576..ff083b4 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/MultiScopesSpanListener.java
@@ -162,6 +162,7 @@ public class MultiScopesSpanListener implements EntrySpanListener, ExitSpanListe
     @Override public void build() {
         entrySourceBuilders.forEach(entrySourceBuilder -> {
             entrySourceBuilder.setTimeBucket(minuteTimeBucket);
+            sourceReceiver.receive(entrySourceBuilder.toAll());
             sourceReceiver.receive(entrySourceBuilder.toService());
             sourceReceiver.receive(entrySourceBuilder.toServiceInstance());
             sourceReceiver.receive(entrySourceBuilder.toEndpoint());
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java
index e5485fe..3b32008 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/listener/endpoint/SourceBuilder.java
@@ -45,6 +45,19 @@ class SourceBuilder {
     @Getter @Setter private DetectPoint detectPoint;
     @Getter @Setter private long timeBucket;
 
+    All toAll() {
+        All all = new All();
+        all.setName(destServiceName);
+        all.setServiceInstanceName(destServiceInstanceName);
+        all.setEndpointName(destEndpointName);
+        all.setLatency(latency);
+        all.setStatus(status);
+        all.setResponseCode(responseCode);
+        all.setType(type);
+        all.setTimeBucket(timeBucket);
+        return all;
+    }
+
     Service toService() {
         Service service = new Service();
         service.setId(destServiceId);