From f2173c5376c165f758ebc3efa85bb83f8304cd07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Thu, 26 May 2022 21:22:51 +0800 Subject: [PATCH] Revert TraceSource from trace query. (#9135) --- .../core/query/input/TraceQueryCondition.java | 2 -- .../server/core/query/type/TraceSource.java | 23 ------------------- .../src/main/resources/query-protocol | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TraceSource.java diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TraceQueryCondition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TraceQueryCondition.java index 9c5d0cc12d..c79b186432 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TraceQueryCondition.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TraceQueryCondition.java @@ -24,7 +24,6 @@ import lombok.Setter; import org.apache.skywalking.oap.server.core.analysis.manual.searchtag.Tag; import org.apache.skywalking.oap.server.core.query.type.Pagination; import org.apache.skywalking.oap.server.core.query.type.QueryOrder; -import org.apache.skywalking.oap.server.core.query.type.TraceSource; import org.apache.skywalking.oap.server.core.query.type.TraceState; @Getter @@ -41,5 +40,4 @@ public class TraceQueryCondition { private QueryOrder queryOrder; private Pagination paging; private List tags; - private TraceSource prioritizedSource; } diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TraceSource.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TraceSource.java deleted file mode 100644 index cf9bcbeed6..0000000000 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/TraceSource.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.server.core.query.type; - -public enum TraceSource { - SKYWALKING, ZIPKIN -} 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 index 6c461cc60a..edf5871a3a 160000 --- 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 @@ -1 +1 @@ -Subproject commit 6c461cc60a653de801e51ea914b78a243ce66819 +Subproject commit edf5871a3a2e8f7300eb06175240b56c21072fe9 -- GitLab