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/09/03 08:33:20 UTC
[incubator-skywalking] branch 6.0 updated: Bind v6 query to
query-protocol git repo.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch 6.0
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/6.0 by this push:
new 231ff10 Bind v6 query to query-protocol git repo.
231ff10 is described below
commit 231ff105c8e0f9fdbaa2cec4c8cf72552adbd5c2
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Sep 3 16:33:10 2018 +0800
Bind v6 query to query-protocol git repo.
---
.gitmodules | 3 +++
.../skywalking/oap/query/graphql/GraphQLQueryProvider.java | 14 +++++++-------
.../query-graphql-plugin/src/main/resources/query-protocol | 1 +
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 050e4c2..ed908a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
[submodule "apm-protocol/apm-network/src/main/proto"]
path = apm-protocol/apm-network/src/main/proto
url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
+[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"]
+ path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+ url = https://github.com/apache/incubator-skywalking-query-protocol.git
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
index 7696dfb..b2c6740 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java
@@ -63,19 +63,19 @@ public class GraphQLQueryProvider extends ModuleProvider {
@Override public void prepare() throws ServiceNotProvidedException, ModuleStartException {
GraphQLSchema schema = SchemaParser.newParser()
- .file("ui-graphql-v6/common.graphqls")
+ .file("query-protocol/common.graphqls")
.resolvers(new Query(), new Mutation())
- .file("ui-graphql-v6/metadata.graphqls")
+ .file("query-protocol/metadata.graphqls")
.resolvers(new MetadataQuery())
- .file("ui-graphql-v6/metric.graphqls")
+ .file("query-protocol/metric.graphqls")
.resolvers(new MetricQuery())
- .file("ui-graphql-v6/topology.graphqls")
+ .file("query-protocol/topology.graphqls")
.resolvers(new TopologyQuery())
- .file("ui-graphql-v6/trace.graphqls")
+ .file("query-protocol/trace.graphqls")
.resolvers(new TraceQuery())
- .file("ui-graphql-v6/aggregation.graphqls")
+ .file("query-protocol/aggregation.graphqls")
.resolvers(new AggregationQuery())
- .file("ui-graphql-v6/alarm.graphqls")
+ .file("query-protocol/alarm.graphqls")
.resolvers(new AlarmQuery())
.build()
.makeExecutableSchema();
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
new file mode 160000
index 0000000..ebbeb72
--- /dev/null
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
@@ -0,0 +1 @@
+Subproject commit ebbeb721d95bba8ee63bc2e706e877ee3a56433e