Merge branch 'main' into nacos-support

line · Nov 7, 2024 · 7f323be · 7f323be
2 parents e8ce9c5 + 2ea65f5
commit 7f323be
Show file tree

Hide file tree

Showing 191 changed files with 10,573 additions and 1,983 deletions.
diff --git a/.github/check-workflow-write-permission.sh b/.github/check-workflow-write-permission.sh
diff --git a/.github/workflows/actions_build.yml b/.github/workflows/actions_build.yml
@@ -25,47 +25,32 @@ env:
   DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
-  choose-self-hosted:
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.runner.outputs.runner }}
-
-    steps:
-      - id: runner
-        run: |
-          if [[ "${{ github.event_name }}" == "pull_request" ]]; then
-            echo "runner=self-hosted-unsafe" >> "$GITHUB_OUTPUT"
-          else
-            echo "runner=self-hosted-safe" >> "$GITHUB_OUTPUT"
-          fi
-
   build:
-    needs: [ choose-self-hosted ]
     if: github.repository == 'line/armeria'
     runs-on: ${{ matrix.on }}
     timeout-minutes: 120
     strategy:
       fail-fast: false
       matrix:
-        on: [ "${{ needs.choose-self-hosted.outputs.runner }}", macos-12, windows-latest ]
+        on: [ ubicloud-standard-8, macos-12, windows-latest ]
         java: [ 21 ]
         include:
           - java: 8
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
           - java: 11
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
           - java: 17
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
             leak: true
           - java: 17
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
             min-java: 11
           - java: 17
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
             min-java: 17
             coverage: true
           - java: 21
-            on: ${{ needs.choose-self-hosted.outputs.runner }}
+            on: ubicloud-standard-8
             snapshot: true
             # blockhound makes the build run about 10 minutes slower
             blockhound: true
@@ -104,14 +89,14 @@ jobs:
         shell: bash
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       # Build the shaded JARs first so that shading process doesn't incur memory pressure
       # on other Gradle tasks such as tests.
       - name: Build with Gradle (Shading only)
         run: |
           ./gradlew --no-daemon --stacktrace shadedJar shadedTestJar trimShadedJar \
-          ${{ startsWith(matrix.on, 'self-hosted') && '--max-workers=8' || '--max-workers=2' }} --parallel \
+          ${{ startsWith(matrix.on, 'ubicloud') && '--max-workers=8' || '--max-workers=2' }} --parallel \
           ${{ matrix.coverage && '-Pcoverage' || '' }} \
           -PnoLint \
           -PbuildJdkVersion=${{ env.BUILD_JDK_VERSION }} \
@@ -130,7 +115,7 @@ jobs:
       - name: Build with Gradle
         run: |
           ./gradlew --no-daemon --stacktrace build \
-          ${{ startsWith(matrix.on, 'self-hosted') && '--max-workers=8' || '--max-workers=2' }} --parallel \
+          ${{ startsWith(matrix.on, 'ubicloud') && '--max-workers=8' || '--max-workers=2' }} --parallel \
           ${{ matrix.coverage && '-Pcoverage' || '' }} \
           ${{ matrix.leak && '-Pleak' || '' }} \
           ${{ matrix.blockhound && '-Pblockhound' || '' }} \
@@ -247,16 +232,14 @@ jobs:
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run the linters
         run: |
           ./gradlew --no-daemon --stacktrace --max-workers=8 --parallel lint
 
   site:
     if: github.repository == 'line/armeria'
-    # ubuntu-latest is preferred for site job.
-    # node_modules need complicated dependencies that are difficult to install on self-hosted runners.
     runs-on: ubuntu-latest
     timeout-minutes: 60
     steps:
@@ -275,7 +258,7 @@ jobs:
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build the site
         run: |
@@ -297,7 +280,7 @@ jobs:
           java-version: ${{ env.BUILD_JDK_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Run flaky tests
         run: |

diff --git a/.github/workflows/e2e-chaos-tests.yml b/.github/workflows/e2e-chaos-tests.yml
@@ -44,7 +44,7 @@ jobs:
         shell: bash
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build Chaos test images
         run: |

diff --git a/.github/workflows/gradle-enterprise-postjob.yml b/.github/workflows/gradle-enterprise-postjob.yml
@@ -56,7 +56,7 @@ jobs:
         shell: bash
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - id: upload-build-scans
         name: Upload build scans
@@ -106,35 +106,3 @@ jobs:
         env:
           BUILD_SCANS: ${{ steps.upload-build-scans.outputs.BUILD_SCANS }}
           PR_NUMBER: ${{ steps.get-pr-number.outputs.PR_NUMBER }}
-
-  upload-build-cache:
-    if: github.repository == 'line/armeria'
-    runs-on: ${{ matrix.on }}
-    timeout-minutes: 120
-    strategy:
-      fail-fast: false
-      matrix:
-        on: [ ubuntu-latest, macos-12, windows-latest ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ env.COMMIT_SHA }}
-
-      - id: setup-build-jdk
-        name: Set up build JDK ${{ env.BUILD_JDK_VERSION }}
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: ${{ env.BUILD_JDK_VERSION }}
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-
-      - name: Build with Gradle
-        run: |
-          ./gradlew --no-daemon --stacktrace --build-cache build \
-          --max-workers=2 --parallel \
-          -PbuildJdkVersion=${{ env.BUILD_JDK_VERSION }} \
-          -Pretry=true -PfailOnPassedAfterRetry=false \
-          -Porg.gradle.java.installations.paths=${{ steps.setup-build-jdk.outputs.path }}
-        shell: bash
diff --git a/.github/workflows/public-suffixes.yml b/.github/workflows/public-suffixes.yml
@@ -21,7 +21,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Update public suffix list
         run: |
@@ -37,7 +37,7 @@ jobs:
           git_commit_gpgsign: true
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           # The title of the pull request.
           title: Update public suffix list

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -13,7 +13,7 @@ jobs:
   publish:
     name: Publish final artifacts
     if: github.repository == 'line/armeria'
-    runs-on: self-hosted-safe
+    runs-on: ubicloud-standard-8
     steps:
       - uses: actions/checkout@v4
 
@@ -25,7 +25,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build with Gradle
         run: |

diff --git a/.github/workflows/publish-site.yml b/.github/workflows/publish-site.yml
@@ -28,7 +28,7 @@ jobs:
           java-version: '21'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Build the site
         run: |

diff --git a/.github/workflows/tag-new-release.yml b/.github/workflows/tag-new-release.yml
@@ -57,7 +57,7 @@ jobs:
           java-version: '21'
 
       - name: Set up Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Bump up version
         run: |

diff --git a/README.md b/README.md
@@ -2,13 +2,13 @@ Visit [the official web site](https://armeria.dev/) for more information.
 
 # Armeria
 
-<a href="https://github.com/line/armeria"><img src="https://img.shields.io/github/stars/line/armeria.svg?style=social" /></a>
-<a href="https://twitter.com/armeria_project"><img src="https://img.shields.io/twitter/follow/armeria_project.svg?label=Follow" /></a>
-<a href="https://armeria.dev/s/discord"><img src="https://img.shields.io/badge/chat-on%20Discord-brightgreen.svg?style=social&amp;logo=discord" /></a>
-<a href="https://github.com/line/armeria/contributors"><img src="https://img.shields.io/github/contributors/line/armeria.svg" /></a>
-<a href="https://github.com/line/armeria/pulse"><img src="https://img.shields.io/github/commit-activity/m/line/armeria.svg?label=commits" /></a>
-<a href="https://search.maven.org/search?q=g:com.linecorp.armeria%20AND%20a:armeria"><img src="https://img.shields.io/maven-central/v/com.linecorp.armeria/armeria.svg?label=version" /></a>
-<a href="https://github.com/line/armeria/commits"><img src="https://img.shields.io/github/release-date/line/armeria.svg?label=release" /></a>
+[![GitHub stars](https://img.shields.io/github/stars/line/armeria.svg?style=social)](https://github.com/line/armeria)
+[![Twitter Follow](https://img.shields.io/twitter/follow/armeria_project.svg?label=Follow)](https://twitter.com/armeria_project)
+[![Discord](https://img.shields.io/badge/chat-on%20Discord-brightgreen.svg?style=social&logo=discord)](https://armeria.dev/s/discord)
+[![GitHub contributors](https://img.shields.io/github/contributors/line/armeria.svg)](https://github.com/line/armeria/contributors)
+[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/line/armeria.svg?label=commits)](https://github.com/line/armeria/pulse)
+[![Maven Central](https://img.shields.io/maven-central/v/com.linecorp.armeria/armeria.svg?label=version)](https://search.maven.org/search?q=g:com.linecorp.armeria%20AND%20a:armeria)
+[![GitHub release date](https://img.shields.io/github/release-date/line/armeria.svg?label=release)](https://github.com/line/armeria/commits)
 [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.armeria.dev/scans)
 
 

diff --git a/core/src/main/java/com/linecorp/armeria/client/AbstractClientOptionsBuilder.java b/core/src/main/java/com/linecorp/armeria/client/AbstractClientOptionsBuilder.java
@@ -506,6 +506,18 @@ public AbstractClientOptionsBuilder contextCustomizer(
         return this;
     }
 
+    /**
+     * Sets the {@link ResponseTimeoutMode} which determines when a {@link #responseTimeout(Duration)}}
+     * will start to be scheduled.
+     *
+     * @see ResponseTimeoutMode
+     */
+    @UnstableApi
+    public AbstractClientOptionsBuilder responseTimeoutMode(ResponseTimeoutMode responseTimeoutMode) {
+        return option(ClientOptions.RESPONSE_TIMEOUT_MODE,
+                      requireNonNull(responseTimeoutMode, "responseTimeoutMode"));
+    }
+
     /**
      * Builds {@link ClientOptions} with the given options and the
      * {@linkplain ClientOptions#of() default options}.