From 0ffb17ab024211c7916d828dad438de7768bda91 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 09:37:53 +0700 Subject: [PATCH 1/6] Dependencies Upgrades in compiling and e2e * Bump up root parent apache pom to v30. * 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 | 9 ++++++++- apm-protocol/apm-network/src/main/proto | 2 +- apm-sniffer/apm-agent-core/pom.xml | 2 +- dist-material/LICENSE | 10 +++++----- pom.xml | 12 ++++++------ test/e2e/base/base-compose.yml | 2 +- test/e2e/script/env | 2 +- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index de2ded2867..6371204185 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,14 @@ Release Notes. 9.6.0 ------------------ - +* Bump up root parent apache pom to v30. +* 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..d3565d7db3 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -34,7 +34,7 @@ UTF-8 ${project.build.outputDirectory}/skywalking-agent-version.properties - 32.0.1-jre + 33.4.8-jre 2.6.0 1.4.1.Final 4.9.10 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..f8a705ffe3 100755 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache apache - 21 + 30 @@ -87,14 +87,14 @@ 1.17.6 - 1.68.1 - 4.1.115.Final - 2.8.9 + 1.74.0 + 4.1.124.Final + 2.13.1 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..28aa37fa2e 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:dc8740d4757b35374283c4850a9a080e40f0eb79 expose: - 11800 - 12800 diff --git a/test/e2e/script/env b/test/e2e/script/env index e57ec37b21..5a16f80f0b 100644 --- a/test/e2e/script/env +++ b/test/e2e/script/env @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -SW_CTL_COMMIT=b90255132f916f53eb90955cc8a6445b03a4bec3 +SW_CTL_COMMIT=77b4c49e89c9c000278f44e62729d534f2ec842e From 57fff373f7d37281dacb7fb21be25bef78b30c34 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 09:52:21 +0700 Subject: [PATCH 2/6] Try to fix CI --- pom.xml | 1 + test/e2e/base/base-compose.yml | 16 ++++++++++++++++ test/e2e/script/env | 1 + 3 files changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index f8a705ffe3..eb6165f62a 100755 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,7 @@ UTF-8 8 + 8 6.18 4.12 5.0.0 diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml index 28aa37fa2e..a99800364b 100644 --- a/test/e2e/base/base-compose.yml +++ b/test/e2e/base/base-compose.yml @@ -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 5a16f80f0b..4a89b44008 100644 --- a/test/e2e/script/env +++ b/test/e2e/script/env @@ -14,3 +14,4 @@ # limitations under the License. SW_CTL_COMMIT=77b4c49e89c9c000278f44e62729d534f2ec842e +SW_BANYANDB_COMMIT=7e5b2d0404e8ad6d5835eee6fe589a2544d0decb From 65a776e6ebf5091dafec9f1984265a596580a144 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 10:22:45 +0700 Subject: [PATCH 3/6] Fix --- apm-sniffer/apm-agent-core/pom.xml | 2 -- pom.xml | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index d3565d7db3..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 - 33.4.8-jre 2.6.0 - 1.4.1.Final 4.9.10 com.google ${shade.package}.${shade.com.google.source} diff --git a/pom.xml b/pom.xml index eb6165f62a..ca2d47c98c 100755 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,6 @@ UTF-8 8 - 8 6.18 4.12 5.0.0 @@ -91,6 +90,7 @@ 1.74.0 4.1.124.Final 2.13.1 + 33.4.8-jre 1.7.1 0.6.1 3.25.5 From 7bd0add21534bf1e0239cbe171d1badab38b6df1 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 10:31:09 +0700 Subject: [PATCH 4/6] Add compiler versions for maven. --- pom.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca2d47c98c..3c52ab827a 100755 --- a/pom.xml +++ b/pom.xml @@ -78,12 +78,15 @@ UTF-8 + 1.8 + 1.8 + 8 8 6.18 4.12 5.0.0 2.0.2 - 1.18.30 + 1.18.38 1.17.6 From be88fe2532fde689148a26e7cc55f2d38ff0b505 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 10:41:15 +0700 Subject: [PATCH 5/6] Fix JDK compiling in latest JDK. --- .../bootstrap-plugins/jdk-http-plugin/pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml index e1970ec4da..f456aec6e4 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml @@ -16,7 +16,8 @@ ~ --> - + org.apache.skywalking bootstrap-plugins @@ -40,6 +41,18 @@ maven-deploy-plugin + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 17 + + --add-exports + java.base/sun.net.www=ALL-UNNAMED + + + org.apache.maven.plugins From 12ca0124228f6282bdeaee96762f2f482dc2b005 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Wed, 20 Aug 2025 11:00:05 +0700 Subject: [PATCH 6/6] Lock source and target for spring 6 plugins. --- .../pom.xml | 27 +++++++++++++++++++ .../bootstrap-plugins/jdk-http-plugin/pom.xml | 4 +-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-6.x-webclient-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-6.x-webclient-plugin/pom.xml index 6d50169112..76685d0de6 100644 --- a/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-6.x-webclient-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/spring-plugins/spring-webflux-6.x-webclient-plugin/pom.xml @@ -28,6 +28,33 @@ spring-webflux-6.x-webclient-plugin http://maven.apache.org + + 17 + 17 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${maven.compiler.release} + ${maven.compiler.source} + ${maven.compiler.target} + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + ${maven.compiler.source} + ${project.build.sourceEncoding} + + + + diff --git a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml index f456aec6e4..00f3c0d787 100755 --- a/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml +++ b/apm-sniffer/bootstrap-plugins/jdk-http-plugin/pom.xml @@ -44,9 +44,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 - 17 + ${maven.compiler.source} + ${maven.compiler.target} --add-exports java.base/sun.net.www=ALL-UNNAMED