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/18 07:35:42 UTC
[incubator-skywalking] branch feature/trace-ui updated: Finish test
codes. Wait for a bug fix.
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 bae4898 Finish test codes. Wait for a bug fix.
bae4898 is described below
commit bae4898d40528c3badd5b65dac4b918318f4652d
Author: wusheng <wu...@foxmail.com>
AuthorDate: Wed Apr 18 15:35:33 2018 +0800
Finish test codes. Wait for a bug fix.
---
.../apache/skywalking/apm/collector/storage/ui/trace/Span.java | 9 ---------
.../apm/collector/storage/es/dao/ui/GlobalTraceEsUIDAO.java | 2 +-
.../skywalking/apm/collector/ui/service/TraceStackService.java | 1 -
.../apm-ui-protocol/src/main/resources/ui-graphql/trace.graphqls | 1 -
4 files changed, 1 insertion(+), 12 deletions(-)
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 3eb84b3..2db8392 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
@@ -25,7 +25,6 @@ import java.util.List;
* @author peng-yongsheng
*/
public class Span {
- private String traceId;
private int spanId;
private int parentSpanId;
private List<Ref> refs;
@@ -46,14 +45,6 @@ public class Span {
this.logs = new LinkedList<>();
}
- public String getTraceId() {
- return traceId;
- }
-
- public void setTraceId(String traceId) {
- this.traceId = traceId;
- }
-
public int getSpanId() {
return spanId;
}
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GlobalTraceEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GlobalTraceEsUIDAO.java
index 81b980e1..07c604b 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GlobalTraceEsUIDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/dao/ui/GlobalTraceEsUIDAO.java
@@ -67,7 +67,7 @@ public class GlobalTraceEsUIDAO extends EsDAO implements IGlobalTraceUIDAO {
searchRequestBuilder.setTypes(GlobalTraceTable.TABLE_TYPE);
searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
searchRequestBuilder.setQuery(QueryBuilders.termQuery(GlobalTraceTable.TRACE_ID.getName(), globalTraceId));
- searchRequestBuilder.setSize(10);
+ searchRequestBuilder.setSize(50);
SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
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 5f7a23c..b539e70 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
@@ -90,7 +90,6 @@ public class TraceStackService {
segObj.getSpansList().forEach(spanObject -> {
Span span = new Span();
- span.setTraceId(traceId);
span.setSpanId(spanObject.getSpanId());
span.setParentSpanId(spanObject.getParentSpanId());
span.setStartTime(spanObject.getStartTime());
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 8b7bc03..5b7b256 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
@@ -99,7 +99,6 @@ type SegmentRef {
type Span {
- traceId: ID!
spanId: Int!
parentSpanId: Int!
refs: [Ref!]!
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.