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 07:53:18 UTC
[incubator-skywalking] branch feature/trace-ui updated: Add VO for
new query protocol
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 92fc223 Add VO for new query protocol
92fc223 is described below
commit 92fc223629c8ef4750cc03993dfdf717ab73792e
Author: wusheng <wu...@foxmail.com>
AuthorDate: Tue Apr 17 15:53:10 2018 +0800
Add VO for new query protocol
---
.../ui/trace/{Trace.java => BriefInfo.java} | 25 +++----
.../apm/collector/storage/ui/trace/Segment.java | 62 +++++++++++++++-
.../collector/storage/ui/trace/SegmentBrief.java | 84 ++++++++++++++++++++++
.../ui/trace/{Trace.java => SegmentRef.java} | 38 ++++++----
.../apm/collector/storage/ui/trace/Trace.java | 11 +--
5 files changed, 184 insertions(+), 36 deletions(-)
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/BriefInfo.java
similarity index 71%
copy from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java
copy to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/BriefInfo.java
index a3524aa..1490d3b 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/BriefInfo.java
@@ -18,25 +18,26 @@
package org.apache.skywalking.apm.collector.storage.ui.trace;
-import java.util.LinkedList;
-import java.util.List;
-
/**
- * @author peng-yongsheng
+ * @author wusheng
*/
-public class Trace {
+public class BriefInfo {
+ private int count;
+ private long duration;
- private List<Span> spans;
+ public int getCount() {
+ return count;
+ }
- public Trace() {
- this.spans = new LinkedList<>();
+ public void setCount(int count) {
+ this.count = count;
}
- public List<Span> getSpans() {
- return spans;
+ public long getDuration() {
+ return duration;
}
- public void setSpans(List<Span> spans) {
- this.spans = spans;
+ public void setDuration(long duration) {
+ this.duration = duration;
}
}
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 62fc6ab..cbda63c 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
@@ -18,14 +18,70 @@
package org.apache.skywalking.apm.collector.storage.ui.trace;
+import java.util.LinkedList;
import java.util.List;
/**
* @author peng-yongsheng
*/
public class Segment {
- private int segmentId;
- private String appName;
- private Boolean isSizeLimited;
+ private String segmentId;
+ private String name;
+ private SegmentBrief brief;
private List<Span> spans;
+ private boolean isError = false;
+ private long duration;
+
+ public Segment() {
+ this.brief = new SegmentBrief();
+ this.spans = new LinkedList<>();
+ }
+
+ public List<Span> getSpans() {
+ return spans;
+ }
+
+ public void setSpans(List<Span> spans) {
+ this.spans = spans;
+ }
+
+ public String getSegmentId() {
+ return segmentId;
+ }
+
+ public void setSegmentId(String segmentId) {
+ this.segmentId = segmentId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public SegmentBrief getBrief() {
+ return brief;
+ }
+
+ public void setBrief(SegmentBrief brief) {
+ this.brief = brief;
+ }
+
+ public boolean isError() {
+ return isError;
+ }
+
+ public void setError(boolean error) {
+ isError = error;
+ }
+
+ public long getDuration() {
+ return duration;
+ }
+
+ public void setDuration(long duration) {
+ this.duration = duration;
+ }
}
diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/SegmentBrief.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/SegmentBrief.java
new file mode 100644
index 0000000..82b7ca0
--- /dev/null
+++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/SegmentBrief.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.apm.collector.storage.ui.trace;
+
+/**
+ * http: BriefInfo!
+ * rpc: BriefInfo!
+ * mq: BriefInfo!
+ * db: BriefInfo!
+ * cache: BriefInfo!
+ *
+ * @author wusheng
+ */
+public class SegmentBrief {
+ private BriefInfo http;
+ private BriefInfo rpc;
+ private BriefInfo mq;
+ private BriefInfo db;
+ private BriefInfo cache;
+
+ public SegmentBrief() {
+ http = new BriefInfo();
+ rpc = new BriefInfo();
+ mq = new BriefInfo();
+ db = new BriefInfo();
+ cache = new BriefInfo();
+ }
+
+ public BriefInfo getHttp() {
+ return http;
+ }
+
+ public void setHttp(BriefInfo http) {
+ this.http = http;
+ }
+
+ public BriefInfo getRpc() {
+ return rpc;
+ }
+
+ public void setRpc(BriefInfo rpc) {
+ this.rpc = rpc;
+ }
+
+ public BriefInfo getMq() {
+ return mq;
+ }
+
+ public void setMq(BriefInfo mq) {
+ this.mq = mq;
+ }
+
+ public BriefInfo getDb() {
+ return db;
+ }
+
+ public void setDb(BriefInfo db) {
+ this.db = db;
+ }
+
+ public BriefInfo getCache() {
+ return cache;
+ }
+
+ public void setCache(BriefInfo cache) {
+ this.cache = cache;
+ }
+}
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/SegmentRef.java
similarity index 56%
copy from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/Trace.java
copy to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/apache/skywalking/apm/collector/storage/ui/trace/SegmentRef.java
index a3524aa..c016951 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/SegmentRef.java
@@ -18,25 +18,39 @@
package org.apache.skywalking.apm.collector.storage.ui.trace;
-import java.util.LinkedList;
-import java.util.List;
-
/**
- * @author peng-yongsheng
+ * @author wusheng
*/
-public class Trace {
+public class SegmentRef {
+ private String sourceSegment;
+ private String targetSegment;
+ private String callType;
+
+ public SegmentRef() {
+ callType = "";
+ }
+
+ public String getSourceSegment() {
+ return sourceSegment;
+ }
+
+ public void setSourceSegment(String sourceSegment) {
+ this.sourceSegment = sourceSegment;
+ }
- private List<Span> spans;
+ public String getTargetSegment() {
+ return targetSegment;
+ }
- public Trace() {
- this.spans = new LinkedList<>();
+ public void setTargetSegment(String targetSegment) {
+ this.targetSegment = targetSegment;
}
- public List<Span> getSpans() {
- return spans;
+ public String getCallType() {
+ return callType;
}
- public void setSpans(List<Span> spans) {
- this.spans = spans;
+ public void setCallType(String callType) {
+ this.callType = callType;
}
}
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 a3524aa..ed65136 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
@@ -26,17 +26,10 @@ import java.util.List;
*/
public class Trace {
- private List<Span> spans;
+ private List<Segment> segments;
public Trace() {
- this.spans = new LinkedList<>();
+ this.segments = new LinkedList<>();
}
- public List<Span> getSpans() {
- return spans;
- }
-
- public void setSpans(List<Span> spans) {
- this.spans = spans;
- }
}
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.