You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/09/06 13:11:08 UTC
[GitHub] peng-yongsheng closed pull request #1634: add the methods that are not in the graphql resolver and the classes …
peng-yongsheng closed pull request #1634: add the methods that are not in the graphql resolver and the classes …
URL: https://github.com/apache/incubator-skywalking/pull/1634
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 183f328ce..88f7a5a45 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 AlarmTrend getAlarmTrend(final Duration duration) {
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 e139c26f6..b448113d2 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 ClusterBrief getGlobalBrief(final Duration duration) {
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 e88167407..f9ee63c18 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 LinearIntValues getLinearIntValues(final MetricCondition metric, final Du
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 86e589949..900856296 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 @@
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/BatchMetricConditions.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
new file mode 100644
index 000000000..b028f75e7
--- /dev/null
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java
@@ -0,0 +1,27 @@
+/*
+ * 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.oap.query.graphql.type;
+
+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 375febbe3..0f3e5d823 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 @@
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 fc0d5a7b2..01bede23e 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 SegmentParse(ModuleManager moduleManager, SegmentParserListenerManager li
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 a567e1a31..d0d617c4c 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 @@
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 @@
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 SegmentStandardizationWorker(ModuleManager moduleManager,
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 @@ private Consumer(SegmentStandardizationWorker aggregator) {
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 @@ private Consumer(SegmentStandardizationWorker aggregator) {
}
}
- @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() {
}
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services