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

Fix group name can't be queried when it is null. (#5986)

This commit is contained in:
吴晟 Wu Sheng 2020-12-10 16:20:50 +08:00 committed by GitHub
parent 0996151973
commit 8ff77667b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -18,7 +18,8 @@ Release Notes.
* Support influxDB connection response format option. Fix some error when use JSON as influxDB response format.
* Support Kafka MirrorMaker 2.0 to replicate topics between Kafka clusters.
* Add the rule name field to alarm record storage entity as a part of ID, to support multiple alarm rules triggered for one entity. The scope id has been removed from the ID.
* Fix MAL concurrent execution issues
* Fix MAL concurrent execution issues.
* Fix group name can't be query in the GraphQL.
#### UI
* Fix un-removed tags in trace query.

10
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java
View File

@ -20,6 +20,8 @@ package org.apache.skywalking.oap.server.core.query;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.analysis.IDManager;
import org.apache.skywalking.oap.server.core.query.type.Database;
import org.apache.skywalking.oap.server.core.query.type.Endpoint;
@ -47,7 +49,13 @@ public class MetadataQueryService implements org.apache.skywalking.oap.server.li
}
public List<Service> getAllServices(final String group) throws IOException {
return getMetadataQueryDAO().getAllServices(group);
return getMetadataQueryDAO().getAllServices(group).stream()
.map(service -> {
if (service.getGroup() == null) {
service.setGroup(Const.EMPTY_STRING);
}
return service;
}).collect(Collectors.toList());
}
public List<Service> getAllBrowserServices() throws IOException {