kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong service instance id in alarm query (#7023)

This commit is contained in:
Zhenxu Ke 2021-05-27 12:05:54 +08:00 committed by GitHub
parent a8f2476497
commit 1a727585f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AlarmQuery.java
View File

@ -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);
}
}