diff --git a/CHANGES.md b/CHANGES.md index 095f1e7cff..e4db0124e9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,6 +33,7 @@ Release Notes. * Adjust e2e case for V9 core. * Support ZGC GC time and count metric collecting. * Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955). +* Bump up GraphQL related dependencies to latest versions. #### UI diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE index 6427efbaa9..ab77bd065b 100755 --- a/dist-material/release-docs/LICENSE +++ b/dist-material/release-docs/LICENSE @@ -267,13 +267,17 @@ The text of each license is the standard Apache 2.0 license. jackson-core 2.12.2: https://github.com/FasterXML/jackson-core, Apache 2.0 jackson-databind 2.12.2: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-datatype-jdk8 2.9.5: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0 - jackson-module-kotlin 2.8.8: http://kotlinlang.org, Apache 2.0 + jackson-module-kotlin 2.13.1: http://kotlinlang.org, Apache 2.0 jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0 - java-dataloader 2.0.1: https://github.com/graphql-java/java-dataloader, Apache 2.0 + java-dataloader 3.1.0: https://github.com/graphql-java/java-dataloader, Apache 2.0 kotlin-reflect 1.1.1: http://kotlinlang.org, Apache 2.0 kotlin-stdlib 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-common 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-jdk7-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlin-stdlib-jdk8-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0 + kotlinx coroutines 1.5.0: https://github.com/Kotlin/kotlinx.coroutines, Apache 2.0 archaius-core 0.7.4: https://github.com/Netflix/archaius, Apache 2.0 - classmate 1.3.1: https://github.com/FasterXML/java-classmate, Apache 2.0 + classmate 1.5.1: https://github.com/FasterXML/java-classmate, Apache 2.0 hibernate-validator 5.3.6.Final: https://github.com/hibernate/hibernate-validator, Apache 2.0 hystrix 1.5.12: https://github.com/Netflix/Hystrix, Apache 2.0 javax.inject 1: http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom, Apache 2.0 @@ -366,10 +370,9 @@ The following components are provided under a BSD license. See project link for The text of each license is also included at licenses/LICENSE-[project].txt. asm 9.0:https://gitlab.ow2.org , BSD-3-Clause - antlr4-runtime 4.5.1: http://www.antlr.org/license.html, BSD-3-Clause + antlr4-runtime 4.9.2: http://www.antlr.org/license.html, BSD-3-Clause Google: protobuf-java 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause - reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause diff --git a/dist-material/release-docs/NOTICE b/dist-material/release-docs/NOTICE index 7e9f93489c..448d39433d 100755 --- a/dist-material/release-docs/NOTICE +++ b/dist-material/release-docs/NOTICE @@ -910,3 +910,20 @@ This product includes software developed at CoreOS, Inc. (http://www.coreos.com/). =========================================================================== + +------ + +=========================================================================== +graphql-java-tools Notice +=========================================================================== + +Copyright (C) 2017, Cox Automotive, Inc. +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +=========================================================================== diff --git a/dist-material/release-docs/licenses/LICENSE-reflectasm.txt b/dist-material/release-docs/licenses/LICENSE-reflectasm.txt deleted file mode 100644 index 3f6a160c23..0000000000 --- a/dist-material/release-docs/licenses/LICENSE-reflectasm.txt +++ /dev/null @@ -1,10 +0,0 @@ -Copyright (c) 2008, Nathan Sweet -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - * Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 3234aad8b1..42fe2eb64e 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -30,8 +30,9 @@ 1.7.30 2.17.1 - 5.2.3 - 8.0 + 12.0.2 + 17.3 + 17.0 3.14.9 4.5.13 2.0.206 @@ -62,7 +63,7 @@ 2.18.0 4.1.68.Final 2.12.2 - 4.7.1 + 4.9.2 2.3.28 3.25.0-GA 0.10.3 @@ -116,7 +117,7 @@ ${log4j.version} - com.graphql-java + com.graphql-java-kickstart graphql-java-tools ${graphql-java-tools.version} @@ -125,6 +126,11 @@ graphql-java ${graphql-java.version} + + com.graphql-java + graphql-java-extended-scalars + ${graphql-java-extended-scalars.version} + com.google.code.gson gson diff --git a/oap-server/oal-grammar/pom.xml b/oap-server/oal-grammar/pom.xml index 85b81b6fab..4701c8c9a7 100755 --- a/oap-server/oal-grammar/pom.xml +++ b/oap-server/oal-grammar/pom.xml @@ -28,7 +28,7 @@ oal-grammar - 4.7.1 + 4.9.2 diff --git a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml index a4c2fd6c81..189631e501 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/pom.xml +++ b/oap-server/server-query-plugin/query-graphql-plugin/pom.xml @@ -48,9 +48,13 @@ graphql-java - com.graphql-java + com.graphql-java-kickstart graphql-java-tools + + com.graphql-java + graphql-java-extended-scalars + com.google.code.gson gson diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java index 31b38a851a..1d427e0e0a 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java @@ -81,10 +81,11 @@ public class GraphQLQueryHandler extends JettyJsonHandler { private JsonObject execute(String request, Map variables) { try { - ExecutionInput executionInput = ExecutionInput.newExecutionInput() - .query(request) - .variables(variables) - .build(); + final ExecutionInput.Builder queryBuilder = ExecutionInput.newExecutionInput().query(request); + if (CollectionUtils.isNotEmpty(variables)) { + queryBuilder.variables(variables); + } + final ExecutionInput executionInput = queryBuilder.build(); ExecutionResult executionResult = graphQL.execute(executionInput); LOGGER.debug("Execution result is {}", executionResult); Object data = executionResult.getData(); 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 328490b18a..b27739d0e5 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 @@ -18,8 +18,9 @@ package org.apache.skywalking.oap.query.graphql; -import com.coxautodev.graphql.tools.SchemaParser; import graphql.GraphQL; +import graphql.kickstart.tools.SchemaParser; +import graphql.scalars.ExtendedScalars; import graphql.schema.GraphQLSchema; import org.apache.skywalking.oap.query.graphql.resolver.AggregationQuery; import org.apache.skywalking.oap.query.graphql.resolver.AlarmQuery; @@ -115,6 +116,7 @@ public class GraphQLQueryProvider extends ModuleProvider { .resolvers(new EventQuery(getManager())) .file("query-protocol/metadata-v2.graphqls") .resolvers(new MetadataQueryV2(getManager())) + .scalars(ExtendedScalars.GraphQLLong) .build() .makeExecutableSchema(); this.graphQL = GraphQL.newGraphQL(schema).build(); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java index 3de9dee300..8eaea9976d 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; 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 4a917c5520..13faaf2001 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 @@ -18,8 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; - +import graphql.kickstart.tools.GraphQLQueryResolver; import graphql.schema.DataFetchingEnvironment; import java.util.ArrayList; import java.util.List; @@ -99,7 +98,7 @@ public class AlarmQuery implements GraphQLQueryResolver { Alarms alarms = getQueryService().getAlarm( scopeId, keyword, paging, startSecondTB, endSecondTB, tags); - final boolean selectEvents = env.getSelectionSet().get().entrySet().stream().anyMatch(it -> it.getKey().contains("/events/")); + final boolean selectEvents = env.getSelectionSet().contains("**/events/**"); if (selectEvents) { return findRelevantEvents(alarms, conditionPrototype); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java index bb39b82d71..89fe83389e 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/BrowserLogQuery.java @@ -17,7 +17,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.Optional; import lombok.RequiredArgsConstructor; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java index aa9f8b7bfc..da314bc7ae 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/EventQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.EventQueryService; import org.apache.skywalking.oap.server.core.query.type.event.EventQueryCondition; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java index 0521248202..b1eb419023 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/HealthQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.util.Optional; import lombok.RequiredArgsConstructor; import org.apache.skywalking.oap.server.core.query.type.HealthStatus; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java index 8ec49f01f5..500194b616 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.UnexpectedException; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java index f9c602b5d6..95a30aeafe 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/LogTestQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.util.ArrayList; import java.util.Arrays; import java.util.List; 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 4d4dda12ac..498a6bd5af 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 @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.List; import java.util.stream.Collectors; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java index 8cc05c4e30..6a82bb3e11 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetadataQueryV2.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; 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 fce4c13c88..d267d911b0 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 @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java index 2ed2d0bc28..bcdd34cd08 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricsQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java index 239588fc09..d0ebe77e9a 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Mutation.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; /** * Root mutation resolver. diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java index 1677d94274..32582fbeb3 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileMutation.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; import java.io.IOException; import org.apache.skywalking.oap.server.core.query.input.ProfileTaskCreationRequest; import org.apache.skywalking.oap.server.core.CoreModule; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java index 431d00bef0..63e1f18b6e 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/ProfileQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService; import org.apache.skywalking.oap.server.core.query.type.BasicTrace; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java index 737d164ff0..565e2a1120 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/Query.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import org.apache.skywalking.oap.server.core.version.Version; /** diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java index a0e317f116..d0ecb2ca3c 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopNRecordsQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java index 19f98f155f..f8cb3652cf 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TopologyQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java index c1a0bf8a4b..2db4705090 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/TraceQuery.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import com.google.common.base.Strings; import java.io.IOException; import org.apache.skywalking.oap.server.core.Const; diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java index 72fe59575f..00f0eee766 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/UIConfigurationManagement.java @@ -18,8 +18,8 @@ package org.apache.skywalking.oap.query.graphql.resolver; -import com.coxautodev.graphql.tools.GraphQLMutationResolver; -import com.coxautodev.graphql.tools.GraphQLQueryResolver; +import graphql.kickstart.tools.GraphQLMutationResolver; +import graphql.kickstart.tools.GraphQLQueryResolver; import java.io.IOException; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt index 38643f89cf..9de92095a8 100755 --- a/tools/dependencies/known-oap-backend-dependencies.txt +++ b/tools/dependencies/known-oap-backend-dependencies.txt @@ -3,7 +3,7 @@ HikariCP-3.1.0.jar LatencyUtils-2.0.3.jar animal-sniffer-annotations-1.18.jar annotations-13.0.jar -antlr4-runtime-4.7.1.jar +antlr4-runtime-4.9.2.jar aopalliance-1.0.jar apollo-client-1.8.0.jar apollo-core-1.8.0.jar @@ -15,6 +15,7 @@ bcprov-jdk15on-1.69.jar bcutil-jdk15on-1.69.jar brotli4j-1.6.0.jar checker-qual-2.8.1.jar +classmate-1.5.1.jar client-java-14.0.0.jar client-java-api-14.0.0.jar client-java-proto-14.0.0.jar @@ -40,8 +41,9 @@ failsafe-2.3.4.jar failureaccess-1.0.1.jar flatbuffers-java-1.12.0.jar freemarker-2.3.28.jar -graphql-java-8.0.jar -graphql-java-tools-5.2.3.jar +graphql-java-17.3.jar +graphql-java-extended-scalars-17.0.jar +graphql-java-tools-12.0.2.jar groovy-3.0.8.jar grpc-api-1.43.2.jar grpc-context-1.43.2.jar @@ -70,8 +72,8 @@ jackson-databind-2.12.2.jar jackson-datatype-guava-2.9.10.jar jackson-datatype-jdk8-2.9.10.jar jackson-module-afterburner-2.12.2.jar -jackson-module-kotlin-2.8.8.jar -java-dataloader-2.0.2.jar +jackson-module-kotlin-2.13.1.jar +java-dataloader-3.1.0.jar javassist-3.25.0-GA.jar javax.inject-1.jar javax.servlet-api-3.1.0.jar @@ -90,8 +92,15 @@ joda-time-2.10.5.jar jose4j-0.7.9.jar jsr305-3.0.2.jar kafka-clients-2.4.1.jar -kotlin-reflect-1.1.1.jar -kotlin-stdlib-1.1.60.jar +kotlin-reflect-1.5.0.jar +kotlin-stdlib-1.5.0.jar +kotlin-stdlib-common-1.5.0.jar +kotlin-stdlib-jdk7-1.5.0.jar +kotlin-stdlib-jdk8-1.5.0.jar +kotlinx-coroutines-core-1.5.0-native-mt.jar +kotlinx-coroutines-core-jvm-1.5.0-native-mt.jar +kotlinx-coroutines-jdk8-1.5.0-native-mt.jar +kotlinx-coroutines-reactive-1.5.0-native-mt.jar libthrift-0.14.1.jar listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar log4j-api-2.17.1.jar @@ -134,7 +143,6 @@ proto-google-common-protos-2.0.1.jar protobuf-java-3.19.2.jar protobuf-java-util-3.19.2.jar reactive-streams-1.0.2.jar -reflectasm-1.11.7.jar retrofit-2.5.0.jar service-rpc-0.12.3.jar simpleclient-0.6.0.jar