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 c6ef231f39 Support BanyanDB's new property (#12936)
c6ef231f39 is described below
commit c6ef231f397e428367e831f2dc078c4d83dc237c
Author: Gao Hongtao <[email protected]>
AuthorDate: Wed Jan 8 11:56:45 2025 +0800
Support BanyanDB's new property (#12936)
---
docs/en/changes/changes.md | 1 +
oap-server-bom/pom.xml | 2 +-
.../plugin/banyandb/BanyanDBStorageClient.java | 33 +++++++++++-----------
.../plugin/banyandb/BanyanDBStorageProvider.java | 5 +++-
.../profiling/ebpf/access_log/banyandb/e2e.yaml | 3 +-
.../profiling/ebpf/continuous/banyandb/e2e.yaml | 3 +-
.../cases/profiling/ebpf/network/banyandb/e2e.yaml | 3 +-
test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml | 3 +-
.../cases/profiling/ebpf/oncpu/banyandb/e2e.yaml | 3 +-
test/e2e-v2/script/env | 4 +--
10 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md
index ce6c048c02..3001b77ee1 100644
--- a/docs/en/changes/changes.md
+++ b/docs/en/changes/changes.md
@@ -52,6 +52,7 @@
* Fix `hierarchy-definition.yml` config file packaged into start.jar wrongly.
* Add `bydb.dependencies.properties` config file to define server dependency
versions.
* Fix `AvgHistogramPercentileFunction` doesn't have proper field definition
for `ranks`.
+* BanyanDB: Support the new Property data module.
#### UI
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 32481c60a7..92ffd3f9c3 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -72,7 +72,7 @@
<httpcore.version>4.4.13</httpcore.version>
<httpasyncclient.version>4.1.5</httpasyncclient.version>
<commons-compress.version>1.21</commons-compress.version>
- <banyandb-java-client.version>0.8.0-rc0</banyandb-java-client.version>
+ <banyandb-java-client.version>0.8.0-rc1</banyandb-java-client.version>
<kafka-clients.version>3.4.0</kafka-clients.version>
<spring-kafka-test.version>2.4.6.RELEASE</spring-kafka-test.version>
<consul.client.version>1.5.3</consul.client.version>
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
index 30e4c63b9e..a00ab5af24 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageClient.java
@@ -20,6 +20,7 @@ package
org.apache.skywalking.oap.server.storage.plugin.banyandb;
import io.grpc.Status;
import org.apache.skywalking.banyandb.database.v1.BanyandbDatabase;
+import org.apache.skywalking.banyandb.property.v1.BanyandbProperty;
import org.apache.skywalking.banyandb.v1.client.BanyanDBClient;
import org.apache.skywalking.banyandb.v1.client.MeasureBulkWriteProcessor;
import org.apache.skywalking.banyandb.v1.client.MeasureQuery;
@@ -78,9 +79,12 @@ public class BanyanDBStorageClient implements Client,
HealthCheckable {
public List<Property> listProperties(String group, String name) throws
IOException {
try {
- List<Property> properties = this.client.findProperties(group,
name);
+ BanyandbProperty.QueryResponse resp =
this.client.query(BanyandbProperty.QueryRequest.newBuilder()
+ .addGroups(group)
+ .setContainer(name)
+ .build());
this.healthChecker.health();
- return properties;
+ return resp.getPropertiesList();
} catch (BanyanDBException ex) {
if (ex.getStatus().equals(Status.Code.NOT_FOUND)) {
this.healthChecker.health();
@@ -94,9 +98,16 @@ public class BanyanDBStorageClient implements Client,
HealthCheckable {
public Property queryProperty(String group, String name, String id) throws
IOException {
try {
- Property p = this.client.findProperty(group, name, id);
+ BanyandbProperty.QueryResponse resp =
this.client.query(BanyandbProperty.QueryRequest.newBuilder()
+ .addGroups(group)
+ .setContainer(name)
+ .addIds(id)
+ .build());
this.healthChecker.health();
- return p;
+ if (resp.getPropertiesCount() == 0) {
+ return null;
+ }
+ return resp.getProperties(0);
} catch (BanyanDBException ex) {
if (ex.getStatus().equals(Status.Code.NOT_FOUND)) {
this.healthChecker.health();
@@ -108,9 +119,9 @@ public class BanyanDBStorageClient implements Client,
HealthCheckable {
}
}
- public DeleteResponse deleteProperty(String group, String name, String id,
String... tags) throws IOException {
+ public DeleteResponse deleteProperty(String group, String name, String id)
throws IOException {
try {
- DeleteResponse result = this.client.deleteProperty(group, name,
id, tags);
+ DeleteResponse result = this.client.deleteProperty(group, name,
id);
this.healthChecker.health();
return result;
} catch (BanyanDBException ex) {
@@ -119,16 +130,6 @@ public class BanyanDBStorageClient implements Client,
HealthCheckable {
}
}
- public void keepAliveProperty(long leaseId) throws IOException {
- try {
- this.client.keepAliveProperty(leaseId);
- this.healthChecker.health();
- } catch (BanyanDBException ex) {
- healthChecker.unHealth(ex);
- throw new IOException("fail to keep alive property", ex);
- }
- }
-
public StreamQueryResponse query(StreamQuery q) throws IOException {
try {
StreamQueryResponse response = this.client.query(q);
diff --git
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
index 0d777ba2da..fb80d067e7 100644
---
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
+++
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/BanyanDBStorageProvider.java
@@ -209,7 +209,10 @@ public class BanyanDBStorageProvider extends
ModuleProvider {
BanyandbCommon.Metadata.newBuilder()
.setName(
BanyanDBUITemplateManagementDAO.GROUP))
-
.setCatalog(BanyandbCommon.Catalog.CATALOG_UNSPECIFIED)
+
.setCatalog(BanyandbCommon.Catalog.CATALOG_PROPERTY)
+
.setResourceOpts(BanyandbCommon.ResourceOpts.newBuilder()
+
.setShardNum(1)
+
.build())
.build());
this.modelInstaller.start();
diff --git a/test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
index 044a3ab993..1baef8dd83 100644
--- a/test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/access_log/banyandb/e2e.yaml
@@ -49,7 +49,8 @@ setup:
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
- --set banyandb.standalone.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.repository=ghcr.io/apache/skywalking-banyandb \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
index ed19b8c7cd..6be954ee94 100644
--- a/test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/continuous/banyandb/e2e.yaml
@@ -50,7 +50,8 @@ setup:
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
- --set banyandb.standalone.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.repository=ghcr.io/apache/skywalking-banyandb \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
index 67c5d6c38e..b9e6db859c 100644
--- a/test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml
@@ -53,7 +53,8 @@ setup:
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
- --set banyandb.standalone.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.repository=ghcr.io/apache/skywalking-banyandb \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
b/test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
index e859ab7047..9ade36c8ce 100644
--- a/test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/offcpu/e2e.yaml
@@ -50,7 +50,8 @@ setup:
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
- --set banyandb.standalone.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.repository=ghcr.io/apache/skywalking-banyandb \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
diff --git a/test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
b/test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
index 0ca9c24d2e..451377045a 100644
--- a/test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
+++ b/test/e2e-v2/cases/profiling/ebpf/oncpu/banyandb/e2e.yaml
@@ -50,7 +50,8 @@ setup:
--set fullnameOverride=skywalking \
--set elasticsearch.enabled=false \
--set banyandb.enabled=true \
- --set banyandb.standalone.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.tag=${SW_BANYANDB_COMMIT} \
+ --set banyandb.image.repository=ghcr.io/apache/skywalking-banyandb \
--set oap.replicas=1 \
--set ui.image.repository=skywalking/ui \
--set ui.image.tag=latest \
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 5e6fc2cded..d038376708 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -21,9 +21,9 @@ SW_AGENT_GO_COMMIT=774a6d56baba1187eb03bf1861af542c923b3dff
SW_AGENT_PYTHON_COMMIT=c76a6ec51a478ac91abb20ec8f22a99b8d4d6a58
SW_AGENT_CLIENT_JS_COMMIT=af0565a67d382b683c1dbd94c379b7080db61449
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
-SW_KUBERNETES_COMMIT_SHA=1335f15bf821a40a7cd71448fa805f0be265afcc
+SW_KUBERNETES_COMMIT_SHA=6fe5e6f0d3b7686c6be0457733e825ee68cb9b35
SW_ROVER_COMMIT=0ae8f12d6eb6cc9fa125c603ee57d0b21fc8c6d0
-SW_BANYANDB_COMMIT=7f291fc5c626ea8b0d33c947563f7984cfc4886e
+SW_BANYANDB_COMMIT=8dfe616f332848f041b0f184b023d9a256eac39e
SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3
SW_CTL_COMMIT=67cbc89dd7b214d5791321a7ca992f940cb586ba
