You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/04/17 13:27:21 UTC

[incubator-skywalking] branch feature/trace-ui updated: Finish some query codes.

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

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


The following commit(s) were added to refs/heads/feature/trace-ui by this push:
     new 33804fc  Finish some query codes.
33804fc is described below

commit 33804fc7d4ff3931b98b04da8ac4e44f14bae711
Author: wusheng <wu...@foxmail.com>
AuthorDate: Tue Apr 17 21:26:44 2018 +0800

    Finish some query codes.
---
 .../apm/collector/storage/ui/trace/BriefInfo.java  |   9 +
 .../apm/collector/storage/ui/trace/Segment.java    |  13 +
 .../apm/collector/storage/ui/trace/Span.java       |  45 ----
 .../apm/collector/storage/ui/trace/Trace.java      |  11 +
 .../collector/ui/service/TraceStackService.java    | 275 +++++++++------------
 .../src/main/resources/ui-graphql/trace.graphqls   |   3 +-
 6 files changed, 156 insertions(+), 200 deletions(-)

diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BriefInfo.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BriefInfo.java
index 1490d3b..8967bf0 100644
--- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BriefInfo.java
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BriefInfo.java
@@ -25,6 +25,15 @@ public class BriefInfo {
     private int count;
     private long duration;
 
+    public BriefInfo() {
+        this.count = 0;
+        this.duration = 0;
+    }
+
+    public void addOnce(long duration) {
+        this.duration += duration;
+    }
+
     public int getCount() {
         return count;
     }
diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java
index cbda63c..85ee893 100644
--- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Segment.java
@@ -26,6 +26,7 @@ import java.util.List;
  */
 public class Segment {
     private String segmentId;
+    private String applicationCode;
     private String name;
     private SegmentBrief brief;
     private List<Span> spans;
@@ -45,6 +46,14 @@ public class Segment {
         this.spans = spans;
     }
 
+    public String getApplicationCode() {
+        return applicationCode;
+    }
+
+    public void setApplicationCode(String applicationCode) {
+        this.applicationCode = applicationCode;
+    }
+
     public String getSegmentId() {
         return segmentId;
     }
@@ -84,4 +93,8 @@ public class Segment {
     public void setDuration(long duration) {
         this.duration = duration;
     }
+
+    public void addSpan(Span span){
+        this.spans.add(span);
+    }
 }
diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java
index 9d56c39..3eb84b3 100644
--- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Span.java
@@ -26,11 +26,9 @@ import java.util.List;
  */
 public class Span {
     private String traceId;
-    private String segmentId;
     private int spanId;
     private int parentSpanId;
     private List<Ref> refs;
-    private String applicationCode;
     private long startTime;
     private long endTime;
     private String operationName;
@@ -41,9 +39,6 @@ public class Span {
     private String layer;
     private List<KeyValue> tags;
     private List<LogEntity> logs;
-    private boolean isRoot;
-    private String segmentSpanId;
-    private String segmentParentSpanId;
 
     public Span() {
         this.refs = new LinkedList<>();
@@ -59,14 +54,6 @@ public class Span {
         this.traceId = traceId;
     }
 
-    public String getSegmentId() {
-        return segmentId;
-    }
-
-    public void setSegmentId(String segmentId) {
-        this.segmentId = segmentId;
-    }
-
     public int getSpanId() {
         return spanId;
     }
@@ -91,14 +78,6 @@ public class Span {
         this.refs = refs;
     }
 
-    public String getApplicationCode() {
-        return applicationCode;
-    }
-
-    public void setApplicationCode(String applicationCode) {
-        this.applicationCode = applicationCode;
-    }
-
     public long getStartTime() {
         return startTime;
     }
@@ -178,28 +157,4 @@ public class Span {
     public void setLogs(List<LogEntity> logs) {
         this.logs = logs;
     }
-
-    public boolean isRoot() {
-        return isRoot;
-    }
-
-    public void setRoot(boolean root) {
-        isRoot = root;
-    }
-
-    public String getSegmentParentSpanId() {
-        return segmentParentSpanId;
-    }
-
-    public void setSegmentParentSpanId(String segmentParentSpanId) {
-        this.segmentParentSpanId = segmentParentSpanId;
-    }
-
-    public String getSegmentSpanId() {
-        return segmentSpanId;
-    }
-
-    public void setSegmentSpanId(String segmentSpanId) {
-        this.segmentSpanId = segmentSpanId;
-    }
 }
diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java
index ed65136..d003757 100644
--- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java
@@ -32,4 +32,15 @@ public class Trace {
         this.segments = new LinkedList<>();
     }
 
+    public List<Segment> getSegments() {
+        return segments;
+    }
+
+    public void setSegments(List<Segment> segments) {
+        this.segments = segments;
+    }
+
+    public void addSegment(Segment segment){
+        this.segments.add(segment);
+    }
 }
diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
index 9c5364a..c349bea 100644
--- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
+++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/apache/skywalking/apm/collector/ui/service/TraceStackService.java
@@ -37,8 +37,11 @@ import org.apache.skywalking.apm.collector.storage.ui.trace.KeyValue;
 import org.apache.skywalking.apm.collector.storage.ui.trace.LogEntity;
 import org.apache.skywalking.apm.collector.storage.ui.trace.Ref;
 import org.apache.skywalking.apm.collector.storage.ui.trace.RefType;
+import org.apache.skywalking.apm.collector.storage.ui.trace.Segment;
+import org.apache.skywalking.apm.collector.storage.ui.trace.SegmentBrief;
 import org.apache.skywalking.apm.collector.storage.ui.trace.Span;
 import org.apache.skywalking.apm.collector.storage.ui.trace.Trace;
+import org.apache.skywalking.apm.network.proto.SpanLayer;
 import org.apache.skywalking.apm.network.proto.SpanObject;
 import org.apache.skywalking.apm.network.proto.TraceSegmentObject;
 import org.apache.skywalking.apm.network.proto.UniqueId;
@@ -64,166 +67,132 @@ public class TraceStackService {
     }
 
     public Trace load(String traceId) {
-        Trace trace = new Trace();
+        final Trace trace = new Trace();
         List<String> segmentIds = globalTraceDAO.getSegmentIds(traceId);
+
         if (CollectionUtils.isNotEmpty(segmentIds)) {
             for (String segmentId : segmentIds) {
-                TraceSegmentObject segment = segmentDAO.load(segmentId);
-                if (ObjectUtils.isNotEmpty(segment)) {
-                    trace.getSpans().addAll(buildSpanList(traceId, segmentId, segment.getApplicationId(), segment.getSpansList()));
+                TraceSegmentObject segObj = segmentDAO.load(segmentId);
+                if (ObjectUtils.isNotEmpty(segObj)) {
+                    Segment segment = new Segment();
+                    String applicationCode = applicationCacheService.getApplicationById(segObj.getApplicationId()).getApplicationCode();
+
+                    segment.setApplicationCode(applicationCode);
+                    segment.setSegmentId(segmentId);
+
+                    SegmentBrief brief = new SegmentBrief();
+                    segment.setBrief(brief);
+
+                    segObj.getSpansList().forEach(spanObject -> {
+                        Span span = new Span();
+                        span.setTraceId(traceId);
+                        span.setSpanId(spanObject.getSpanId());
+                        span.setParentSpanId(spanObject.getParentSpanId());
+                        span.setStartTime(spanObject.getStartTime());
+                        span.setEndTime(spanObject.getEndTime());
+                        long duration = span.getEndTime() - span.getStartTime();
+                        span.setError(spanObject.getIsError());
+                        SpanLayer layer = spanObject.getSpanLayer();
+                        switch (layer){
+                            case MQ:
+                                brief.getMq().addOnce(duration);
+                                break;
+                            case Http:
+                                brief.getHttp().addOnce(duration);
+                                break;
+                            case Cache:
+                                brief.getCache().addOnce(duration);
+                                break;
+                            case Database:
+                                brief.getDb().addOnce(duration);
+                                break;
+                            case RPCFramework:
+                                brief.getRpc().addOnce(duration);
+                                break;
+                        }
+                        span.setLayer(layer.name());
+                        span.setType(spanObject.getSpanType().name());
+
+                        if (spanObject.getPeerId() == 0) {
+                            span.setPeer(spanObject.getPeer());
+                        } else {
+                            span.setPeer(networkAddressCacheService.getAddress(spanObject.getPeerId()).getNetworkAddress());
+                        }
+
+                        String operationName = spanObject.getOperationName();
+                        if (spanObject.getOperationNameId() != 0) {
+                            ServiceName serviceName = serviceNameCacheService.get(spanObject.getOperationNameId());
+                            if (ObjectUtils.isNotEmpty(serviceName)) {
+                                operationName = serviceName.getServiceName();
+                            } else {
+                                operationName = Const.EMPTY_STRING;
+                            }
+                        }
+                        span.setOperationName(operationName);
+
+                        if (spanObject.getComponentId() == 0) {
+                            span.setComponent(spanObject.getComponent());
+                        } else {
+                            span.setComponent(ComponentsDefine.getInstance().getComponentName(spanObject.getComponentId()));
+                        }
+
+                        spanObject.getRefsList().forEach(reference -> {
+                            Ref ref = new Ref();
+                            ref.setTraceId(traceId);
+
+                            switch (reference.getRefType()) {
+                                case CrossThread:
+                                    ref.setType(RefType.CROSS_THREAD);
+                                    break;
+                                case CrossProcess:
+                                    ref.setType(RefType.CROSS_PROCESS);
+                                    break;
+                            }
+                            ref.setParentSpanId(reference.getParentSpanId());
+
+                            UniqueId uniqueId = reference.getParentTraceSegmentId();
+                            StringBuilder segmentIdBuilder = new StringBuilder();
+                            for (int i = 0; i < uniqueId.getIdPartsList().size(); i++) {
+                                if (i == 0) {
+                                    segmentIdBuilder.append(String.valueOf(uniqueId.getIdPartsList().get(i)));
+                                } else {
+                                    segmentIdBuilder.append(".").append(String.valueOf(uniqueId.getIdPartsList().get(i)));
+                                }
+                            }
+                            ref.setParentSegmentId(segmentIdBuilder.toString());
+
+                            span.getRefs().add(ref);
+                        });
+
+                        spanObject.getTagsList().forEach(tag -> {
+                            KeyValue keyValue = new KeyValue();
+                            keyValue.setKey(tag.getKey());
+                            keyValue.setValue(tag.getValue());
+                            span.getTags().add(keyValue);
+                        });
+
+                        spanObject.getLogsList().forEach(log -> {
+                            LogEntity logEntity = new LogEntity();
+                            logEntity.setTime(log.getTime());
+
+                            log.getDataList().forEach(data -> {
+                                KeyValue keyValue = new KeyValue();
+                                keyValue.setKey(data.getKey());
+                                keyValue.setValue(data.getValue());
+                                logEntity.getData().add(keyValue);
+                            });
+
+                            span.getLogs().add(logEntity);
+                        });
+
+                        segment.addSpan(span);
+                    });
+
+                    trace.addSegment(segment);
                 }
             }
         }
 
-        List<Span> sortedSpans = new LinkedList<>();
-        if (CollectionUtils.isNotEmpty(trace.getSpans())) {
-            List<Span> rootSpans = findRoot(trace.getSpans());
-
-            if (CollectionUtils.isNotEmpty(rootSpans)) {
-                rootSpans.forEach(span -> {
-                    List<Span> childrenSpan = new ArrayList<>();
-                    childrenSpan.add(span);
-                    findChildren(trace.getSpans(), span, childrenSpan);
-                    sortedSpans.addAll(childrenSpan);
-                });
-            }
-        }
-
-        trace.setSpans(sortedSpans);
         return trace;
     }
-
-    private List<Span> buildSpanList(String traceId, String segmentId, int applicationId,
-        List<SpanObject> spanObjects) {
-        List<Span> spans = new ArrayList<>();
-
-        spanObjects.forEach(spanObject -> {
-            Span span = new Span();
-            span.setTraceId(traceId);
-            span.setSegmentId(segmentId);
-            span.setSpanId(spanObject.getSpanId());
-            span.setParentSpanId(spanObject.getParentSpanId());
-            span.setStartTime(spanObject.getStartTime());
-            span.setEndTime(spanObject.getEndTime());
-            span.setError(spanObject.getIsError());
-            span.setLayer(spanObject.getSpanLayer().name());
-            span.setType(spanObject.getSpanType().name());
-
-            String segmentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getSpanId());
-            span.setSegmentSpanId(segmentSpanId);
-
-            String segmentParentSpanId = segmentId + Const.SEGMENT_SPAN_SPLIT + String.valueOf(spanObject.getParentSpanId());
-            span.setSegmentParentSpanId(segmentParentSpanId);
-
-            if (spanObject.getPeerId() == 0) {
-                span.setPeer(spanObject.getPeer());
-            } else {
-                span.setPeer(networkAddressCacheService.getAddress(spanObject.getPeerId()).getNetworkAddress());
-            }
-
-            String operationName = spanObject.getOperationName();
-            if (spanObject.getOperationNameId() != 0) {
-                ServiceName serviceName = serviceNameCacheService.get(spanObject.getOperationNameId());
-                if (ObjectUtils.isNotEmpty(serviceName)) {
-                    operationName = serviceName.getServiceName();
-                } else {
-                    operationName = Const.EMPTY_STRING;
-                }
-            }
-            span.setOperationName(operationName);
-
-            String applicationCode = applicationCacheService.getApplicationById(applicationId).getApplicationCode();
-            span.setApplicationCode(applicationCode);
-
-            if (spanObject.getComponentId() == 0) {
-                span.setComponent(spanObject.getComponent());
-            } else {
-                span.setComponent(ComponentsDefine.getInstance().getComponentName(spanObject.getComponentId()));
-            }
-
-            spanObject.getRefsList().forEach(reference -> {
-                Ref ref = new Ref();
-                ref.setTraceId(traceId);
-
-                switch (reference.getRefType()) {
-                    case CrossThread:
-                        ref.setType(RefType.CROSS_THREAD);
-                        break;
-                    case CrossProcess:
-                        ref.setType(RefType.CROSS_PROCESS);
-                        break;
-                }
-                ref.setParentSpanId(reference.getParentSpanId());
-
-                UniqueId uniqueId = reference.getParentTraceSegmentId();
-                StringBuilder segmentIdBuilder = new StringBuilder();
-                for (int i = 0; i < uniqueId.getIdPartsList().size(); i++) {
-                    if (i == 0) {
-                        segmentIdBuilder.append(String.valueOf(uniqueId.getIdPartsList().get(i)));
-                    } else {
-                        segmentIdBuilder.append(".").append(String.valueOf(uniqueId.getIdPartsList().get(i)));
-                    }
-                }
-                ref.setParentSegmentId(segmentIdBuilder.toString());
-
-                span.setSegmentParentSpanId(ref.getParentSegmentId() + Const.SEGMENT_SPAN_SPLIT + String.valueOf(ref.getParentSpanId()));
-
-                span.getRefs().add(ref);
-            });
-
-            spanObject.getTagsList().forEach(tag -> {
-                KeyValue keyValue = new KeyValue();
-                keyValue.setKey(tag.getKey());
-                keyValue.setValue(tag.getValue());
-                span.getTags().add(keyValue);
-            });
-
-            spanObject.getLogsList().forEach(log -> {
-                LogEntity logEntity = new LogEntity();
-                logEntity.setTime(log.getTime());
-
-                log.getDataList().forEach(data -> {
-                    KeyValue keyValue = new KeyValue();
-                    keyValue.setKey(data.getKey());
-                    keyValue.setValue(data.getValue());
-                    logEntity.getData().add(keyValue);
-                });
-
-                span.getLogs().add(logEntity);
-            });
-
-            spans.add(span);
-        });
-
-        return spans;
-    }
-
-    private List<Span> findRoot(List<Span> spans) {
-        List<Span> rootSpans = new ArrayList<>();
-        spans.forEach(span -> {
-            String segmentParentSpanId = span.getSegmentParentSpanId();
-
-            boolean hasParent = false;
-            for (Span subSpan : spans) {
-                if (segmentParentSpanId.equals(subSpan.getSegmentSpanId())) {
-                    hasParent = true;
-                }
-            }
-
-            if (!hasParent) {
-                span.setRoot(true);
-                rootSpans.add(span);
-            }
-        });
-        return rootSpans;
-    }
-
-    private void findChildren(List<Span> spans, Span parentSpan, List<Span> childrenSpan) {
-        spans.forEach(span -> {
-            if (span.getSegmentParentSpanId().equals(parentSpan.getSegmentSpanId())) {
-                childrenSpan.add(span);
-                findChildren(spans, span, childrenSpan);
-            }
-        });
-    }
 }
diff --git a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
index 5a67665..c14b032 100644
--- a/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
+++ b/apm-protocol/apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls
@@ -60,6 +60,7 @@ type Trace {
 
 type Segment {
   segmentId: ID!
+  applicationCode: ID!
   name: String!
   brief: SegmentBrief!
   spans: [Span!]!
@@ -90,11 +91,9 @@ type SegmentRef {
 
 type Span {
   traceId: ID!
-  segmentId: ID!
   spanId: Int!
   parentSpanId: Int!
   refs: [Ref!]!
-  applicationCode: String!
   startTime: Long!
   endTime: Long!
   operationName: String

-- 
To stop receiving notification emails like this one, please contact
wusheng@apache.org.