From 5239ded0c9794399bc187029c60765c66e67f3c2 Mon Sep 17 00:00:00 2001 From: heliang666s <147408835+heliang666s@users.noreply.github.com> Date: Mon, 4 Nov 2024 20:08:46 +0800 Subject: [PATCH 1/9] optimize dubbo-triple-demo (#14858) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 何亮 --- .../apache/dubbo/demo/GreeterServiceImpl.java | 9 ++++--- .../dubbo/demo/GreeterWrapperServiceImpl.java | 25 +++++++++++++++--- .../dubbo/demo/consumer/ApiConsumer.java | 5 ++-- .../demo/consumer/ApiWrapperConsumer.java | 9 ++++--- .../dubbo/demo/provider/ApiProvider.java | 3 +-- .../demo/provider/ApiWrapperProvider.java | 2 +- .../src/main/proto/helloworld.proto | 26 ++++++++++++++++--- 7 files changed, 62 insertions(+), 17 deletions(-) diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterServiceImpl.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterServiceImpl.java index f5919b72a7a..8ec0403c2bc 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterServiceImpl.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterServiceImpl.java @@ -17,6 +17,7 @@ package org.apache.dubbo.demo; import org.apache.dubbo.common.stream.StreamObserver; +import org.apache.dubbo.demo.hello.GreeterService; import org.apache.dubbo.demo.hello.HelloReply; import org.apache.dubbo.demo.hello.HelloRequest; @@ -36,9 +37,11 @@ public HelloReply sayHello(HelloRequest request) { } @Override - public CompletableFuture sayHelloAsync(String name) { - LOGGER.info("Received sayHelloAsync request: {}", name); - return CompletableFuture.supplyAsync(() -> "Hello " + name); + public CompletableFuture sayHelloAsync(HelloRequest request) { + LOGGER.info("Received sayHelloAsync request: {}", request.getName()); + HelloReply.newBuilder().setMessage("Hello " + request.getName()); + return CompletableFuture.supplyAsync(() -> + HelloReply.newBuilder().setMessage("Hello " + request.getName()).build()); } @Override diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterWrapperServiceImpl.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterWrapperServiceImpl.java index 5fb68739f8d..9af186a2197 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterWrapperServiceImpl.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/GreeterWrapperServiceImpl.java @@ -16,14 +16,33 @@ */ package org.apache.dubbo.demo; +import org.apache.dubbo.demo.hello.GreeterWrapperService; +import org.apache.dubbo.demo.hello.HelloReply; +import org.apache.dubbo.demo.hello.HelloRequest; + +import java.util.concurrent.CompletableFuture; + public class GreeterWrapperServiceImpl implements GreeterWrapperService { @Override - public String sayHello(String request) { - StringBuilder responseBuilder = new StringBuilder(request); + public HelloReply sayHello(HelloRequest request) { + StringBuilder responseBuilder = new StringBuilder(request.getName()); for (int i = 0; i < 20; i++) { responseBuilder.append(responseBuilder); } - return responseBuilder.toString(); + return HelloReply.newBuilder().setMessage(responseBuilder.toString()).build(); + } + + @Override + public CompletableFuture sayHelloAsync(HelloRequest request) { + return CompletableFuture.supplyAsync(() -> { + StringBuilder responseBuilder = new StringBuilder(request.getName()); + for (int i = 0; i < 20; i++) { + responseBuilder.append(responseBuilder); + } + return HelloReply.newBuilder() + .setMessage(responseBuilder.toString()) + .build(); + }); } } diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java index 6a78b12f379..0ad003b5ceb 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiConsumer.java @@ -23,7 +23,7 @@ import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.demo.GreeterService; +import org.apache.dubbo.demo.hello.GreeterService; import org.apache.dubbo.demo.hello.HelloReply; import org.apache.dubbo.demo.hello.HelloRequest; import org.apache.dubbo.rpc.Constants; @@ -60,7 +60,8 @@ public static void main(String[] args) throws InterruptedException { System.out.println("sayHello reply: " + reply.getMessage()); System.out.println("Call sayHelloAsync"); - CompletableFuture sayHelloAsync = greeterService.sayHelloAsync("triple"); + CompletableFuture sayHelloAsync = greeterService.sayHelloAsync( + HelloRequest.newBuilder().setName("triple").build()); sayHelloAsync.thenAccept(value -> System.out.println("sayHelloAsync reply: " + value)); StreamObserver responseObserver = new StreamObserver() { diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java index 074dc9d2964..387f5137d1c 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/consumer/ApiWrapperConsumer.java @@ -22,7 +22,9 @@ import org.apache.dubbo.config.ReferenceConfig; import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.demo.GreeterWrapperService; +import org.apache.dubbo.demo.hello.GreeterWrapperService; +import org.apache.dubbo.demo.hello.HelloReply; +import org.apache.dubbo.demo.hello.HelloRequest; import org.apache.dubbo.rpc.Constants; import java.io.IOException; @@ -50,9 +52,10 @@ public static void main(String[] args) throws IOException { final GreeterWrapperService greeterWrapperService = referenceConfig.get(); System.out.println("dubbo referenceConfig started"); long st = System.currentTimeMillis(); - String reply = greeterWrapperService.sayHello("haha"); + HelloReply reply = greeterWrapperService.sayHello( + HelloRequest.newBuilder().setName("haha").build()); // 4MB response - System.out.println("Reply length:" + reply.length() + " cost:" + (System.currentTimeMillis() - st)); + System.out.println("Reply Message:" + reply.getMessage() + " cost:" + (System.currentTimeMillis() - st)); System.in.read(); } } diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java index 91562677023..468319c0883 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiProvider.java @@ -22,14 +22,13 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.demo.GreeterService; import org.apache.dubbo.demo.GreeterServiceImpl; +import org.apache.dubbo.demo.hello.GreeterService; import org.apache.dubbo.rpc.Constants; import java.util.Collections; public class ApiProvider { - public static void main(String[] args) { ServiceConfig serviceConfig = new ServiceConfig<>(); serviceConfig.setInterface(GreeterService.class); diff --git a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java index 27cdf25aff3..faeb49c3763 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java +++ b/dubbo-demo/dubbo-demo-triple/src/main/java/org/apache/dubbo/demo/provider/ApiWrapperProvider.java @@ -22,8 +22,8 @@ import org.apache.dubbo.config.RegistryConfig; import org.apache.dubbo.config.ServiceConfig; import org.apache.dubbo.config.bootstrap.DubboBootstrap; -import org.apache.dubbo.demo.GreeterWrapperService; import org.apache.dubbo.demo.GreeterWrapperServiceImpl; +import org.apache.dubbo.demo.hello.GreeterWrapperService; import org.apache.dubbo.rpc.Constants; import java.io.IOException; diff --git a/dubbo-demo/dubbo-demo-triple/src/main/proto/helloworld.proto b/dubbo-demo/dubbo-demo-triple/src/main/proto/helloworld.proto index f23688817e9..52c3ef756ec 100644 --- a/dubbo-demo/dubbo-demo-triple/src/main/proto/helloworld.proto +++ b/dubbo-demo/dubbo-demo-triple/src/main/proto/helloworld.proto @@ -20,10 +20,30 @@ package helloworld; // The request message containing the user's name. message HelloRequest { - string name = 1; + string name = 1; } -// The response message containing the greetings +// The response message containing the greetings. message HelloReply { - string message = 1; + string message = 1; +} + +// Service definition. +service GreeterService { + // Sends a greeting. + rpc sayHello(HelloRequest) returns (HelloReply); + + /** + * Sends a greeting with server streaming. + */ + rpc sayHelloServerStream(HelloRequest) returns (stream HelloReply); + + /** + * Sends greetings with bi-directional streaming. + */ + rpc sayHelloBiStream(stream HelloRequest) returns (stream HelloReply); +} +service GreeterWrapperService{ + // Sends a greeting. + rpc sayHello(HelloRequest) returns (HelloReply); } From 0ee4e6513e775417a26f44da1e9043f3be2b6afe Mon Sep 17 00:00:00 2001 From: Jermaine Hua Date: Wed, 6 Nov 2024 20:36:21 +0800 Subject: [PATCH 2/9] Upgrade github action version (#14847) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: “JermaineHua” --- .github/workflows/build-and-test-pr.yml | 98 ++++++++++--------- .../build-and-test-scheduled-3.1.yml | 52 +++++----- .../build-and-test-scheduled-3.2.yml | 52 +++++----- .../build-and-test-scheduled-3.3.yml | 52 +++++----- .github/workflows/release-test.yml | 54 +++++----- 5 files changed, 156 insertions(+), 152 deletions(-) diff --git a/.github/workflows/build-and-test-pr.yml b/.github/workflows/build-and-test-pr.yml index 00dfed43dd4..2db3a83be26 100644 --- a/.github/workflows/build-and-test-pr.yml +++ b/.github/workflows/build-and-test-pr.yml @@ -78,13 +78,13 @@ jobs: needs: check-format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Check License" uses: apache/skywalking-eyes@e1a02359b239bd28de3f6d35fdc870250fa513d5 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -107,11 +107,11 @@ jobs: version: ${{ steps.dubbo-version.outputs.version }} steps: - name: "Checkout code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: dubbo - name: "Set up JDK" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -155,7 +155,7 @@ jobs: shopt -s globstar zip ${{ github.workspace }}/class.zip **/target/classes/* -r - name: "Upload class result" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "class-file" path: ${{ github.workspace }}/class.zip @@ -163,7 +163,7 @@ jobs: if: failure() run: zip ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: "checkstyle-file" @@ -221,11 +221,11 @@ jobs: ZOOKEEPER_VERSION: 3.7.2 steps: - name: "Checkout code" - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -256,7 +256,7 @@ jobs: if: failure() run: cat test_errors.log - name: "Upload coverage result" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: coverage-result path: "**/target/site/**/jacoco.xml" @@ -267,14 +267,14 @@ jobs: env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master - name: "Prepare test list" run: bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-list path: test/jobs @@ -289,9 +289,9 @@ jobs: strategy: fail-fast: false matrix: - job_id: [1, 2, 3] + job_id: [1,2,3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -314,12 +314,12 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-list path: test/jobs/ - name: "Set up JDK 8" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 @@ -335,9 +335,9 @@ jobs: - name: "merge jacoco result" run: cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoMerge" -Dexec.args="${{github.workspace}}" - name: "Upload jacoco" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: samples-jacoco-result + name: samples-jacoco-result-${{matrix.job_id}} path: target/jacoco*.exec - name: "Upload test result" if: always() @@ -352,7 +352,7 @@ jobs: env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -370,14 +370,14 @@ jobs: env: JOB_COUNT: 3 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main - name: "Prepare test list" run: bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-list path: test/jobs @@ -392,9 +392,9 @@ jobs: strategy: fail-fast: false matrix: - job_id: [1, 2, 3] + job_id: [1,2,3] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -417,12 +417,12 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: test-list path: test/jobs/ - name: "Set up JDK 8" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 @@ -438,9 +438,9 @@ jobs: - name: "merge jacoco result" run: cd test/dubbo-test-jacoco-merger && mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoMerge" -Dexec.args="${{github.workspace}}" - name: "Upload jacoco" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: jacoco-result + name: jacoco-result-${{matrix.job_id}} path: target/jacoco*.exec - name: "Upload test result" if: always() @@ -455,7 +455,7 @@ jobs: env: JAVA_VER: 8 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -471,56 +471,60 @@ jobs: runs-on: ubuntu-latest needs: [check-format, integration-test-result, samples-test-result, unit-test] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' path: "./dubbo-samples" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' path: "./dubbo-integration-cases" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 - name: "Restore class result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: "class-file" + github-token: ${{ secrets.GITHUB_TOKEN }} path: ${{ github.workspace }} - name: "Unpack class result" run: | cd ${{ github.workspace }}/dubbo unzip -o ${{ github.workspace }}/class.zip - - name: "Restore jacoco exec" - uses: actions/download-artifact@v3 + - name: "Restore samples jacoco exec" + uses: actions/download-artifact@v4 with: - name: samples-jacoco-result + pattern: samples-jacoco-result-* + github-token: ${{ secrets.GITHUB_TOKEN }} path: dubbo-samples/target/ - - name: "Restore integration jacoco exec" - uses: actions/download-artifact@v3 + - name: "Restore integration test jacoco exec" + uses: actions/download-artifact@v4 with: - name: jacoco-result + pattern: jacoco-result-* + github-token: ${{ secrets.GITHUB_TOKEN }} path: dubbo-integration-cases/target/ - - name: "Merge jacoco result" + - name: "Merge samples jacoco result" run: | cd ${{ github.workspace }}/dubbo-samples/test/dubbo-test-jacoco-merger mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoReport" -Dexec.args="${{github.workspace}}/dubbo-samples ${{github.workspace}}/dubbo" - - name: "Merge samples jacoco result" + - name: "Merge integration test jacoco result" run: | cd ${{ github.workspace }}/dubbo-integration-cases/test/dubbo-test-jacoco-merger mvn clean compile exec:java -Dexec.mainClass="org.apache.dubbo.test.JacocoReport" -Dexec.args="${{github.workspace}}/dubbo-integration-cases ${{github.workspace}}/dubbo" - name: "Restore coverage result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: coverage-result + github-token: ${{ secrets.GITHUB_TOKEN }} path: dubbo/ - name: "Upload coverage to Codecov" - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: verbose: true @@ -528,16 +532,16 @@ jobs: needs: check-format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -563,7 +567,7 @@ jobs: - name: "Upload error code inspection result" # always() should not be used here, since we don't need to handle the 'canceled' situation. if: ${{ success() || failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt @@ -572,7 +576,7 @@ jobs: needs: check-format runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: "./dubbo" - name: "Setup GraalVM environment" diff --git a/.github/workflows/build-and-test-scheduled-3.1.yml b/.github/workflows/build-and-test-scheduled-3.1.yml index a96d3663117..4de35db9f45 100644 --- a/.github/workflows/build-and-test-scheduled-3.1.yml +++ b/.github/workflows/build-and-test-scheduled-3.1.yml @@ -24,7 +24,7 @@ jobs: license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.1" - name: Check License @@ -36,11 +36,11 @@ jobs: outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.1" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 @@ -66,7 +66,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -138,7 +138,7 @@ jobs: env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.1" - name: "Set up JDK ${{ matrix.jdk }}" @@ -184,9 +184,9 @@ jobs: DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -228,7 +228,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -236,7 +236,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-list path: test/jobs @@ -254,7 +254,7 @@ jobs: jdk: [ 8, 11 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -275,7 +275,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-list path: test/jobs/ @@ -295,7 +295,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -309,12 +309,12 @@ jobs: matrix: jdk: [ 8, 11 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/ @@ -326,7 +326,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -334,7 +334,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-list path: test/jobs @@ -352,7 +352,7 @@ jobs: jdk: [ 8, 11 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -373,7 +373,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-list path: test/jobs/ @@ -393,7 +393,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -407,12 +407,12 @@ jobs: matrix: jdk: [ 8, 11 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/ @@ -422,19 +422,19 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.1" path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -453,7 +453,7 @@ jobs: - name: "Upload error code inspection result" # always() should not be used here, since we don't need to handle the 'canceled' situation. if: ${{ success() || failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt @@ -461,7 +461,7 @@ jobs: native-image-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.1" path: "./dubbo" diff --git a/.github/workflows/build-and-test-scheduled-3.2.yml b/.github/workflows/build-and-test-scheduled-3.2.yml index 728fd2a2fcd..c58fd0ac8ad 100644 --- a/.github/workflows/build-and-test-scheduled-3.2.yml +++ b/.github/workflows/build-and-test-scheduled-3.2.yml @@ -24,7 +24,7 @@ jobs: license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.2" - name: Check License @@ -36,11 +36,11 @@ jobs: outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.2" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 8 @@ -66,7 +66,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -138,7 +138,7 @@ jobs: env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.2" - name: "Set up JDK ${{ matrix.jdk }}" @@ -184,9 +184,9 @@ jobs: DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -228,7 +228,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -236,7 +236,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-list path: test/jobs @@ -254,7 +254,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -275,7 +275,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-list path: test/jobs/ @@ -295,7 +295,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -309,12 +309,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/ @@ -326,7 +326,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -334,7 +334,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-list path: test/jobs @@ -352,7 +352,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -373,7 +373,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-list path: test/jobs/ @@ -393,7 +393,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -407,12 +407,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/ @@ -422,19 +422,19 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.2" path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -453,7 +453,7 @@ jobs: - name: "Upload error code inspection result" # always() should not be used here, since we don't need to handle the 'canceled' situation. if: ${{ success() || failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt @@ -461,7 +461,7 @@ jobs: native-image-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.2" path: "./dubbo" diff --git a/.github/workflows/build-and-test-scheduled-3.3.yml b/.github/workflows/build-and-test-scheduled-3.3.yml index a0938d0a1cd..7bf6a993bbf 100644 --- a/.github/workflows/build-and-test-scheduled-3.3.yml +++ b/.github/workflows/build-and-test-scheduled-3.3.yml @@ -24,7 +24,7 @@ jobs: license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.3" - name: Check License @@ -36,11 +36,11 @@ jobs: outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.3" path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -66,7 +66,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -138,7 +138,7 @@ jobs: env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.3" - name: "Set up JDK ${{ matrix.jdk }}" @@ -184,9 +184,9 @@ jobs: DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -228,7 +228,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -236,7 +236,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-list path: test/jobs @@ -254,7 +254,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -275,7 +275,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-list path: test/jobs/ @@ -295,7 +295,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -309,12 +309,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/ @@ -326,7 +326,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -334,7 +334,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-list path: test/jobs @@ -352,7 +352,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -373,7 +373,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-list path: test/jobs/ @@ -393,7 +393,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -407,12 +407,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/ @@ -422,19 +422,19 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.3" path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -453,7 +453,7 @@ jobs: - name: "Upload error code inspection result" # always() should not be used here, since we don't need to handle the 'canceled' situation. if: ${{ success() || failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt @@ -461,7 +461,7 @@ jobs: native-image-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: "3.3" path: "./dubbo" diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index 8e79ba80e3d..17c4b46b98f 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -25,7 +25,7 @@ jobs: license: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check License uses: apache/skywalking-eyes@main env: @@ -35,10 +35,10 @@ jobs: outputs: version: ${{ steps.dubbo-version.outputs.version }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: dubbo - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: 21 @@ -64,7 +64,7 @@ jobs: run: 7z a ${{ github.workspace }}/checkstyle.zip *checkstyle* -r - name: "Upload checkstyle file if failure" if: failure() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "checkstyle-file" path: ${{ github.workspace }}/checkstyle.zip @@ -136,9 +136,9 @@ jobs: env: DISABLE_FILE_SYSTEM_TEST: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: ${{ matrix.jdk }} distribution: 'zulu' @@ -181,9 +181,9 @@ jobs: DUBBO_DEFAULT_SERIALIZATION: fastjson2 MAVEN_SUREFIRE_ADD_OPENS: true steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: "Set up JDK ${{ matrix.jdk }}" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'zulu' java-version: ${{ matrix.jdk }} @@ -225,7 +225,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -233,7 +233,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-list path: test/jobs @@ -251,7 +251,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master @@ -272,7 +272,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-list path: test/jobs/ @@ -292,7 +292,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -306,12 +306,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-samples' ref: master - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: samples-test-result-${{matrix.jdk}} path: test/jobs/ @@ -323,7 +323,7 @@ jobs: env: JOB_COUNT: 5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -331,7 +331,7 @@ jobs: run: | bash ./test/scripts/prepare-test.sh - name: "Upload test list" - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-list path: test/jobs @@ -349,7 +349,7 @@ jobs: jdk: [ 8, 11, 17, 21 ] job_id: [1, 2, 3, 4, 5] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main @@ -370,7 +370,7 @@ jobs: ${{ runner.os }}-dubbo-snapshot-${{ github.sha }} ${{ runner.os }}-dubbo-snapshot- - name: "Download test list" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-list path: test/jobs/ @@ -390,7 +390,7 @@ jobs: run: cd test && bash ./run-tests.sh - name: "Upload test result" if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/*-result* @@ -404,12 +404,12 @@ jobs: matrix: jdk: [ 8, 11, 17, 21 ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-integration-cases' ref: main - name: "Download test result" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: integration-test-result-${{matrix.jdk}} path: test/jobs/ @@ -419,18 +419,18 @@ jobs: error-code-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: "./dubbo" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: repository: 'apache/dubbo-test-tools' ref: main path: "./dubbo-test-tools" - name: "Set up JDK 21" - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: 'zulu' @@ -449,7 +449,7 @@ jobs: - name: "Upload error code inspection result" # always() should not be used here, since we don't need to handle the 'canceled' situation. if: ${{ success() || failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: "error-inspection-result" path: ${{ github.workspace }}/dubbo-test-tools/dubbo-error-code-inspector/error-inspection-result.txt @@ -457,7 +457,7 @@ jobs: native-image-inspecting: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: path: "./dubbo" From a5eb2ee0285bfd8b0b85ddf774b8e046a2c4636e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:37:20 +0800 Subject: [PATCH 3/9] Bump byte-buddy_version from 1.15.7 to 1.15.10 (#14856) Bumps `byte-buddy_version` from 1.15.7 to 1.15.10. Updates `net.bytebuddy:byte-buddy` from 1.15.7 to 1.15.10 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.7...byte-buddy-1.15.10) Updates `net.bytebuddy:byte-buddy-agent` from 1.15.7 to 1.15.10 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.7...byte-buddy-1.15.10) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index a9cdc007d06..855e3a5d10e 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -92,7 +92,7 @@ 5.3.39 5.8.15 3.30.2-GA - 1.15.7 + 1.15.10 3.2.10.Final 4.1.114.Final 0.0.28.Final From 007665f61bf2b64de11f298c7c9095929d1309a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:37:53 +0800 Subject: [PATCH 4/9] Bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.1 to 3.5.2 (#14855) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02d93df0521..b592cadc462 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,7 @@ 3.4.2 - 3.5.1 + 3.5.2 3.5.1 3.1.3 3.13.0 From a3a545052b850f4e828f83b47745aa818ae96cf2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 20:38:36 +0800 Subject: [PATCH 5/9] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.10.1 to 3.11.1 (#14854) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.10.1 to 3.11.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.10.1...maven-javadoc-plugin-3.11.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b592cadc462..69dd78eb2f4 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 3.1.3 3.13.0 3.3.1 - 3.10.1 + 3.11.1 9.4.56.v20240826 3.6.0 0.8.12 From 909eb01a54846f4a487d94b9811e8430ca2ff6e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 21:25:23 +0800 Subject: [PATCH 6/9] Bump jackson_version from 2.18.0 to 2.18.1 (#14852) Bumps `jackson_version` from 2.18.0 to 2.18.1. Updates `com.fasterxml.jackson.core:jackson-core` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.18.0...jackson-core-2.18.1) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.0 to 2.18.1 Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.18.0 to 2.18.1 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- dubbo-dependencies-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 855e3a5d10e..7bf5f82a3db 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -175,7 +175,7 @@ 5.4.3 2.0.6 2.11.0 - 2.18.0 + 2.18.1 6.1.26 2.0 1.6.0 From 7c7788d8b7cca3bf819a96a1ca3670802fffaf14 Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Thu, 7 Nov 2024 17:12:23 +0800 Subject: [PATCH 7/9] Add preferred protocol support for application service discovery (#14849) * Support preferred protocol first for application service discovery. * Support preferred protocol first for application service discovery. * update comments * format code --- .../dubbo/common/ProtocolServiceKey.java | 2 +- .../ServiceDiscoveryRegistryDirectory.java | 47 ++++++++++++------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/ProtocolServiceKey.java b/dubbo-common/src/main/java/org/apache/dubbo/common/ProtocolServiceKey.java index e4f5862c028..672ee8184a7 100644 --- a/dubbo-common/src/main/java/org/apache/dubbo/common/ProtocolServiceKey.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/ProtocolServiceKey.java @@ -90,7 +90,7 @@ public static boolean isMatch(ProtocolServiceKey rule, ProtocolServiceKey target } // 4.match protocol - // 4.1. if rule group is *, match all + // 4.1. if rule protocol is *, match all if (!CommonConstants.ANY_VALUE.equals(rule.getProtocol())) { // 4.2. if rule protocol is null, match all if (StringUtils.isNotEmpty(rule.getProtocol())) { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java index 74c35a746d4..d77c72bbc9d 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistryDirectory.java @@ -72,6 +72,7 @@ import static org.apache.dubbo.common.constants.CommonConstants.ENABLED_KEY; import static org.apache.dubbo.common.constants.CommonConstants.INSTANCE_REGISTER_MODE; import static org.apache.dubbo.common.constants.CommonConstants.IS_EXTRA; +import static org.apache.dubbo.common.constants.CommonConstants.PREFERRED_PROTOCOL; import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY; import static org.apache.dubbo.common.constants.CommonConstants.SIDE_KEY; import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_DESTROY_INVOKER; @@ -447,23 +448,12 @@ private Map> toInvokers( } // filter all the service available (version wildcard, group wildcard, protocol wildcard) - int port = instanceAddressURL.getPort(); List matchedProtocolServiceKeys = - instanceAddressURL.getMetadataInfo().getMatchedServiceInfos(consumerProtocolServiceKey).stream() - .filter(serviceInfo -> serviceInfo.getPort() <= 0 || serviceInfo.getPort() == port) - // special filter for extra protocols. - .filter(serviceInfo -> { - if (StringUtils.isNotEmpty( - consumerProtocolServiceKey - .getProtocol())) { // if consumer side protocol is specified, use all - // the protocols we got in hand now directly - return true; - } else { // if consumer side protocol is not specified, remove all extra protocols - return StringUtils.isEmpty(serviceInfo.getParameter(IS_EXTRA)); - } - }) - .map(MetadataInfo.ServiceInfo::getProtocolServiceKey) - .collect(Collectors.toList()); + getMatchedProtocolServiceKeys(instanceAddressURL, true); + if (CollectionUtils.isEmpty(matchedProtocolServiceKeys)) { + // if preferred protocol is not specified, use the default main protocol + matchedProtocolServiceKeys = getMatchedProtocolServiceKeys(instanceAddressURL, false); + } // see org.apache.dubbo.common.ProtocolServiceKey.isSameWith // check if needed to override the consumer url @@ -524,6 +514,31 @@ private Map> toInvokers( return newUrlInvokerMap; } + private List getMatchedProtocolServiceKeys( + InstanceAddressURL instanceAddressURL, boolean needPreferred) { + int port = instanceAddressURL.getPort(); + return instanceAddressURL.getMetadataInfo().getMatchedServiceInfos(consumerProtocolServiceKey).stream() + .filter(serviceInfo -> serviceInfo.getPort() <= 0 || serviceInfo.getPort() == port) + // special filter for extra protocols. + .filter(serviceInfo -> { + if (StringUtils.isNotEmpty( + consumerProtocolServiceKey + .getProtocol())) { // if consumer side protocol is specified, use all + // the protocols we got in hand now directly + return true; + } else { + // if consumer side protocol is not specified, choose the preferred or default main protocol + if (needPreferred) { + return serviceInfo.getProtocol().equals(serviceInfo.getParameter(PREFERRED_PROTOCOL)); + } else { + return StringUtils.isEmpty(serviceInfo.getParameter(IS_EXTRA)); + } + } + }) + .map(MetadataInfo.ServiceInfo::getProtocolServiceKey) + .collect(Collectors.toList()); + } + private boolean urlChanged(Invoker invoker, InstanceAddressURL newURL, ProtocolServiceKey protocolServiceKey) { InstanceAddressURL oldURL = (InstanceAddressURL) invoker.getUrl(); From 218aab1e4a0d7d3fd8ee9680829639f2685b621a Mon Sep 17 00:00:00 2001 From: Ken Liu Date: Thu, 7 Nov 2024 17:12:53 +0800 Subject: [PATCH 8/9] Update initial mapping apps of service discovery MappingListener (#14851) --- .../client/ServiceDiscoveryRegistry.java | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java index b2ded478955..f84255abeb7 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/ServiceDiscoveryRegistry.java @@ -211,8 +211,12 @@ public void doSubscribe(URL url, NotifyListener listener) { mappingLock.lock(); mappingByUrl = serviceNameMapping.getMapping(url); try { - MappingListener mappingListener = new DefaultMappingListener(url, mappingByUrl, listener); + DefaultMappingListener mappingListener = new DefaultMappingListener(url, mappingByUrl, listener); mappingByUrl = serviceNameMapping.getAndListen(this.getUrl(), url, mappingListener); + // update the initial mapping apps we started to listen, to make sure it reflects the real value + // used do subscription before any event. + // it's protected by the mapping lock, so it won't override the event value. + mappingListener.updateInitialApps(mappingByUrl); synchronized (mappingListeners) { mappingListeners .computeIfAbsent(url.getProtocolServiceKey(), (k) -> new ConcurrentHashSet<>()) @@ -399,8 +403,8 @@ public Map getServiceListeners() { private class DefaultMappingListener implements MappingListener { private final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(DefaultMappingListener.class); private final URL url; - private Set oldApps; - private NotifyListener listener; + private final NotifyListener listener; + private volatile Set oldApps; private volatile boolean stopped; public DefaultMappingListener(URL subscribedURL, Set serviceNames, NotifyListener listener) { @@ -424,16 +428,15 @@ public synchronized void onEvent(MappingChangedEvent event) { Set newApps = event.getApps(); Set tempOldApps = oldApps; - if (CollectionUtils.isEmpty(newApps) || CollectionUtils.equals(newApps, tempOldApps)) { - return; - } - - logger.info( - "Mapping of service " + event.getServiceKey() + "changed from " + tempOldApps + " to " + newApps); - Lock mappingLock = serviceNameMapping.getMappingLock(event.getServiceKey()); try { mappingLock.lock(); + if (CollectionUtils.isEmpty(newApps) || CollectionUtils.equals(newApps, tempOldApps)) { + return; + } + logger.info("Mapping of service " + event.getServiceKey() + "changed from " + tempOldApps + " to " + + newApps); + if (CollectionUtils.isEmpty(tempOldApps) && !newApps.isEmpty()) { serviceNameMapping.putCachedMapping(ServiceNameMapping.buildMappingKey(url), newApps); subscribeURLs(url, listener, newApps); @@ -478,6 +481,14 @@ protected NotifyListener getListener() { return listener; } + // writing of oldApps is protected by mapping lock to guarantee sequence consistency. + public void updateInitialApps(Set oldApps) { + if (oldApps != null && !CollectionUtils.equals(oldApps, this.oldApps)) { + this.oldApps = oldApps; + logger.info("Update initial mapping apps from " + this.oldApps + " to " + oldApps); + } + } + @Override public void stop() { stopped = true; From f9a1793061399d7076536726c945b2293407fb76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:20:20 +0800 Subject: [PATCH 9/9] Bump org.apache.maven.plugins:maven-failsafe-plugin from 3.5.1 to 3.5.2 (#14857) Bumps [org.apache.maven.plugins:maven-failsafe-plugin](https://github.com/apache/maven-surefire) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.5.1...surefire-3.5.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-failsafe-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69dd78eb2f4..8a766adf335 100644 --- a/pom.xml +++ b/pom.xml @@ -133,7 +133,7 @@ 3.4.2 3.5.2 - 3.5.1 + 3.5.2 3.1.3 3.13.0 3.3.1