This is an automated email from the ASF dual-hosted git repository.
wankai 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 600ea37a4d Fix `BanyanDB Metadata Query`: make query single
instance/process return full tags to avoid NPE. (#11567)
600ea37a4d is described below
commit 600ea37a4d6d72c61570b615e17b77ebea16404e
Author: Wan Kai <[email protected]>
AuthorDate: Mon Nov 20 14:01:53 2023 +0800
Fix `BanyanDB Metadata Query`: make query single instance/process return
full tags to avoid NPE. (#11567)
---
docs/en/changes/changes.md | 1 +
.../plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java | 11 ++---------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index 679064c655..c14b13c026 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -43,6 +43,7 @@
* Change the policy of the queue(DataCarrier) in the L1 metric aggregate
worker to IF_POSSIBLE mode.
* Add self-observability metric `metrics_aggregator_abandon` to count the
number of abandon metrics.
* Support Nginx monitoring.
+* Fix `BanyanDB Metadata Query`: make query single instance/process return
full tags to avoid NPE.
#### UI
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
index ff8df6cd30..880bc82d53 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
@@ -70,9 +70,6 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
private static final Set<String> INSTANCE_TRAFFIC_TAGS =
ImmutableSet.of(InstanceTraffic.NAME,
InstanceTraffic.PROPERTIES, InstanceTraffic.LAST_PING_TIME_BUCKET,
InstanceTraffic.SERVICE_ID);
- private static final Set<String> INSTANCE_TRAFFIC_COMPACT_TAGS =
ImmutableSet.of(InstanceTraffic.NAME,
- InstanceTraffic.PROPERTIES);
-
private static final Set<String> ENDPOINT_TRAFFIC_TAGS =
ImmutableSet.of(EndpointTraffic.NAME,
EndpointTraffic.SERVICE_ID);
@@ -81,10 +78,6 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
ProcessTraffic.PROPERTIES, ProcessTraffic.LABELS_JSON,
ProcessTraffic.LAST_PING_TIME_BUCKET,
ProcessTraffic.PROFILING_SUPPORT_STATUS);
- private static final Set<String> PROCESS_TRAFFIC_COMPACT_TAGS =
ImmutableSet.of(ProcessTraffic.NAME,
- ProcessTraffic.SERVICE_ID, ProcessTraffic.INSTANCE_ID,
ProcessTraffic.AGENT_ID, ProcessTraffic.DETECT_TYPE,
- ProcessTraffic.PROPERTIES, ProcessTraffic.LABELS_JSON);
-
private static final Gson GSON = new Gson();
public BanyanDBMetadataQueryDAO(BanyanDBStorageClient client) {
@@ -141,7 +134,7 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
public ServiceInstance getInstance(String instanceId) throws IOException {
IDManager.ServiceInstanceID.InstanceIDDefinition id =
IDManager.ServiceInstanceID.analysisId(instanceId);
MeasureQueryResponse resp = query(InstanceTraffic.INDEX_NAME,
- INSTANCE_TRAFFIC_COMPACT_TAGS,
+ INSTANCE_TRAFFIC_TAGS,
Collections.emptySet(),
new QueryBuilder<MeasureQuery>() {
@Override
@@ -322,7 +315,7 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
@Override
public Process getProcess(String processId) throws IOException {
MeasureQueryResponse resp = query(ProcessTraffic.INDEX_NAME,
- PROCESS_TRAFFIC_COMPACT_TAGS,
+ PROCESS_TRAFFIC_TAGS,
Collections.emptySet(),
new QueryBuilder<MeasureQuery>() {
@Override
