You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by ch...@apache.org on 2026/09/16 01:49:56 UTC

(eventmesh) 01/01: ci: restore CI (ASF allowlist), build Docker images on develop push with smoke-tested snapshot + latest tags (#5403)

This is an automated email from the ASF dual-hosted git repository.

qqeasonchen pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/eventmesh.git

commit 34b29cb4d7f9ee62e97437ecd964ab4a35fe436a
Author: qqeasonchen <qq...@gmail.com>
AuthorDate: Wed Sep 16 09:49:42 2026 +0800

    ci: restore CI (ASF allowlist), build Docker images on develop push with smoke-tested snapshot + latest tags (#5403)
    
    Every workflow run on this repo had been dying with instant startup_failure
    (0 jobs, no runner) for months. Root cause: the Apache org enforces
    SHA-pinned, allowlisted third-party actions (apache/infrastructure-actions)
    and our workflows referenced non-allowlisted refs.
    
    Workflows (ci, code-scanning, license, architecture-guard, auto-dependabot,
    stale, greetings, docker):
    - Pin every action to its allowlisted commit SHA: actions/checkout v6,
      actions/setup-java v5, github/codeql-action v3, actions/stale v8,
      actions/first-interaction v1.3.0, docker login v4.6.0 / metadata v6.2.0 /
      build-push v7.3.0
    - gradle/actions/setup-gradle -> v5.0.2 (07231958, allowlist keep:true; the
      old v6.1.0 SHA is not listed - v6 has a licensing model change,
      infrastructure-actions#953)
    - dependabot/fetch-metadata -> v3.1.0 (25dd0e34, only listed version)
    
    docker.yml:
    - Triggers: push to develop + workflow_dispatch (release unchanged)
    - Tags: 2.0.0-snapshot + latest on develop push/dispatch so the default
      pull always gets the newest 2.0.0 build; latest + vX.Y.Z on release
    - Connector image leg removed until the apache/eventmesh-connector Docker
      Hub repository exists (its push is denied today)
    
    Runtime image boot fixes (found by the new smoke test, never exercised
    before because CI never ran):
    - conf/log4j2.xml: drop an accidentally duplicated XML-decl + license
      header that broke log4j2 parsing ("No logging configuration")
    - docker/Dockerfile: create data/ and logs/ with eventmesh ownership -
      a bare VOLUME gets a root-owned mountpoint and the uid-10001 process
      died with RocksDB EACCES
    - eventmesh-protocol-cloudevents / -a2a: add gradle.properties
      (pluginType=protocol) so installPlugin ships them in the image -
      publish used to fail with 400 "FrameAdaptor 'cloudevents' not found"
    
    Also: image-smoke-test.yml (workflow_dispatch) pulls the published image
    and runs the quick-start flow against it; fix the pre-existing checkstyle
    violations in 4 runtime IT files that the first real CI run exposed.
    
    Verified: image boots to healthy in 2s (storage=memory, zero broker),
    subscribe 200, publish 202, poll delivers the event.
---
 .github/workflows/architecture-guard.yml           |  6 +-
 .github/workflows/auto-dependabot.yml              |  2 +-
 .github/workflows/ci.yml                           |  8 +--
 .github/workflows/code-scanning.yml                | 10 ++--
 .github/workflows/docker.yml                       | 29 +++++++---
 .github/workflows/greetings.yml                    |  2 +-
 .github/workflows/image-smoke-test.yml             | 66 ++++++++++++++++++++++
 .github/workflows/license.yml                      |  8 +--
 .github/workflows/stale.yml                        |  2 +-
 docker/Dockerfile                                  |  7 ++-
 .../eventmesh-protocol-a2a/gradle.properties       | 31 +---------
 .../gradle.properties                              | 31 +---------
 eventmesh-runtime/conf/log4j2.xml                  | 18 ------
 .../eventmesh/runtime/it/FeatureBrokerHarness.java |  2 +-
 .../runtime/it/RateLimitOverBrokerTest.java        |  2 -
 .../runtime/it/RequestReplyOverBrokerTest.java     |  9 ++-
 .../runtime/it/UnsubscribeOverBrokerTest.java      | 13 ++---
 17 files changed, 127 insertions(+), 119 deletions(-)

diff --git a/.github/workflows/architecture-guard.yml b/.github/workflows/architecture-guard.yml
index 62af10354..3dd898666 100644
--- a/.github/workflows/architecture-guard.yml
+++ b/.github/workflows/architecture-guard.yml
@@ -51,18 +51,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
           submodules: true
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: 'zulu'
           java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 (ASF allowlist keep:true; v6 licensing concern)
 
       - name: Run architecture rules
         run: ./gradlew :eventmesh-architecture-guard:architectureCheck --no-daemon
diff --git a/.github/workflows/auto-dependabot.yml b/.github/workflows/auto-dependabot.yml
index 347bd3782..05f4009e0 100644
--- a/.github/workflows/auto-dependabot.yml
+++ b/.github/workflows/auto-dependabot.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7f991b595..f13d540ec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
         with:
           submodules: true
 
@@ -47,10 +47,10 @@ jobs:
         run: make -C ./eventmesh-sdks/eventmesh-sdk-c
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 (ASF allowlist keep:true; v6 licensing concern)
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: 'zulu'
           java-version: 21
@@ -61,7 +61,7 @@ jobs:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
index e8dbd9d93..3365657f3 100644
--- a/.github/workflows/code-scanning.yml
+++ b/.github/workflows/code-scanning.yml
@@ -40,10 +40,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@faaca9a8f6edddba5725ffe5adefdab6669a2eca # v3
         with:
           # If you wish to specify custom queries, you can do so here or in a config file.
           # By default, queries listed here will override any specified in a config file.
@@ -53,14 +53,14 @@ jobs:
 
       - name: Set up JDK 21
         if: matrix.language == 'java'
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: 'zulu'
           java-version: 21
 
       - name: Setup Gradle
         if: matrix.language == 'java'
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 (ASF allowlist keep:true; v6 licensing concern)
         with:
           cache-disabled: true
 
@@ -71,4 +71,4 @@ jobs:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Perform CodeQL analysis
-        uses: github/codeql-action/analyze@v3
\ No newline at end of file
+        uses: github/codeql-action/analyze@faaca9a8f6edddba5725ffe5adefdab6669a2eca # v3
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f388f1d6e..1f84c9bc3 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -19,6 +19,10 @@ name: Docker
 on:
   release:
     types: [released]
+  push:
+    branches:
+      - develop
+  workflow_dispatch:
 
 jobs:
   docker:
@@ -27,30 +31,39 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # EventMesh unified runtime (traffic HTTP + admin).
+          # EventMesh unified runtime (traffic HTTP + admin). The connector-runtime
+          # image (Dockerfile.connector) is NOT built here yet: the
+          # apache/eventmesh-connector Docker Hub repository does not exist and the
+          # push is denied. Re-add its matrix leg once infra creates the repo.
           - image: apache/eventmesh
             dockerfile: ./docker/Dockerfile
-          # Connector-runtime (separate process, talks HTTP+CloudEvents to the runtime).
-          - image: apache/eventmesh-connector
-            dockerfile: ./docker/Dockerfile.connector
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3
+        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
         with:
           images: ${{ matrix.image }}
+          # develop push / manual dispatch -> moving snapshot tag (version is
+          # 2.0.0-SNAPSHOT on develop) + latest pointing at the same image, so
+          # `docker pull apache/eventmesh` always gets the newest 2.0.0 build;
+          # release -> latest + vX.Y.Z as before.
+          tags: |
+            type=raw,value=2.0.0-snapshot,enable=${{ github.event_name != 'release' }}
+            type=raw,value=latest,enable=${{ github.event_name != 'release' }}
+            type=raw,value=latest,enable=${{ github.event_name == 'release' }}
+            type=semver,pattern={{version}},enable=${{ github.event_name == 'release' }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         with:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
index ea438849d..a53acddc5 100644
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -26,7 +26,7 @@ jobs:
     name: Greeting
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/first-interaction@v1.3.0
+      - uses: actions/first-interaction@34f15e814fe48ac9312ccf29db4e74fa767cbab7 # v1.3.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           issue-message: |
diff --git a/.github/workflows/image-smoke-test.yml b/.github/workflows/image-smoke-test.yml
new file mode 100644
index 000000000..cd9275fb1
--- /dev/null
+++ b/.github/workflows/image-smoke-test.yml
@@ -0,0 +1,66 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# TEMPORARY smoke test: pull the freshly published snapshot image and run the
+# quick-start flow against it (memory storage, no broker). Remove after the
+# 2.0.0 release pipeline stabilizes.
+name: Image Smoke Test
+on:
+  workflow_dispatch:
+
+jobs:
+  smoke:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Pull the snapshot image
+        run: docker pull apache/eventmesh:2.0.0-snapshot
+
+      - name: Run the runtime (memory storage default, no broker)
+        run: |
+          docker run -d --name em-smoke -p 18080:8080 -p 18081:8081 apache/eventmesh:2.0.0-snapshot
+          for i in $(seq 1 60); do
+            if curl -sf http://localhost:18081/admin/health > /dev/null 2>&1; then
+              echo "healthy after ${i}s"; break
+            fi
+            sleep 1
+          done
+          curl -s http://localhost:18081/admin/health
+          echo
+          docker logs em-smoke 2>&1 | tail -20
+
+      - name: Subscribe / publish / poll round trip
+        run: |
+          # subscribe BEFORE publish (same order as the runtime ITs; the pull-loop
+          # covers offset 0 for pre-existing subscribers)
+          code=$(curl -s -o sub.json -w "%{http_code}" -X POST http://localhost:18080/events/subscribe \
+            -H "Content-Type: application/json" \
+            -d '{"clientId":"smoke-client","topic":"smoke","mode":"BROADCAST"}')
+          echo "subscribe http=$code body=$(cat sub.json)"
+          [ "$code" = "200" ] || [ "$code" = "202" ]
+
+          code=$(curl -s -o pub.json -w "%{http_code}" -X POST "http://localhost:18080/events/publish?topic=smoke" \
+            -H "Content-Type: application/cloudevents+json" \
+            -d '{"specversion":"1.0","id":"smoke-1","source":"/smoke","type":"smoke.event","datacontenttype":"application/json","data":{"ok":true}}')
+          echo "publish http=$code body=$(cat pub.json)"
+          [ "$code" = "200" ] || [ "$code" = "202" ]
+
+          curl -s "http://localhost:18080/events/poll?clientId=smoke-client&topics=smoke&timeout=10000" | tee poll.json
+          grep -q "smoke-1" poll.json && echo "POLL: event delivered"
+
+      - name: Dump logs on failure
+        if: failure()
+        run: docker logs em-smoke | tail -80
diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
index a00755db5..95bb2b008 100644
--- a/.github/workflows/license.yml
+++ b/.github/workflows/license.yml
@@ -26,19 +26,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6
 
       - name: Check license header
-        uses: apache/skywalking-eyes@main
+        uses: apache/skywalking-eyes@a196742f472feaffafea537ce5a2a4c3c53a8de4 # main
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5
         with:
           distribution: 'zulu'
           java-version: 21
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
+        uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2 (ASF allowlist keep:true; v6 licensing concern)
 
       - name: Check license compatibility
         run: ./gradlew clean checkDeniedLicense
\ No newline at end of file
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 8b5b16621..2d3cc6f40 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -29,7 +29,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@1160a2240286f5da8ec72b1c0816ce2481aabf84 # v8
         with:
           days-before-issue-stale: 90
           days-before-pr-stale: 60
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 81d61b905..0613b2ab3 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -51,7 +51,12 @@ RUN groupadd --gid 10001 eventmesh \
  && useradd --uid 10001 --gid eventmesh --home-dir /data/app/eventmesh --shell /usr/sbin/nologin eventmesh
 WORKDIR /data/app/eventmesh
 COPY --from=builder --chown=eventmesh:eventmesh /build/dist ./
-RUN chmod +x bin/*.sh
+RUN chmod +x bin/*.sh \
+ # Create the writable state dir up front: a bare VOLUME would be auto-created
+ # by the docker daemon as root, leaving the uid-10001 process unable to open
+ # the RocksDB offset store inside it (EACCES at boot).
+ && mkdir -p /data/app/eventmesh/data /data/app/eventmesh/logs \
+ && chown eventmesh:eventmesh /data/app/eventmesh/data /data/app/eventmesh/logs
 
 # 8080 = traffic HTTP (/events/* CloudEvents + legacy /eventmesh/*).
 # 8081 = independent admin port (UniAdminServer /admin/*, incl. GET /admin/health).
diff --git a/.github/workflows/license.yml b/eventmesh-protocol-plugin/eventmesh-protocol-a2a/gradle.properties
similarity index 55%
copy from .github/workflows/license.yml
copy to eventmesh-protocol-plugin/eventmesh-protocol-a2a/gradle.properties
index a00755db5..82e66b257 100644
--- a/.github/workflows/license.yml
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-a2a/gradle.properties
@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -13,32 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-
-name: 'License Check'
-on: [ pull_request ]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v6
-
-      - name: Check license header
-        uses: apache/skywalking-eyes@main
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'zulu'
-          java-version: 21
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
 
-      - name: Check license compatibility
-        run: ./gradlew clean checkDeniedLicense
\ No newline at end of file
+pluginType=protocol
+pluginName=a2a
diff --git a/.github/workflows/license.yml b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/gradle.properties
similarity index 55%
copy from .github/workflows/license.yml
copy to eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/gradle.properties
index a00755db5..2d0a702d6 100644
--- a/.github/workflows/license.yml
+++ b/eventmesh-protocol-plugin/eventmesh-protocol-cloudevents/gradle.properties
@@ -1,4 +1,3 @@
-#
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
 # this work for additional information regarding copyright ownership.
@@ -13,32 +12,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
-
-name: 'License Check'
-on: [ pull_request ]
-
-permissions:
-  contents: read
-
-jobs:
-  dependency-review:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v6
-
-      - name: Check license header
-        uses: apache/skywalking-eyes@main
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v5
-        with:
-          distribution: 'zulu'
-          java-version: 21
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e #v6.1.0
 
-      - name: Check license compatibility
-        run: ./gradlew clean checkDeniedLicense
\ No newline at end of file
+pluginType=protocol
+pluginName=cloudevents
diff --git a/eventmesh-runtime/conf/log4j2.xml b/eventmesh-runtime/conf/log4j2.xml
index fe3765d7f..eb7c823c3 100644
--- a/eventmesh-runtime/conf/log4j2.xml
+++ b/eventmesh-runtime/conf/log4j2.xml
@@ -16,24 +16,6 @@
   ~ limitations under the License.
   -->
 
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
 <!--
   EventMesh unified runtime logging. Discovered on the classpath (conf/log4j2.xml).
   Console output suits container deployments; add a RollingFile appender for host installs.
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/FeatureBrokerHarness.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/FeatureBrokerHarness.java
index 3c56bbfb5..1c072aae2 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/FeatureBrokerHarness.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/FeatureBrokerHarness.java
@@ -94,11 +94,11 @@ final class FeatureBrokerHarness implements AutoCloseable {
     }
 
     private static FeatureBrokerHarness build(String storageType, String namesrv) {
-        MeshStoragePlugin storage = lookup(storageType);
         Properties props = new Properties();
         props.setProperty("namesrvAddr", namesrv);
         props.setProperty("eventMesh.server.rocketmq.namesrvAddr", namesrv);
         props.setProperty("eventMesh.server.kafka.namesrvAddr", namesrv);
+        MeshStoragePlugin storage = lookup(storageType);
         // BrokerDiscoverer.ensureTopicOnReachableBroker() keys off `it.storage` (the legacy
         // system property used by every other broker IT), so propagate our backend name into
         // that slot before the test method touches it.
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RateLimitOverBrokerTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RateLimitOverBrokerTest.java
index f886f4a2b..e941c87de 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RateLimitOverBrokerTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RateLimitOverBrokerTest.java
@@ -22,8 +22,6 @@ import org.apache.eventmesh.runtime.subscription.DistributionMode;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RequestReplyOverBrokerTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RequestReplyOverBrokerTest.java
index d5942f599..6c4ae51fd 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RequestReplyOverBrokerTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/RequestReplyOverBrokerTest.java
@@ -17,6 +17,9 @@
 
 package org.apache.eventmesh.runtime.it;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.apache.eventmesh.client.cloudevents.CloudEventsClient;
 import org.apache.eventmesh.runtime.admin.UniAdminService;
 import org.apache.eventmesh.runtime.http.UniHttpServer;
@@ -24,16 +27,12 @@ import org.apache.eventmesh.runtime.subscription.DistributionMode;
 
 import java.nio.charset.StandardCharsets;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
 import io.cloudevents.CloudEvent;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 /**
  * Real-broker request-reply end-to-end: responder subscribes via HTTP long-poll, broker-side
  * pull-loop dispatches, requester calls {@code /req} and waits for the reply. Pairs with the
@@ -67,7 +66,7 @@ class RequestReplyOverBrokerTest {
                 fx.runtime().ingress().subscribe(topic, "req-rr-broker", DistributionMode.BROADCAST, null);
 
                 String runtimeUrl = "http://localhost:" + httpPort;
-CloudEventsClient responder = CloudEventsClient.builder()
+                CloudEventsClient responder = CloudEventsClient.builder()
                         .runtimeUrl(runtimeUrl).clientId("rr-responder-" + UUID.randomUUID()).pollIntervalMs(200L).build();
                 try {
                     responder.subscribe(topic, "BROADCAST", event -> {
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/UnsubscribeOverBrokerTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/UnsubscribeOverBrokerTest.java
index 10d444a0c..03bccfaa0 100644
--- a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/UnsubscribeOverBrokerTest.java
+++ b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/it/UnsubscribeOverBrokerTest.java
@@ -32,7 +32,6 @@ import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
-import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
 
 /**
@@ -74,14 +73,14 @@ class UnsubscribeOverBrokerTest {
             // 3. Publish one event to each topic; tag by id prefix so we can route the received events
             //    back to their originating topic on the single polling client.
             long token = System.nanoTime();
-            String aId = "ua-" + token;
-            String bId = "ub-" + token;
+            String firstTag = "ua-" + token;
+            String secondTag = "ub-" + token;
             fx.runtime().ingress().publish(topicA, CloudEventBuilder.v1()
-                .withId(aId).withSource(URI.create("broker://ua"))
+                .withId(firstTag).withSource(URI.create("broker://ua"))
                 .withType("ua").withDataContentType("text/plain")
                 .withData("ua-payload".getBytes(StandardCharsets.UTF_8)).build()).get(10, TimeUnit.SECONDS);
             fx.runtime().ingress().publish(topicB, CloudEventBuilder.v1()
-                .withId(bId).withSource(URI.create("broker://ub"))
+                .withId(secondTag).withSource(URI.create("broker://ub"))
                 .withType("ub").withDataContentType("text/plain")
                 .withData("ub-payload".getBytes(StandardCharsets.UTF_8)).build()).get(10, TimeUnit.SECONDS);
 
@@ -100,10 +99,10 @@ class UnsubscribeOverBrokerTest {
                 }
             }
 
-            if (!receivedIds.contains(bId)) {
+            if (!receivedIds.contains(secondTag)) {
                 throw new AssertionError("topic B event was not delivered: received=" + receivedIds);
             }
-            if (receivedIds.contains(aId)) {
+            if (receivedIds.contains(firstTag)) {
                 throw new AssertionError("topic A event leaked after unsubscribe: received=" + receivedIds);
             }
             if (receivedTypes.contains("ua")) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org