This is an automated email from the ASF dual-hosted git repository.
wusheng 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 f1aad99e7b Fix `findEndpoint` query require `keyword` when using
BanyanDB. (#12615)
f1aad99e7b is described below
commit f1aad99e7b303915783a6f94daf7c5402340feb6
Author: Wan Kai <[email protected]>
AuthorDate: Fri Sep 13 14:15:20 2024 +0800
Fix `findEndpoint` query require `keyword` when using BanyanDB. (#12615)
---
docs/en/changes/changes.md | 1 +
.../skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java | 1 +
.../storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java | 2 +-
test/e2e-v2/script/env | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index f4307a7076..3ec2f43f3d 100644
--- 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/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
index a1699239bd..2681815a1e 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/zipkin/ZipkinServiceSpanTraffic.java
+++
b/oap-server/server-core/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/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 1607f2875b..3a73581cab 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
@@ -195,7 +195,7 @@ public class BanyanDBMetadataQueryDAO extends
AbstractBanyanDBDAO implements IMe
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
index c461eeddaa..4dcf1af099 100644
--- 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
