Bump up dependencies and e2e (#770)

wu-sheng · web-flow · commit f1da117722e3 · 2025-08-21T00:18:53.000+08:00
* 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 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.
* Support for uploading logs of e2e.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -58,8 +58,14 @@ 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@cf589b4a0b9f8e6f436f78e9cfd94a1ee5494180
+        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.case.name }}
+          path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
diff --git 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 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.
 
 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
@@ -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
@@ -34,9 +34,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <generateGitPropertiesFilename>${project.build.outputDirectory}/skywalking-agent-version.properties</generateGitPropertiesFilename>
-        <guava.version>32.0.1-jre</guava.version>
         <wiremock.version>2.6.0</wiremock.version>
-        <os-maven-plugin.version>1.4.1.Final</os-maven-plugin.version>
         <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
         <shade.com.google.source>com.google</shade.com.google.source>
         <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>
diff --git 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 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
@@ -87,14 +87,18 @@
 
         <!-- core lib dependency -->
         <bytebuddy.version>1.17.6</bytebuddy.version>
-        <grpc.version>1.68.1</grpc.version>
-        <netty.version>4.1.115.Final</netty.version>
-        <gson.version>2.8.9</gson.version>
+        <grpc.version>1.74.0</grpc.version>
+        <netty.version>4.1.124.Final</netty.version>
+        <gson.version>2.13.1</gson.version>
+        <!-- Google ends the JAVA8 support since v33 -->
+        <!-- Can't upgrade Guava until JAVA8 EOL -->
+        <guava.version>32.1.3-jre</guava.version>
+        
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <com.google.protobuf.protoc.version>3.25.5</com.google.protobuf.protoc.version>
-        <protoc-gen-grpc-java.plugin.version>1.68.1</protoc-gen-grpc-java.plugin.version>
-        <netty-tcnative-boringssl-static.version>2.0.48.Final</netty-tcnative-boringssl-static.version>
+        <protoc-gen-grpc-java.plugin.version>1.74.0</protoc-gen-grpc-java.plugin.version>
+        <netty-tcnative-boringssl-static.version>2.0.70.Final</netty-tcnative-boringssl-static.version>
         <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
         <objenesis.version>3.1</objenesis.version>
         <async-profiler.version>3.0</async-profiler.version>
diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml
@@ -18,15 +18,31 @@ version: '2.1'
 services:
 
   oap:
-    image: ghcr.io/apache/skywalking/oap:1730f2c84bbd4da999ec2c74d1c26db31d5a0d24
+    image: "ghcr.io/apache/skywalking/oap:${SW_OAP_COMMIT}"
     expose:
       - 11800
       - 12800
     networks:
       - 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
+    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
diff --git a/test/e2e/base/pom.xml b/test/e2e/base/pom.xml
@@ -51,7 +51,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring.boot.version>2.2.5.RELEASE</spring.boot.version>
+        <spring.boot.version>2.7.18</spring.boot.version>
         <guava.version>30.1.1-jre</guava.version>
         <lombok.version>1.18.20</lombok.version>
     </properties>
diff --git 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 }}
+  layer: "GENERAL"
+{{- end }}
diff --git 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
diff --git 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 }}
+  value:
+    value: {{ ge .value.value 1 }}
+    isemptyvalue: false
+  {{- end }}
diff --git 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: ""
+  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 }}
diff --git 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
@@ -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
@@ -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 }}
diff --git 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
@@ -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
diff --git a/test/e2e/script/env b/test/e2e/script/env
@@ -13,4 +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
diff --git 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
+  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
