From 1a727585f9dda73f26e6ac8ee2fe4a80a5994263 Mon Sep 17 00:00:00 2001 From: Zhenxu Ke Date: Thu, 27 May 2021 12:05:54 +0800 Subject: [PATCH] Fix wrong service instance id in alarm query (#7023) --- .../skywalking/oap/query/graphql/resolver/AlarmQuery.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 cb63af78ca..dd531f733d 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 @@ -186,15 +186,16 @@ public class AlarmQuery implements GraphQLQueryResolver { } final String service = source.getService(); + final String serviceId = IDManager.ServiceID.buildId(service, true); if (isNullOrEmpty(service)) { return ""; } final String instance = source.getServiceInstance(); if (isNullOrEmpty(instance)) { - return IDManager.ServiceID.buildId(service, true); + return serviceId; } - return IDManager.ServiceInstanceID.buildId(service, instance); + return IDManager.ServiceInstanceID.buildId(serviceId, instance); } }