You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/01/21 11:33:02 UTC
[skywalking] branch master updated: Add `normal` to listService query and support `scope=ALL` for global level metrics (#8463)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 012d58a Add `normal` to listService query and support `scope=ALL` for global level metrics (#8463)
012d58a is described below
commit 012d58a8fe29295b41246c20b399283fa9c1305b
Author: wankai123 <wa...@foxmail.com>
AuthorDate: Fri Jan 21 19:32:21 2022 +0800
Add `normal` to listService query and support `scope=ALL` for global level metrics (#8463)
---
CHANGES.md | 2 ++
.../oap/server/core/query/MetricDefinition.java | 2 +-
.../oap/server/core/query/type/Service.java | 20 ++++++++++++++++++--
.../oap/server/core/source/DefaultScopeDefine.java | 4 ++--
.../src/main/resources/query-protocol | 2 +-
5 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index e4db012..d0b9722 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -34,6 +34,8 @@ Release Notes.
* 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.
+* Add `normal` to V9 service meta query.
+* Support `scope=ALL` catalog for metrics.
#### UI
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
index ddd28b3..5964260 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetricDefinition.java
@@ -38,7 +38,7 @@ public class MetricDefinition {
private MetricsType type;
/**
* Catalog includes SERVICE_CATALOG,SERVICE_INSTANCE_CATALOG,ENDPOINT_CATALOG,
- * SERVICE_RELATION_CATALOG,SERVICE_INSTANCE_RELATION_CATALOG_NAME,ENDPOINT_RELATION_CATALOG_NAME
+ * SERVICE_RELATION_CATALOG,SERVICE_INSTANCE_RELATION_CATALOG_NAME,ENDPOINT_RELATION_CATALOG_NAME,ALL
*/
private String catalog;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
index dc7d13f..3ab454f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/type/Service.java
@@ -23,14 +23,30 @@ import java.util.Set;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
+import org.apache.skywalking.oap.server.core.analysis.IDManager;
-@Getter
-@Setter
@EqualsAndHashCode
public class Service {
+ @Getter
private String id;
+ @Getter
+ @Setter
private String name;
+ @Getter
+ @Setter
private String shortName;
+ @Getter
+ @Setter
private String group;
+ @Getter
+ private boolean normal;
+ @Getter
+ @Setter
private Set<String> layers = new HashSet<>();
+
+ public void setId(String id) {
+ this.id = id;
+ IDManager.ServiceID.ServiceIDDefinition def = IDManager.ServiceID.analysisId(id);
+ this.normal = def.isReal();
+ }
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
index 43f2fa5..78d70ae 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/DefaultScopeDefine.java
@@ -306,7 +306,7 @@ public class DefaultScopeDefine {
* Get the catalog string name of the given scope
*
* @param scope id of the source scope.
- * @return literal string name of the catalog owning the scope.
+ * @return literal string name of the catalog owning the scope. Return `ALL` by default.
*/
public static String catalogOf(int scope) {
if (inServiceCatalog(scope)) {
@@ -327,7 +327,7 @@ public class DefaultScopeDefine {
if (inEndpointRelationCatalog(scope)) {
return ENDPOINT_RELATION_CATALOG_NAME;
}
- return "UNKNOWN";
+ return "ALL";
}
/**
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 d9039e0..d6e2947 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 d9039e01767bc79e845bb32dbbeb6cdf74403af5
+Subproject commit d6e294735ab43b2fa9e70b11c91d85268591dec0