From e8b95673c4f766edaacfcab03d306ff26cce4256 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 12:25:46 +0700 Subject: [PATCH 01/12] Bump up dependencies and e2e * Bump up agent-oap protocol to latest(16c51358ebcf42629bf4ffdf952253971f20eb25). * Bump up gRPC to v1.74.0. * Bump up netty to v4.1.124.Final. * Bump up GSON to v2.13.1. * Bump up guava to v33.4.8. * Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e. * Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e. --- CHANGES.md | 8 +++++++- apm-protocol/apm-network/src/main/proto | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 -- dist-material/LICENSE | 10 +++++----- pom.xml | 11 ++++++----- test/e2e/base/base-compose.yml | 18 +++++++++++++++++- test/e2e/script/env | 2 ++ 7 files changed, 38 insertions(+), 15 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index de2ded2867..d0f2ff551b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,13 @@ Release Notes. 9.6.0 ------------------ - +* Bump up agent-oap protocol to latest(16c51358ebcf42629bf4ffdf952253971f20eb25). +* Bump up gRPC to v1.74.0. +* Bump up netty to v4.1.124.Final. +* Bump up GSON to v2.13.1. +* Bump up guava to v33.4.8. +* Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e. +* Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e. All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/242?closed=1) diff --git a/apm-protocol/apm-network/src/main/proto b/apm-protocol/apm-network/src/main/proto index bd1f91f7e1..16c51358eb 160000 --- a/apm-protocol/apm-network/src/main/proto +++ b/apm-protocol/apm-network/src/main/proto @@ -1 +1 @@ -Subproject commit bd1f91f7e1cb4de9d9b5ccb71f36ce6b1c7c97f5 +Subproject commit 16c51358ebcf42629bf4ffdf952253971f20eb25 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index f4a7350214..d251748fe3 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -34,9 +34,7 @@ UTF-8 ${project.build.outputDirectory}/skywalking-agent-version.properties - 32.0.1-jre 2.6.0 - 1.4.1.Final 4.9.10 com.google ${shade.package}.${shade.com.google.source} diff --git a/dist-material/LICENSE b/dist-material/LICENSE index e261fd20da..308c923b88 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -216,12 +216,12 @@ The following components are provided under the Apache License. See project link The text of each license is the standard Apache 2.0 license. raphw (byte-buddy) 1.17.6: http://bytebuddy.net/ , Apache 2.0 - Google: grpc-java 1.68.1: https://github.com/grpc/grpc-java, Apache 2.0 - Google: gson 2.8.9: https://github.com/google/gson , Apache 2.0 - Google: proto-google-common-protos 2.0.1: https://github.com/googleapis/googleapis , Apache 2.0 + Google: grpc-java 1.74.0: https://github.com/grpc/grpc-java, Apache 2.0 + Google: gson 2.13.1: https://github.com/google/gson , Apache 2.0 + Google: proto-google-common-protos 2.59.2: https://github.com/googleapis/googleapis , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 - Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0 - netty 4.1.115: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 + Google: guava 33.4.8: https://github.com/google/guava , Apache 2.0 + netty 4.1.124: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0 ======================================================================== diff --git a/pom.xml b/pom.xml index ebaa942c17..d57887161c 100755 --- a/pom.xml +++ b/pom.xml @@ -87,14 +87,15 @@ 1.17.6 - 1.68.1 - 4.1.115.Final - 2.8.9 + 1.74.0 + 4.1.124.Final + 2.13.1 + 33.4.8-jre 1.7.1 0.6.1 3.25.5 - 1.68.1 - 2.0.48.Final + 1.74.0 + 2.0.70.Final 1.3.2 3.1 3.0 diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml index e6b4b70c4b..87e7266446 100644 --- a/test/e2e/base/base-compose.yml +++ b/test/e2e/base/base-compose.yml @@ -18,7 +18,7 @@ version: '2.1' services: oap: - image: ghcr.io/apache/skywalking/oap:1730f2c84bbd4da999ec2c74d1c26db31d5a0d24 + image: "ghcr.io/apache/skywalking/oap:${SW_OAP_COMMIT}" expose: - 11800 - 12800 @@ -30,6 +30,22 @@ services: interval: 5s timeout: 60s retries: 120 + environment: + SW_STORAGE_BANYANDB_TARGETS: banyandb:17912 + + banyandb: + image: "ghcr.io/apache/skywalking-banyandb:${SW_BANYANDB_COMMIT}" + networks: + - e2e + ports: + - 17912:17912 + - 17913:17913 + command: standalone --stream-root-path /tmp/stream-data --measure-root-path /tmp/measure-data --measure-metadata-cache-wait-duration 1m --stream-metadata-cache-wait-duration 1m + healthcheck: + test: [ "CMD", "sh", "-c", "nc -nz 127.0.0.1 17912" ] + interval: 5s + timeout: 60s + retries: 120 provider: build: diff --git a/test/e2e/script/env b/test/e2e/script/env index e57ec37b21..28709cd6ff 100644 --- a/test/e2e/script/env +++ b/test/e2e/script/env @@ -14,3 +14,5 @@ # limitations under the License. SW_CTL_COMMIT=b90255132f916f53eb90955cc8a6445b03a4bec3 +SW_OAP_COMMIT=dc8740d4757b35374283c4850a9a080e40f0eb79 +SW_BANYANDB_COMMIT=7e5b2d0404e8ad6d5835eee6fe589a2544d0decb \ No newline at end of file From d89ce6d0218324c644d447f4e25ebeb7f4e9172c Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 14:43:50 +0700 Subject: [PATCH 02/12] Fix e2e --- test/e2e/case/grpc/docker-compose.yml | 7 +++++++ test/e2e/case/kafka/docker-compose.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/test/e2e/case/grpc/docker-compose.yml b/test/e2e/case/grpc/docker-compose.yml index 621587bd60..f79160cb8c 100644 --- a/test/e2e/case/grpc/docker-compose.yml +++ b/test/e2e/case/grpc/docker-compose.yml @@ -23,6 +23,13 @@ services: ports: - 12800 + banyandb: + extends: + file: ../../base/base-compose.yml + service: banyandb + ports: + - 17912 + provider: extends: file: ../../base/base-compose.yml diff --git a/test/e2e/case/kafka/docker-compose.yml b/test/e2e/case/kafka/docker-compose.yml index 3760fd44fb..40bb4ba346 100644 --- a/test/e2e/case/kafka/docker-compose.yml +++ b/test/e2e/case/kafka/docker-compose.yml @@ -89,6 +89,13 @@ services: broker-b: condition: service_healthy + banyandb: + extends: + file: ../../base/base-compose.yml + service: banyandb + ports: + - 17912 + kafkaprovider: extends: file: ../../base/base-compose.yml From 4c14941cd61b03711679788b328c66d550ab365b Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 15:09:28 +0700 Subject: [PATCH 03/12] Revert guava upgrade. --- CHANGES.md | 1 - dist-material/LICENSE | 2 +- pom.xml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d0f2ff551b..db7f63caf8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,6 @@ Release Notes. * Bump up gRPC to v1.74.0. * Bump up netty to v4.1.124.Final. * Bump up GSON to v2.13.1. -* Bump up guava to v33.4.8. * Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e. * Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e. diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 308c923b88..9b9d8519b6 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -220,7 +220,7 @@ The text of each license is the standard Apache 2.0 license. Google: gson 2.13.1: https://github.com/google/gson , Apache 2.0 Google: proto-google-common-protos 2.59.2: https://github.com/googleapis/googleapis , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 - Google: guava 33.4.8: https://github.com/google/guava , Apache 2.0 + Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0 netty 4.1.124: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0 diff --git a/pom.xml b/pom.xml index d57887161c..3a8fe46881 100755 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 1.74.0 4.1.124.Final 2.13.1 - 33.4.8-jre + 32.0.1-jre 1.7.1 0.6.1 3.25.5 From 14c3dac11bce01fccfc7a5b8846cca55e8803329 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 15:28:16 +0700 Subject: [PATCH 04/12] Fix e2e case for newer agent. --- CHANGES.md | 1 + dist-material/LICENSE | 2 +- pom.xml | 2 +- test/e2e/base/pom.xml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index db7f63caf8..d0f2ff551b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Release Notes. * Bump up gRPC to v1.74.0. * Bump up netty to v4.1.124.Final. * Bump up GSON to v2.13.1. +* Bump up guava to v33.4.8. * Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e. * Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e. diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 9b9d8519b6..308c923b88 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -220,7 +220,7 @@ The text of each license is the standard Apache 2.0 license. Google: gson 2.13.1: https://github.com/google/gson , Apache 2.0 Google: proto-google-common-protos 2.59.2: https://github.com/googleapis/googleapis , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 - Google: guava 32.0.1: https://github.com/google/guava , Apache 2.0 + Google: guava 33.4.8: https://github.com/google/guava , Apache 2.0 netty 4.1.124: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0 diff --git a/pom.xml b/pom.xml index 3a8fe46881..d57887161c 100755 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 1.74.0 4.1.124.Final 2.13.1 - 32.0.1-jre + 33.4.8-jre 1.7.1 0.6.1 3.25.5 diff --git a/test/e2e/base/pom.xml b/test/e2e/base/pom.xml index 9ae8d9e70e..63b6a687f2 100644 --- a/test/e2e/base/pom.xml +++ b/test/e2e/base/pom.xml @@ -51,7 +51,7 @@ ${java.version} ${java.version} UTF-8 - 2.2.5.RELEASE + 2.7.18 30.1.1-jre 1.18.20 From 2dd4765a208e01b3f97778b20e9aa9af62a7ef24 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 15:50:48 +0700 Subject: [PATCH 05/12] Fix healthy check of oap. --- test/e2e/base/base-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml index 87e7266446..f25eb8ce25 100644 --- a/test/e2e/base/base-compose.yml +++ b/test/e2e/base/base-compose.yml @@ -26,7 +26,7 @@ services: - e2e restart: on-failure healthcheck: - test: ["CMD", "sh", "-c", "nc -zn 127.0.0.1 11800"] + test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/11800" ] interval: 5s timeout: 60s retries: 120 From 6862576d1a302d095d2c2c021815b0d8b8022f3e Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 17:40:10 +0700 Subject: [PATCH 06/12] Fix e2e with latest query protocol and cli. --- .github/workflows/e2e.yaml | 2 +- test/e2e/case/expected/event-list.yml | 4 ++-- test/e2e/case/expected/logs-list.yml | 3 ++- test/e2e/case/expected/metrics-has-value.yml | 12 +++++++---- test/e2e/case/expected/service.yml | 21 ++++++++++++++++++- test/e2e/case/expected/trace-info-detail.yml | 2 ++ test/e2e/case/expected/trace-users-detail.yml | 2 ++ test/e2e/case/expected/traces-list.yml | 20 ++++++++---------- 8 files changed, 46 insertions(+), 20 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 99059989a0..22b423a31d 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -60,6 +60,6 @@ jobs: with: go-version: '1.18' - name: Run E2E Tests - uses: apache/skywalking-infra-e2e@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180 + uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115 with: e2e-file: ${{ matrix.case.path }} diff --git a/test/e2e/case/expected/event-list.yml b/test/e2e/case/expected/event-list.yml index e5a19bfe07..e020869abc 100644 --- a/test/e2e/case/expected/event-list.yml +++ b/test/e2e/case/expected/event-list.yml @@ -30,5 +30,5 @@ events: {{- end }} starttime: {{ gt .starttime 0 }} endtime: {{ gt .endtime 0 }} -{{- end }} -total: {{ gt .total 0 }} \ No newline at end of file + layer: "GENERAL" +{{- end }} \ No newline at end of file diff --git a/test/e2e/case/expected/logs-list.yml b/test/e2e/case/expected/logs-list.yml index 23de580d25..2e02cbd076 100644 --- a/test/e2e/case/expected/logs-list.yml +++ b/test/e2e/case/expected/logs-list.yml @@ -36,4 +36,5 @@ logs: value: {{ notEmpty .value }} {{- end }} {{- end }} -total: {{ gt .total 0 }} +debuggingtrace: null +errorreason: null \ No newline at end of file diff --git a/test/e2e/case/expected/metrics-has-value.yml b/test/e2e/case/expected/metrics-has-value.yml index 27ae47c8ff..baeae56d1c 100644 --- a/test/e2e/case/expected/metrics-has-value.yml +++ b/test/e2e/case/expected/metrics-has-value.yml @@ -13,9 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -{{- contains . }} + {{- contains . }} - key: {{ notEmpty .key }} - value: {{ ge .value 0 }} + value: + value: 0 + isemptyvalue: true - key: {{ notEmpty .key }} - value: {{ ge .value 1 }} -{{- end }} \ No newline at end of file + value: + value: {{ ge .value.value 1 }} + isemptyvalue: false + {{- end }} \ No newline at end of file diff --git a/test/e2e/case/expected/service.yml b/test/e2e/case/expected/service.yml index 129f9d3e8b..e60a3313db 100644 --- a/test/e2e/case/expected/service.yml +++ b/test/e2e/case/expected/service.yml @@ -13,9 +13,28 @@ # See the License for the specific language governing permissions and # limitations under the License. +{{- contains . }} - id: {{ b64enc "e2e-service-provider" }}.1 name: e2e-service-provider group: "" + shortname: e2e-service-provider + normal: true + layers: + - SO11Y_JAVA_AGENT + - GENERAL - id: {{ b64enc "e2e-service-consumer" }}.1 name: e2e-service-consumer - group: "" \ No newline at end of file + group: "" + shortname: e2e-service-consumer + normal: true + layers: + - SO11Y_JAVA_AGENT + - GENERAL +- id: {{ b64enc "localhost:-1" }}.0 + name: localhost:-1 + group: "" + shortname: localhost:-1 + normal: false + layers: + - VIRTUAL_DATABASE +{{- end }} \ No newline at end of file diff --git a/test/e2e/case/expected/trace-info-detail.yml b/test/e2e/case/expected/trace-info-detail.yml index f50b094f53..fad2fdbe70 100644 --- a/test/e2e/case/expected/trace-info-detail.yml +++ b/test/e2e/case/expected/trace-info-detail.yml @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +debuggingtrace: null spans: {{- contains .spans}} - traceid: {{ notEmpty .traceid }} @@ -46,4 +47,5 @@ spans: value: '200' {{- end }} logs: [] + attachedevents: [] {{- end }} diff --git a/test/e2e/case/expected/trace-users-detail.yml b/test/e2e/case/expected/trace-users-detail.yml index 3a1030eea6..ef0d1a39cf 100644 --- a/test/e2e/case/expected/trace-users-detail.yml +++ b/test/e2e/case/expected/trace-users-detail.yml @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +debuggingtrace: null spans: {{- contains .spans}} - traceid: {{ notEmpty .traceid }} @@ -40,4 +41,5 @@ spans: value: '200' {{- end }} logs: [] + attachedevents: [] {{- end }} diff --git a/test/e2e/case/expected/traces-list.yml b/test/e2e/case/expected/traces-list.yml index bed95518e2..8996767757 100644 --- a/test/e2e/case/expected/traces-list.yml +++ b/test/e2e/case/expected/traces-list.yml @@ -13,17 +13,15 @@ # See the License for the specific language governing permissions and # limitations under the License. +debuggingtrace: null traces: {{- contains .traces }} - - segmentid: {{ notEmpty .segmentid }} - endpointnames: - {{- contains .endpointnames }} - - POST:/info - {{- end }} - duration: {{ ge .duration 0 }} - start: "{{ notEmpty .start}}" - iserror: false - traceids: - - {{ (index .traceids 0) }} +- segmentid: {{ notEmpty .segmentid }} + endpointnames: + - POST:/info + duration: {{ ge .duration 0 }} + start: "{{ notEmpty .start}}" + iserror: false + traceids: + - {{ index .traceids 0 }} {{- end }} -total: {{ gt .total 0 }} From c9c210d86091508bf85f160e98d7dd6a9402f885 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 17:52:18 +0700 Subject: [PATCH 07/12] Bump go 1.24 in CI to build infra-e2e --- .github/workflows/e2e.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 22b423a31d..af4cf67805 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -58,7 +58,7 @@ jobs: - name: Setup go uses: actions/setup-go@v2 with: - go-version: '1.18' + go-version: '1.24' - name: Run E2E Tests uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115 with: From 181166fd7bcdb578fa35e25256b95be826574ff3 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 18:34:47 +0700 Subject: [PATCH 08/12] Add e2e logs. --- .github/workflows/e2e.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index af4cf67805..33e8a5bd18 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -63,3 +63,9 @@ jobs: uses: apache/skywalking-infra-e2e@7e4b5b68716fdb7b79b21fa8908f9db497e1b115 with: e2e-file: ${{ matrix.case.path }} + - uses: actions/upload-artifact@v4 + if: ${{ failure() }} + name: Upload Logs + with: + name: test-logs-${{ matrix.test.name }} + path: "${{ env.SW_INFRA_E2E_LOG_DIR }}" From 3ae768a2fb42929f88c6adcdef60ac7c1dd1ad9e Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 21:07:48 +0700 Subject: [PATCH 09/12] Degrade guava. --- .github/workflows/e2e.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 33e8a5bd18..dc595bc85c 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -67,5 +67,5 @@ jobs: if: ${{ failure() }} name: Upload Logs with: - name: test-logs-${{ matrix.test.name }} + name: test-logs-${{ matrix.case.name }} path: "${{ env.SW_INFRA_E2E_LOG_DIR }}" diff --git a/pom.xml b/pom.xml index d57887161c..3a8fe46881 100755 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 1.74.0 4.1.124.Final 2.13.1 - 33.4.8-jre + 32.0.1-jre 1.7.1 0.6.1 3.25.5 From c8966950752bd4e0432bfd64a544d9f044acf588 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 21:24:21 +0700 Subject: [PATCH 10/12] Fix CLI. --- test/e2e/script/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/script/env b/test/e2e/script/env index 28709cd6ff..01f311a60b 100644 --- a/test/e2e/script/env +++ b/test/e2e/script/env @@ -13,6 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -SW_CTL_COMMIT=b90255132f916f53eb90955cc8a6445b03a4bec3 +SW_CTL_COMMIT=77b4c49e89c9c000278f44e62729d534f2ec842e SW_OAP_COMMIT=dc8740d4757b35374283c4850a9a080e40f0eb79 SW_BANYANDB_COMMIT=7e5b2d0404e8ad6d5835eee6fe589a2544d0decb \ No newline at end of file From bf345e1ad306c56801417e4b49d1d2d8c0cb9f50 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 21:42:06 +0700 Subject: [PATCH 11/12] Update cli install. --- test/e2e/script/prepare/install-swctl.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/test/e2e/script/prepare/install-swctl.sh b/test/e2e/script/prepare/install-swctl.sh index 587541f7ee..d435f5ad92 100644 --- a/test/e2e/script/prepare/install-swctl.sh +++ b/test/e2e/script/prepare/install-swctl.sh @@ -22,12 +22,18 @@ BASE_DIR=$1 BIN_DIR=$2 -set -ex - -if ! command -v swctl &> /dev/null; then +install_swctl() { mkdir -p $BASE_DIR/swctl && cd $BASE_DIR/swctl curl -kLo skywalking-cli.tar.gz https://github.com/apache/skywalking-cli/archive/${SW_CTL_COMMIT}.tar.gz tar -zxf skywalking-cli.tar.gz --strip=1 - utype=$(uname | awk '{print tolower($0)}') - make $utype && mv bin/swctl-*-$utype-amd64 $BIN_DIR/swctl -fi \ No newline at end of file + VERSION=${SW_CTL_COMMIT} make install DESTDIR=$BIN_DIR +} + +if ! command -v swctl &> /dev/null; then + echo "swctl is not installed" + install_swctl +elif ! swctl --version | grep -q "${SW_CTL_COMMIT::7}"; then + # Check if the installed version is correct + echo "swctl is already installed, but version is not ${SW_CTL_COMMIT}, will re-install it" + install_swctl +fi From a1ffc35d51409c6e68e34ac96a81fe9fee3dddc0 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 21:56:22 +0700 Subject: [PATCH 12/12] Polish --- CHANGES.md | 2 +- dist-material/LICENSE | 2 +- pom.xml | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d0f2ff551b..8140e6c5d7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ Release Notes. * Bump up gRPC to v1.74.0. * Bump up netty to v4.1.124.Final. * Bump up GSON to v2.13.1. -* Bump up guava to v33.4.8. +* Bump up guava to v32.1.3. * Bump up oap to the 10.3-dev.latest(dc8740d4757b35374283c4850a9a080e40f0eb79) in e2e. * Bump up cli to the 0.15.0-dev.latest(77b4c49e89c9c000278f44e62729d534f2ec842e) in e2e. diff --git a/dist-material/LICENSE b/dist-material/LICENSE index 308c923b88..a7cb7efaeb 100755 --- a/dist-material/LICENSE +++ b/dist-material/LICENSE @@ -220,7 +220,7 @@ The text of each license is the standard Apache 2.0 license. Google: gson 2.13.1: https://github.com/google/gson , Apache 2.0 Google: proto-google-common-protos 2.59.2: https://github.com/googleapis/googleapis , Apache 2.0 Google: jsr305 3.0.2: http://central.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.0/jsr305-3.0.0.pom , Apache 2.0 - Google: guava 33.4.8: https://github.com/google/guava , Apache 2.0 + Google: guava 32.1.3: https://github.com/google/guava , Apache 2.0 netty 4.1.124: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0 async-profiler 3.0: https://github.com/async-profiler/async-profiler/blob/v3.0/LICENSE, Apache 2.0 diff --git a/pom.xml b/pom.xml index 3a8fe46881..abeaac8ced 100755 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,10 @@ 1.74.0 4.1.124.Final 2.13.1 - 32.0.1-jre + + + 32.1.3-jre + 1.7.1 0.6.1 3.25.5