From 6273cb2c16e69a0a4df4e20d4a182469ff3c276c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 16 Apr 2025 08:58:43 +0800 Subject: [PATCH] Bump up BanyanDB dependency to 0.9 (#13174) --- .github/workflows/skywalking.yaml | 6 +++--- docs/en/changes/changes.md | 2 ++ oap-server-bom/pom.xml | 2 +- .../src/main/resources/bydb.dependencies.properties | 4 ++-- .../storage/plugin/banyandb/BanyanDBStorageClient.java | 2 +- test/e2e-v2/script/env | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 1c38b5f3dc..d41e8cf4fd 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -490,7 +490,7 @@ jobs: base: test/e2e-v2/cases/profiling/ebpf/offcpu/ file: Dockerfile.file name: test/offcpu:test - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 - name: eBPF Profiling Network BanyanDB config: test/e2e-v2/cases/profiling/ebpf/network/banyandb/e2e.yaml @@ -576,7 +576,7 @@ jobs: - name: Rover with Istio Process 1.15.0 config: test/e2e-v2/cases/rover/process/istio/e2e.yaml env: ISTIO_VERSION=1.15.0 - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 - name: Satellite config: test/e2e-v2/cases/satellite/native-protocols/e2e.yaml @@ -758,7 +758,7 @@ jobs: ((github.event_name == 'schedule' && github.repository == 'apache/skywalking') || needs.changes.outputs.oap == 'true') name: E2E test needs: [docker] - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 strategy: fail-fast: false diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 1eec8bb7bd..1b67cebe59 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -2,6 +2,8 @@ #### Project +* Bump up BanyanDB dependency version(server and java-client) to 0.9.0. + #### OAP Server * BanyanDB: Support `hot/warm/cold` stages configuration. diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml index 12281341af..efb2d8fa2f 100644 --- a/oap-server-bom/pom.xml +++ b/oap-server-bom/pom.xml @@ -72,7 +72,7 @@ 4.4.16 4.1.5 1.21 - 0.8.0 + 0.9.0-rc0 3.4.0 2.4.6.RELEASE 1.5.3 diff --git a/oap-server/server-starter/src/main/resources/bydb.dependencies.properties b/oap-server/server-starter/src/main/resources/bydb.dependencies.properties index cbe463a24a..d39c334c4f 100644 --- a/oap-server/server-starter/src/main/resources/bydb.dependencies.properties +++ b/oap-server/server-starter/src/main/resources/bydb.dependencies.properties @@ -15,10 +15,10 @@ # BanyanDB version is the version number of BanyanDB Server release. # This is the bundled and tested BanyanDB release version -bydb.version=0.8 +bydb.version=0.9 # BanyanDB API version is the version number of the BanyanDB query APIs # OAP server has bundled implementation of BanyanDB Java client. # Please check BanyanDB documentation for the API version compatibility. # https://skywalking.apache.org/docs/skywalking-banyandb/next/installation/versions # Each `bydb.api.version` could have multiple compatible release version(`bydb.version`). -bydb.api.version=0.8 \ No newline at end of file +bydb.api.version=0.9 \ No newline at end of file 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 9bca7b35a1..8e355c0972 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 @@ -62,7 +62,7 @@ import org.apache.skywalking.oap.server.library.util.HealthChecker; */ @Slf4j public class BanyanDBStorageClient implements Client, HealthCheckable { - private static final String[] COMPATIBLE_SERVER_API_VERSIONS = {"0.8"}; + private static final String[] COMPATIBLE_SERVER_API_VERSIONS = {"0.9"}; final BanyanDBClient client; private final DelegatedHealthChecker healthChecker = new DelegatedHealthChecker(); private final int flushTimeout; diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env index 486ad4ab31..29b803a4df 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=6fe5e6f0d3b7686c6be0457733e825ee68cb9b35 SW_ROVER_COMMIT=4c0cb8429a96f190ea30eac1807008d523c749c3 -SW_BANYANDB_COMMIT=53b3be42d162e2f4ef0c667dc30f25e42ff17d70 +SW_BANYANDB_COMMIT=458041a561b0acc1f2ed37690df2ce753b791283 SW_AGENT_PHP_COMMIT=3192c553002707d344bd6774cfab5bc61f67a1d3 SW_PREDICTOR_COMMIT=54a0197654a3781a6f73ce35146c712af297c994