Merge branch 'upstream/master' into github/master

* upstream/master: (83 commits)
  fix: make install failed on mac (apache#10403)
  feat(zipkin): add variable (apache#10361)
  test(clickhouse-logger): to show that different endpoints will be chosen randomly (apache#8777)
  chore(deps): bump actions/setup-node from 3.8.1 to 4.0.0 (apache#10381)
  ci: fix the grpc test error (apache#10388)
  ci: trigger ci when doc-lint.yml changes (apache#10382)
  docs: fix usage of incorrect default admin api port (apache#10391)
  feat: Add authorization params to openid-connect plugin (apache#10058)
  feat: integrate authz-keycloak with secrets resource (apache#10353)
  fix(traffic-split): post_arg match fails because content-type contains charset (apache#10372)
  fix(consul): worker will not exit while reload or quit (apache#10342)
  chore: update rules for unresponded issues (apache#10354)
  docs: Update APISIX usecases in README (apache#10358)
  test: use http2 to test limit-req plugin (apache#10334)
  test: use http2 to test limit-conn plugin (apache#10332)
  chore: remove stream_proxy.only in config-default.yaml (apache#10337)
  docs: update underscore to hyphen in HTTP headers in `response-rewrite` plugin (apache#10347)
  fix: typos in comments (apache#10330)
  feat: support config stream_route upstream in service (apache#10298)
  fix: keep healthcheck target state when upstream changes (apache#10312)
  ...

.asf.yaml

@@ -53,6 +53,14 @@ github:
           dismiss_stale_reviews: true
           require_code_owner_reviews: true
           required_approving_review_count: 2
+      release/3.6:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 2
+      release/3.5:
+        required_pull_request_reviews:
+          require_code_owner_reviews: true
+          required_approving_review_count: 2
       release/3.4:
         required_pull_request_reviews:
           require_code_owner_reviews: true

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
         test_dir:
           - t/plugin/[a-k]*
           - t/plugin/[l-z]*
-          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/deployment t/discovery t/error_page t/misc
+          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
           - t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library t/xrpc
 
     runs-on: ${{ matrix.platform }}
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -136,7 +136,7 @@ jobs:
           [[ ${{ steps.test_env.outputs.type }} != first ]] && sudo ./ci/init-${{ steps.test_env.outputs.type }}-test-service.sh after
           echo "Linux launch services, done."
       - name: Start Dubbo Backend
-        if: matrix.os_name == 'linux_openresty' && steps.test_env.outputs.type == 'plugin'
+        if: matrix.os_name == 'linux_openresty' && (steps.test_env.outputs.type == 'plugin' || steps.test_env.outputs.type == 'last')
         run: |
           sudo apt install -y maven
           cd t/lib/dubbo-backend

.github/workflows/centos7-ci.yml

@@ -30,12 +30,12 @@ jobs:
         test_dir:
           - t/plugin/[a-k]*
           - t/plugin/[l-z]*
-          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/deployment t/discovery t/error_page t/misc
+          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
           - t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v3.2.0
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

.github/workflows/chaos.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 35
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/cli-master.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/cli.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/close-unresponded.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Prune Stale
       uses: actions/stale@v8
       with:
-        days-before-issue-stale: 14
+        days-before-issue-stale: 60
         days-before-issue-close: 3
         stale-issue-message: >
           Due to lack of the reporter's response this issue has been labeled with "no response".
@@ -35,4 +35,5 @@ jobs:
         # Issues with these labels will never be considered stale.
         only-labels: 'wait for update'
         stale-issue-label: 'no response'
+        exempt-issue-labels: "don't close"
         ascending: true

.github/workflows/code-lint.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@v3.2.0
+    - uses: actions/checkout@v4
     - name: Install
       run: |
         . ./ci/common.sh
@@ -37,7 +37,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
 
       - name: Shellcheck code
         run: |

.github/workflows/doc-lint.yml

@@ -5,11 +5,13 @@ on:
     paths:
       - "docs/**"
       - "**/*.md"
+      - ".github/workflows/doc-lint.yml"
   pull_request:
     branches: [master, "release/**"]
     paths:
       - "docs/**"
       - "**/*.md"
+      - ".github/workflows/doc-lint.yml"
 
 permissions:
   contents: read
@@ -20,9 +22,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v4
       - name: 🚀 Use Node.js
-        uses: actions/setup-node@v3.8.0
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: "12.x"
       - run: npm install -g [email protected]
@@ -47,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Check Chinese copywriting

.github/workflows/fips.yml

@@ -30,7 +30,7 @@ jobs:
           # The RSA and SHA tests are fully covered by jwt-auth and hmac-auth plugin tests, while other plugins only repeat such tests.
           - t/plugin/jwt-auth2.t t/plugin/jwt-auth.t t/plugin/hmac-auth.t
           # all SSL related core tests are covered by below two lists.
-          - t/admin/ssl* t/admin/schema.t t/admin/upstream.t t/config-center-yaml/ssl.t t/core/etcd-mtls.t t/core/config_etcd.t t/deployment/conf_server.t t/misc/patch.t
+          - t/admin/ssl* t/admin/schema.t t/admin/upstream.t t/config-center-yaml/ssl.t t/core/etcd-mtls.t t/core/config_etcd.t t/misc/patch.t
           - t/node/grpc-proxy-unary.t t/node/upstream-keepalive-pool.t t/node/upstream-websocket.t t/node/client-mtls.t t/node/upstream-mtls.t t/pubsub/kafka.t t/router/radixtree-sni2.t t/router/multi-ssl-certs.t t/router/radixtree-sni.t t/stream-node/mtls.t t/stream-node/tls.t t/stream-node/upstream-tls.t t/stream-node/sni.t
           - t/fips
 
@@ -42,7 +42,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/fuzzing-ci.yaml

@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v3.2.0
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

.github/workflows/gm-cron.yaml

@@ -20,7 +20,7 @@ jobs:
         test_dir:
           - t/plugin/[a-k]*
           - t/plugin/[l-z]*
-          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/deployment t/discovery t/error_page t/misc
+          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
           - t/node t/pubsub t/router t/script t/stream-node t/utils t/wasm t/xds-library t/xrpc
 
     runs-on: ${{ matrix.platform }}
@@ -33,7 +33,7 @@ jobs:
     # scripts or a separate action?
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/gm.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/kubernetes-ci.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/license-checker.yml

@@ -30,8 +30,8 @@ jobs:
     timeout-minutes: 3
 
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v4
       - name: Check License Header
-        uses: apache/skywalking-eyes@v0.4.0
+        uses: apache/skywalking-eyes@v0.5.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/link-check.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get script
         run: |

.github/workflows/lint.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code.
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
       - name: spell check
         run: |
           pip install codespell==2.1.0
@@ -30,10 +30,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
 
       - name: Setup Nodejs env
-        uses: actions/setup-node@v3.8.0
+        uses: actions/setup-node@v4.0.0
         with:
           node-version: '12'
 

.github/workflows/performance.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/redhat-ci.yaml

@@ -26,12 +26,12 @@ jobs:
         test_dir:
           - t/plugin/[a-k]*
           - t/plugin/[l-z]*
-          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/deployment t/discovery t/error_page t/misc
+          - t/admin t/cli t/config-center-yaml t/control t/core t/debug t/discovery t/error_page t/misc
           - t/node t/pubsub t/router t/script t/secret t/stream-node t/utils t/wasm t/xds-library
 
     steps:
     - name: Check out code
-      uses: actions/checkout@v3.2.0
+      uses: actions/checkout@v4
       with:
         submodules: recursive
 

.github/workflows/semantic.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repository code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
       - uses: ./.github/actions/action-semantic-pull-request

.github/workflows/tars-ci.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.github/workflows/update-labels.yml

@@ -1,19 +1,21 @@
-name: Update label when user responds
+name: Update labels when user responds in issue and pr
 permissions:
   issues: write
+  pull-requests: write
 
 on:
   issue_comment:
     types: [created]
+  pull_request_review_comment:
+    types: [created]
 
 jobs:
-  run-check:
-    if: ${{ !github.event.issue.pull_request }} # don't execute for PR comments
+  issue_commented:
+    if: github.event.issue && !github.event.issue.pull_request && github.event.comment.user.login == github.event.issue.user.login && contains(github.event.issue.labels.*.name, 'wait for update') && !contains(github.event.issue.labels.*.name, 'user responded')
     runs-on: ubuntu-latest
     steps:
       - name: update labels when user responds
         uses: actions/github-script@v6
-        if: ${{ github.event.comment.user.login == github.event.issue.user.login && contains(github.event.issue.labels.*.name, 'wait for update') && !contains(github.event.issue.labels.*.name, 'user responded') }}
         with:
           script: |
             github.rest.issues.addLabels({
@@ -28,3 +30,33 @@ jobs:
               repo: context.repo.repo,
               name: "wait for update"
             })
+
+  pr_commented:
+    if: github.event.issue && github.event.issue.pull_request && github.event.comment.user.login == github.event.issue.user.login && (contains(github.event.issue.labels.*.name, 'wait for update') || contains(github.event.issue.labels.*.name, 'discuss') || contains(github.event.issue.labels.*.name, 'need test cases')) && !contains(github.event.issue.labels.*.name, 'user responded')
+    runs-on: ubuntu-latest
+    steps:
+      - name: update label when user responds
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["user responded"]
+            })
+
+  pr_review_commented:
+    if: github.event.pull_request && github.event.comment.user.login == github.event.pull_request.user.login && (contains(github.event.pull_request.labels.*.name, 'wait for update') || contains(github.event.pull_request.labels.*.name, 'discuss') || contains(github.event.issue.labels.*.name, 'need test cases')) && !contains(github.event.pull_request.labels.*.name, 'user responded')
+    runs-on: ubuntu-latest
+    steps:
+      - name: update label when user responds
+        uses: actions/github-script@v6
+        with:
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["user responded"]
+            })

.licenserc.yaml

@@ -23,6 +23,8 @@ header:
 
   paths-ignore:
     - '.gitignore'
+    - '.gitattributes'
+    - '.gitmodules'
     - 'LICENSE'
     - 'NOTICE'
     - '**/*.json'
@@ -46,7 +48,11 @@ header:
     # Exclude plugin-specific configuration files
     - 't/plugin/authz-casbin'
     - 't/coredns'
+    - 't/fuzzing/requirements.txt'
+    - 't/perf/requirements.txt'
     - 'autodocs/'
     - 'docs/**/*.md'
+    - '.ignore_words'
+    - '.luacheckrc'
 
   comment: on-failure