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 93bcd9415b Add some banyandb e2e cases(cold query) back (#13734)
93bcd9415b is described below
commit 93bcd9415b2e4c747e94e2afd547e1041bb1de02
Author: Wan Kai <[email protected]>
AuthorDate: Tue Mar 10 20:46:12 2026 +0800
Add some banyandb e2e cases(cold query) back (#13734)
---
.github/workflows/skywalking.yaml | 208 ++++++++++-----------
test/e2e-v2/cases/otlp-traces/e2e.yaml | 2 +-
.../storage/banyandb/stages/docker-compose.yml | 2 +-
.../e2e-v2/cases/traceql/zipkin/traceql-cases.yaml | 5 +-
test/e2e-v2/cases/zipkin/zipkin-cases.yaml | 2 +
test/e2e-v2/script/env | 2 +-
6 files changed, 111 insertions(+), 110 deletions(-)
diff --git a/.github/workflows/skywalking.yaml
b/.github/workflows/skywalking.yaml
index 76abddc09e..72c2d4d9e9 100644
--- a/.github/workflows/skywalking.yaml
+++ b/.github/workflows/skywalking.yaml
@@ -927,110 +927,110 @@ jobs:
with:
e2e-file: $GITHUB_WORKSPACE/test/e2e-v2/cases/simple/jdk/e2e.yaml
-# e2e-test-banyandb-stages:
-# if: |
-# ( always() && ! cancelled() ) &&
-# ((github.event_name == 'schedule' && github.repository ==
'apache/skywalking') || needs.changes.outputs.oap == 'true')
-# name: E2E test
-# needs: [docker, dist-tar]
-# runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }}
-# timeout-minutes: 60
-# env:
-# BANYANDB_DATA_GENERATE_ROOT:
test/e2e-v2/cases/storage/banyandb/data-generate
-# strategy:
-# fail-fast: false
-# matrix:
-# test:
-# - name: BanyanDB Stages
-# config: test/e2e-v2/cases/storage/banyandb/stages/e2e.yaml
-# steps:
-# - uses: actions/checkout@v4
-# with:
-# submodules: true
-# persist-credentials: false
-# - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
-# - uses: apache/skywalking-cli/actions/setup@master
-# with:
-# version: ${{ env.SW_CTL_COMMIT }}
-# - uses: actions/download-artifact@v4
-# name: Download docker images
-# with:
-# name: docker-images-11
-# path: docker-images
-# - name: Load docker images
-# run: |
-# find docker-images -name "*.tar" -exec docker load -i {} \;
-# find docker-images -name "*.tar" -exec rm {} \;
-# - uses: actions/download-artifact@v4
-# name: Download distribution tar
-# with:
-# name: dist
-# path: dist
-# - name: Login to ghcr
-# uses: docker/login-action@v3
-# with:
-# registry: ghcr.io
-# username: ${{ github.repository_owner }}
-# password: ${{ secrets.GITHUB_TOKEN }}
-# - name: Cache maven repository
-# uses: actions/cache@v4
-# with:
-# path: ~/.m2/repository
-# key: ${{ runner.os }}-maven-${{
hashFiles('test/e2e-v2/java-test-service/**/pom.xml') }}
-# restore-keys: ${{ runner.os }}-maven-
-# - name: Prepare test services
-# shell: bash
-# run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean
flatten:flatten package
-# - name: Set env var
-# run: |
-# echo "${{ matrix.test.env }}" >> $GITHUB_ENV
-# - name: Build test image
-# if: matrix.test.docker != null
-# run: docker build -t ${{ matrix.test.docker.name }} -f ${{
matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{
matrix.test.docker.base }}
-# - name: Generate BanyanDB cold data
-# run: |
-# export $(grep -v '^#' test/e2e-v2/script/env | xargs)
-# docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml
up -d
-# CONTAINER_ID=$(docker compose -f
${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml ps -q banyandb)
-# echo "⌛ monitoring segment files..."
-# found=false
-# for i in {1..60}; do
-# # check if segment files exist
-# if docker exec $CONTAINER_ID sh -c '[ -n "$(ls
/tmp/measure-data/measure/data/metricsDay/seg* 2>/dev/null)" ]'; then
-# echo "✅ found segment files"
-# sleep 180
-# # create and copy files
-# docker cp $CONTAINER_ID:/tmp ${BANYANDB_DATA_GENERATE_ROOT}
-# docker cp $CONTAINER_ID:/tmp/measure-data/measure/data/metadata
${BANYANDB_DATA_GENERATE_ROOT}
-# found=true
-# break
-# else
-# echo "⏳ didn't find segment files (retry $i/60)"
-# sleep 10
-# fi
-# done
-# if $found; then
-# echo "✅ segment files copied to ${BANYANDB_DATA_GENERATE_ROOT}"
-# else
-# echo "❌ segment files not found"
-# exit 1
-# fi
-# docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml
down -v
-# - name: ${{ matrix.test.name }}
-# uses:
apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
-# with:
-# e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
-# - if: ${{ failure() }}
-# run: |
-# df -h
-# du -sh .
-# docker images
-# - uses: actions/upload-artifact@v4
-# if: ${{ failure() }}
-# name: Upload Logs
-# with:
-# name: test-logs-${{ matrix.test.name }}
-# path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
+ e2e-test-banyandb-stages:
+ if: |
+ ( always() && ! cancelled() ) &&
+ ((github.event_name == 'schedule' && github.repository ==
'apache/skywalking') || needs.changes.outputs.oap == 'true')
+ name: E2E test
+ needs: [docker, dist-tar]
+ runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }}
+ timeout-minutes: 60
+ env:
+ BANYANDB_DATA_GENERATE_ROOT:
test/e2e-v2/cases/storage/banyandb/data-generate
+ strategy:
+ fail-fast: false
+ matrix:
+ test:
+ - name: BanyanDB Stages
+ config: test/e2e-v2/cases/storage/banyandb/stages/e2e.yaml
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ submodules: true
+ persist-credentials: false
+ - run: grep -v '^#' test/e2e-v2/script/env >> "$GITHUB_ENV"
+ - uses: apache/skywalking-cli/actions/setup@master
+ with:
+ version: ${{ env.SW_CTL_COMMIT }}
+ - uses: actions/download-artifact@v4
+ name: Download docker images
+ with:
+ name: docker-images-11
+ path: docker-images
+ - name: Load docker images
+ run: |
+ find docker-images -name "*.tar" -exec docker load -i {} \;
+ find docker-images -name "*.tar" -exec rm {} \;
+ - uses: actions/download-artifact@v4
+ name: Download distribution tar
+ with:
+ name: dist
+ path: dist
+ - name: Login to ghcr
+ uses: docker/login-action@v3
+ with:
+ registry: ghcr.io
+ username: ${{ github.repository_owner }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - name: Cache maven repository
+ uses: actions/cache@v4
+ with:
+ path: ~/.m2/repository
+ key: ${{ runner.os }}-maven-${{
hashFiles('test/e2e-v2/java-test-service/**/pom.xml') }}
+ restore-keys: ${{ runner.os }}-maven-
+ - name: Prepare test services
+ shell: bash
+ run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean
flatten:flatten package
+ - name: Set env var
+ run: |
+ echo "${{ matrix.test.env }}" >> $GITHUB_ENV
+ - name: Build test image
+ if: matrix.test.docker != null
+ run: docker build -t ${{ matrix.test.docker.name }} -f ${{
matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{
matrix.test.docker.base }}
+ - name: Generate BanyanDB cold data
+ run: |
+ export $(grep -v '^#' test/e2e-v2/script/env | xargs)
+ docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml
up -d
+ CONTAINER_ID=$(docker compose -f
${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml ps -q banyandb)
+ echo "⌛ monitoring segment files..."
+ found=false
+ for i in {1..60}; do
+ # check if segment files exist
+ if docker exec $CONTAINER_ID sh -c '[ -n "$(ls
/tmp/measure-data/measure/data/sw_metricsDay/seg* 2>/dev/null)" ]'; then
+ echo "✅ found segment files"
+ sleep 180
+ # create and copy files
+ docker cp $CONTAINER_ID:/tmp ${BANYANDB_DATA_GENERATE_ROOT}
+ docker cp
$CONTAINER_ID:/tmp/measure-data/measure/data/sw_metadata
${BANYANDB_DATA_GENERATE_ROOT}
+ found=true
+ break
+ else
+ echo "⏳ didn't find segment files (retry $i/60)"
+ sleep 10
+ fi
+ done
+ if $found; then
+ echo "✅ segment files copied to ${BANYANDB_DATA_GENERATE_ROOT}"
+ else
+ echo "❌ segment files not found"
+ exit 1
+ fi
+ docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml
down -v
+ - name: ${{ matrix.test.name }}
+ uses:
apache/skywalking-infra-e2e@8c21e43e241a32a54bdf8eeceb9099eb27e5e9b4
+ with:
+ e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
+ - if: ${{ failure() }}
+ run: |
+ df -h
+ du -sh .
+ docker images
+ - uses: actions/upload-artifact@v4
+ if: ${{ failure() }}
+ name: Upload Logs
+ with:
+ name: test-logs-${{ matrix.test.name }}
+ path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
required:
if: always()
diff --git a/test/e2e-v2/cases/otlp-traces/e2e.yaml
b/test/e2e-v2/cases/otlp-traces/e2e.yaml
index f40e586281..019c0b8270 100644
--- a/test/e2e-v2/cases/otlp-traces/e2e.yaml
+++ b/test/e2e-v2/cases/otlp-traces/e2e.yaml
@@ -41,7 +41,7 @@ verify:
# max retry count
count: 20
# the interval between two retries, in millisecond.
- interval: 5s
+ interval: 10s
cases:
# service name
- query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/services
diff --git a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
index 529e84d473..23bb59ceac 100644
--- a/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
+++ b/test/e2e-v2/cases/storage/banyandb/stages/docker-compose.yml
@@ -30,7 +30,7 @@ services:
hostname: data-hot1
command: data --etcd-endpoints=http://etcd:2379 --node-labels type=hot
volumes:
- - ../data-generate/metadata:/tmp/measure/data/metadata
+ - ../data-generate/sw_metadata:/tmp/measure/data/sw_metadata
networks:
- e2e
diff --git a/test/e2e-v2/cases/traceql/zipkin/traceql-cases.yaml
b/test/e2e-v2/cases/traceql/zipkin/traceql-cases.yaml
index d96f2a167e..2b4f9425ea 100644
--- a/test/e2e-v2/cases/traceql/zipkin/traceql-cases.yaml
+++ b/test/e2e-v2/cases/traceql/zipkin/traceql-cases.yaml
@@ -43,9 +43,8 @@ cases:
expected: expected/search-traces-by-service.yml
# Search traces with duration filter using TraceQL
-# Waiting for banyandb fix
-# - query: curl -X GET http://${oap_host}:${oap_3200}/zipkin/api/search -d
'q={duration>1ms}&start='$(($(date +%s)-1800))'&end='$(date +%s)'&limit=1'
-# expected: expected/search-traces-by-duration.yml
+ - query: curl -X GET http://${oap_host}:${oap_3200}/zipkin/api/search -d
'q={duration>1ms}&start='$(($(date +%s)-1800))'&end='$(date +%s)'&limit=1'
+ expected: expected/search-traces-by-duration.yml
# Search traces with complex TraceQL query
- query: curl -X GET http://${oap_host}:${oap_3200}/zipkin/api/search -d
'q={resource.service.name="frontend" &&
span.http.method="GET"}&start='$(($(date +%s)-1800))'&end='$(date
+%s)'&limit=10'
diff --git a/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
b/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
index f584928089..cd0e40cee9 100644
--- a/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
+++ b/test/e2e-v2/cases/zipkin/zipkin-cases.yaml
@@ -26,6 +26,8 @@ cases:
# traces
- query: curl
"http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?serviceName=frontend&remoteServiceName=backend&spanName=get&annotationQuery=wr&limit=1";
expected: expected/traces.yml
+ - query: curl
"http://${oap_host}:${oap_9412}/zipkin/api/v2/traces?minDuration=1000&limit=1";
+ expected: expected/traces.yml
# autocomplete
- query: curl http://${oap_host}:${oap_9412}/zipkin/api/v2/autocompleteKeys
expected: expected/autocomplete-keys.yml
diff --git a/test/e2e-v2/script/env b/test/e2e-v2/script/env
index 94d509cdae..96f105986f 100644
--- a/test/e2e-v2/script/env
+++ b/test/e2e-v2/script/env
@@ -23,7 +23,7 @@
SW_AGENT_CLIENT_JS_COMMIT=f08776d909eb1d9bc79c600e493030651b97e491
SW_AGENT_CLIENT_JS_TEST_COMMIT=4f1eb1dcdbde3ec4a38534bf01dded4ab5d2f016
SW_KUBERNETES_COMMIT_SHA=2850db1502283a2d8516146c57cc2b49f1da934b
SW_ROVER_COMMIT=79292fe07f17f98f486e0c4471213e1961fb2d1d
-SW_BANYANDB_COMMIT=7568a326bb7b10b6aa804bf0f4239904c347d9d5
+SW_BANYANDB_COMMIT=e1ba421bd624727760c7a69c84c6fe55878fb526
SW_AGENT_PHP_COMMIT=d1114e7be5d89881eec76e5b56e69ff844691e35
SW_PREDICTOR_COMMIT=54a0197654a3781a6f73ce35146c712af297c994
