You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/09/06 13:11:11 UTC
[incubator-skywalking] branch master updated: add the methods that are not in the graphql resolver and the classes … (#1634)
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new f0f4cde add the methods that are not in the graphql resolver and the classes … (#1634)
f0f4cde is described below
commit f0f4cde4943c05ccf5505a66c1cfbe99ee440551
Author: 刘新元 Liu XinYuan <87...@qq.com>
AuthorDate: Thu Sep 6 21:11:07 2018 +0800
add the methods that are not in the graphql resolver and the classes … (#1634)
* add the methods that are not in the graphql resolver and the classes that are not in the type, and resolve the StackOverFlowOver that starts the report.
* add license
* update file header
---
.../oap/query/graphql/resolver/AlarmQuery.java | 2 +-
.../oap/query/graphql/resolver/MetadataQuery.java | 5 +++++
.../oap/query/graphql/resolver/MetricQuery.java | 9 +++++----
.../oap/query/graphql/type/AlarmMessage.java | 1 +
...{AlarmMessage.java => BatchMetricConditions.java} | 12 +++++++-----
.../skywalking/oap/query/graphql/type/Span.java | 1 +
.../receiver/trace/provider/parser/SegmentParse.java | 2 +-
.../SegmentStandardizationWorker.java | 20 +++++++++++++-------
8 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
index 183f328..88f7a5a 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
@@ -30,7 +30,7 @@ public class AlarmQuery implements GraphQLQueryResolver {
return new AlarmTrend();
}
- public Alarms getAlarm(final Duration duration, final Scope scope, final Pagination paging) {
+ public Alarms getAlarm(final Duration duration, final Scope scope,final String keyword, final Pagination paging) {
return new Alarms();
}
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java
index e139c26..b448113 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQuery.java
@@ -47,4 +47,9 @@ public class MetadataQuery implements GraphQLQueryResolver {
public List<Endpoint> searchEndpoint(final String keyword, final String serviceId, final int limit) {
return Collections.emptyList();
}
+
+
+ public Service searchService(final Duration duration, final String serviceCode) {
+ return new Service();
+ }
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
index e881674..f9ee63c 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java
@@ -19,10 +19,7 @@
package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver;
-import org.apache.skywalking.oap.query.graphql.type.Duration;
-import org.apache.skywalking.oap.query.graphql.type.LinearIntValues;
-import org.apache.skywalking.oap.query.graphql.type.MetricCondition;
-import org.apache.skywalking.oap.query.graphql.type.Thermodynamic;
+import org.apache.skywalking.oap.query.graphql.type.*;
public class MetricQuery implements GraphQLQueryResolver {
public LinearIntValues getLinearIntValues(final MetricCondition metric, final Duration duration) {
@@ -32,4 +29,8 @@ public class MetricQuery implements GraphQLQueryResolver {
public Thermodynamic getThermodynamic(final MetricCondition metric, final Duration duration) {
return new Thermodynamic();
}
+
+ public LinearIntValues getValues(final BatchMetricConditions metric, final Duration duration) {
+ return new LinearIntValues();
+ }
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java
index 86e5899..9008562 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java
@@ -22,4 +22,5 @@ public class AlarmMessage {
private Scope scope;
private String id;
private String message;
+ private Long startTime;
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
similarity index 85%
copy from oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java
copy to oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
index 86e5899..b028f75 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/AlarmMessage.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
@@ -15,11 +15,13 @@
* limitations under the License.
*
*/
-
package org.apache.skywalking.oap.query.graphql.type;
-public class AlarmMessage {
- private Scope scope;
- private String id;
- private String message;
+import java.util.List;
+
+/**
+ * @author liu-xinyuan
+ **/
+public class BatchMetricConditions {
+ private List<MetricCondition> metricConditions;
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Span.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Span.java
index 375febb..0f3e5d8 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Span.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Span.java
@@ -37,4 +37,5 @@ public class Span {
private String layer;
private List<KeyValue> tags;
private List<LogEntity> logs;
+ private String serviceCode;
}
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
index fc0d5a7..01bede2 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/SegmentParse.java
@@ -50,7 +50,7 @@ public class SegmentParse implements DataStreamReader.CallBack<UpstreamSegment>
this.segmentCoreInfo = new SegmentCoreInfo();
this.segmentCoreInfo.setStartTime(Long.MAX_VALUE);
this.segmentCoreInfo.setEndTime(Long.MIN_VALUE);
- this.standardizationWorker = new SegmentStandardizationWorker(moduleManager, listenerManager);
+ this.standardizationWorker = new SegmentStandardizationWorker(moduleManager, listenerManager,this);
}
@Override public void call(UpstreamSegment segment) {
diff --git a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
index a567e1a..d0d617c 100644
--- a/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
+++ b/oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/parser/standardization/SegmentStandardizationWorker.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.receiver.trace.provider.parser.standard
import java.io.IOException;
import java.util.*;
+
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
@@ -40,7 +41,7 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
private final BufferStream<UpstreamSegment> stream;
public SegmentStandardizationWorker(ModuleManager moduleManager,
- SegmentParserListenerManager listenerManager) throws IOException {
+ SegmentParserListenerManager listenerManager, SegmentParse segmentParse) throws IOException {
super(9999);
this.dataCarrier = new DataCarrier<>(1, 1024);
this.dataCarrier.consume(new Consumer(this), 1);
@@ -51,13 +52,14 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
builder.dataFileMaxSize(50);
builder.offsetFileMaxSize(10);
builder.parser(UpstreamSegment.parser());
- builder.callBack(new SegmentParse(moduleManager, listenerManager));
+ builder.callBack(segmentParse);
stream = builder.build();
stream.initialize();
}
- @Override public void in(SegmentStandardization standardization) {
+ @Override
+ public void in(SegmentStandardization standardization) {
stream.write(standardization.getUpstreamSegment());
}
@@ -69,10 +71,12 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
this.aggregator = aggregator;
}
- @Override public void init() {
+ @Override
+ public void init() {
}
- @Override public void consume(List<SegmentStandardization> data) {
+ @Override
+ public void consume(List<SegmentStandardization> data) {
Iterator<SegmentStandardization> inputIterator = data.iterator();
int i = 0;
@@ -86,11 +90,13 @@ public class SegmentStandardizationWorker extends AbstractWorker<SegmentStandard
}
}
- @Override public void onError(List<SegmentStandardization> data, Throwable t) {
+ @Override
+ public void onError(List<SegmentStandardization> data, Throwable t) {
logger.error(t.getMessage(), t);
}
- @Override public void onExit() {
+ @Override
+ public void onExit() {
}
}
}