Fix findEndpoint query require keyword when using BanyanDB. (#12615)

apache · Sep 13, 2024 · f1aad99 · f1aad99
1 parent 0f79e35
commit f1aad99
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
@@ -63,6 +63,7 @@
 * Support service level metrics aggregate when missing pod context in eBPF Access Log Receiver.
 * Fix query `getGlobalTopology` throw exception when didn't find any services by the given Layer.
 * Fix the previous analysis result missing in the ALS `k8s-mesh` analyzer.
+* Fix `findEndpoint` query require `keyword` when using BanyanDB.
 
 #### UI
 

diff --git a/.../src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java b/.../src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
@@ -57,6 +57,7 @@ public class ZipkinServiceSpanTraffic extends Metrics {
     @Setter
     @Getter
     @Column(name = SPAN_NAME)
+    @BanyanDB.SeriesID(index = 1)
     private String spanName = Const.EMPTY_STRING;
 
     @Override

diff --git a/...pache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java b/...pache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java
@@ -195,7 +195,7 @@ protected void apply(MeasureQuery query) {
             endpoints.add(buildEndpoint(dataPoint, schema));
         }
 
-        if (StringUtil.isNotEmpty(serviceId)) {
+        if (StringUtil.isNotEmpty(keyword)) {
             return endpoints.stream().filter(e -> e.getName().contains(keyword)).collect(Collectors.toList());
         }
         return endpoints;

diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
@@ -23,7 +23,7 @@ SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
 SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
 SW_KUBERNETES_COMMIT_SHA=1335f15bf821a40a7cd71448fa805f0be265afcc
 SW_ROVER_COMMIT=6bbd39aa701984482330d9dfb4dbaaff0527d55c
-SW_BANYANDB_COMMIT=d48a810f8cca8b66d7b3b179f36090d78f46e12c
+SW_BANYANDB_COMMIT=59c396870ac2d81ec81113802d54277fe070d91b
 SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
 
 SW_CTL_COMMIT=d5f3597733aa5217373986d776a3ee5ee8b3c468