From f0f4cde4943c05ccf5505a66c1cfbe99ee440551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=96=B0=E5=85=83=20Liu=20XinYuan?= <879928098@qq.com> Date: Thu, 6 Sep 2018 21:11:07 +0800 Subject: [PATCH] =?UTF-8?q?add=20the=20methods=20that=20are=20not=20in=20t?= =?UTF-8?q?he=20graphql=20resolver=20and=20the=20classes=20=E2=80=A6=20(#1?= =?UTF-8?q?634)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- .../query/graphql/resolver/AlarmQuery.java | 2 +- .../query/graphql/resolver/MetadataQuery.java | 5 ++++ .../query/graphql/resolver/MetricQuery.java | 9 ++++--- .../oap/query/graphql/type/AlarmMessage.java | 1 + .../graphql/type/BatchMetricConditions.java | 27 +++++++++++++++++++ .../oap/query/graphql/type/Span.java | 1 + .../trace/provider/parser/SegmentParse.java | 2 +- .../SegmentStandardizationWorker.java | 20 +++++++++----- 8 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/BatchMetricConditions.java 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 183f328cea..88f7a5a45f 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 e139c26f66..b448113d24 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 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 e881674072..f9ee63c180 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 86e5899496..900856296a 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/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 0000000000..b028f75e7b --- /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 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 375febbe39..0f3e5d8234 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 tags; private List 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 fc0d5a7b26..01bede23e2 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 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 a567e1a317..d0d617c4cd 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 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 data) { + @Override + public void consume(List data) { Iterator inputIterator = data.iterator(); int i = 0; @@ -86,11 +90,13 @@ public class SegmentStandardizationWorker extends AbstractWorker data, Throwable t) { + @Override + public void onError(List data, Throwable t) { logger.error(t.getMessage(), t); } - @Override public void onExit() { + @Override + public void onExit() { } } } -- GitLab