Merge branch 'master' of https://github.com/apache/eventmesh

xwm1992 · xwm1992 · commit 66497b36000d · 2025-03-17T17:16:19.000+08:00
# Conflicts:
#	.github/workflows/ci.yml
#	.github/workflows/code-scanning.yml
#	eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java
#	eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java
#	eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/AbstractHttpSinkHandler.java
#	eventmesh-connectors/eventmesh-connector-jdbc/src/main/resources/source-config.yml
#	eventmesh-operator/README.md
#	eventmesh-runtime/scripts/client_manage.sh
#	eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/MessageUtils.java
#	eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java
#	eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
#	eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf
#	eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/EventMeshTestUtils.java
#	settings.gradle
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
       - name: GenerateGrammarSource
         run: ./gradlew clean generateGrammarSource --parallel --daemon --scan
         env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v4
@@ -72,12 +72,12 @@ jobs:
           ./gradlew clean build dist jacocoTestReport --parallel --daemon --scan
           -x spotlessJava -x generateGrammarSource -x generateDistLicense -x checkDeniedLicense
         env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Install plugin
         run: ./gradlew installPlugin --scan
         env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Upload coverage report to codecov.io
         run: bash <(curl -s https://codecov.io/bash) || echo 'Failed to upload coverage report!'
diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
@@ -68,7 +68,7 @@ jobs:
         if: matrix.language == 'java'
         run: ./gradlew clean assemble compileTestJava --parallel --daemon --scan
         env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
       - name: Perform CodeQL analysis
         uses: github/codeql-action/analyze@v3
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/HeartbeatRequestHeader.java
@@ -63,7 +63,7 @@ public class HeartbeatRequestHeader extends Header {
     private String username = "username";
 
     // PASSWD of the requester
-    private String passwd = "user@123";
+    private String passwd = "default";
 
     @Override
     public Map<String, Object> toMap() {
diff --git a/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java b/eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/http/header/client/UnRegRequestHeader.java
@@ -61,7 +61,7 @@ public class UnRegRequestHeader extends Header {
     private String username = "username";
 
     // PASSWD of the requester
-    private String passwd = "user@123";
+    private String passwd = "default";
 
     public static UnRegRequestHeader buildHeader(Map<String, Object> headerParam) {
         HttpConvertsUtils httpConvertsUtils = new HttpConvertsUtils();
diff --git a/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/AbstractHttpSinkHandler.java b/eventmesh-connectors/eventmesh-connector-http/src/main/java/org/apache/eventmesh/connector/http/sink/handler/AbstractHttpSinkHandler.java
@@ -75,10 +75,9 @@ public void handle(ConnectRecord record) {
                 sendRecordToUrl(record, attributes, url);
                 break;
             case BROADCAST:
-                for (URI broadcastUrl : urls) {
-                    attributes.put(MultiHttpRequestContext.NAME, new MultiHttpRequestContext(urls.size()));
-                    sendRecordToUrl(record, attributes, broadcastUrl);
-                }
+                attributes.put(MultiHttpRequestContext.NAME, new MultiHttpRequestContext(urls.size()));
+                // send the record to all URLs
+                urls.forEach(url0 -> sendRecordToUrl(record, attributes, url0));
                 break;
             default:
                 throw new IllegalArgumentException("Unknown delivery strategy: " + deliveryStrategy);
diff --git a/eventmesh-connectors/eventmesh-connector-jdbc/src/main/resources/source-config.yml b/eventmesh-connectors/eventmesh-connector-jdbc/src/main/resources/source-config.yml
@@ -41,7 +41,7 @@ sourceConnectorConfig:
     hostname: localhost
     port: 3306
     user: root
-    password: xxxx
+    password: default
     initialStatements:
     connectTimeout: 10
   mysqlConfig:
diff --git a/eventmesh-operator/README.md b/eventmesh-operator/README.md
@@ -59,7 +59,7 @@ connectors.eventmesh-operator.eventmesh/connector-rocketmq created
 # View the created Service.
 kubectl get service
 NAME                      TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)     AGE
-runtime-cluster-service   ClusterIP   10.109.209.72   <none>        10000/TCP   17s
+runtime-cluster-service   ClusterIP   127.0.0.1   <none>        10000/TCP   17s
 
 # Delete CR
 make delete
diff --git a/eventmesh-runtime/scripts/client_manage.sh b/eventmesh-runtime/scripts/client_manage.sh
@@ -16,12 +16,12 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-i_eg="sh client_manage.sh -i 10.255.34.160 24591"
+i_eg="sh client_manage.sh -i 127.0.0.1 24591"
 s_eg="sh client_manage.sh -s 5319"
-r_eg="sh client_manage.sh -r 9876 10.255.1.143 10000"
+r_eg="sh client_manage.sh -r 9876 127.0.0.1 10000"
 a_eg="sh client_manage.sh -a"
-x_eg="sh client_manage.sh -x 10.255.34.160 24591 10.255.1.143 10000"
-y_eg="sh client_manage.sh -y bq-bypass 10.255.1.143 10000"
+x_eg="sh client_manage.sh -x 127.0.0.1 24591 127.0.0.1 10000"
+y_eg="sh client_manage.sh -y bq-bypass 127.0.0.1 10000"
 
 function printEg() {
         echo "param error."
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/MessageUtils.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/MessageUtils.java
@@ -203,7 +203,7 @@ public static EventMeshMessage generateRRMsg(String topic, int i) {
     public static EventMeshMessage generateAsyncEventMsg(String topic, int i) {
         EventMeshMessage msg = new EventMeshMessage();
         msg.setTopic(topic);
-        msg.getProperties().put("REPLY_TO", "10.36.0.109@ProducerGroup-producerPool-9-access#V1_4_0#CI");
+        msg.getProperties().put("REPLY_TO", "127.0.0.1@ProducerGroup-producerPool-9-access#V1_4_0#CI");
         msg.getProperties().put("TTL", "30000");
         msg.getProperties().put("PROPERTY_MESSAGE_REPLY_TO", "notnull");
         msg.setBody("testAsyncMessage" + i);
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/client/common/TCPClient.java
@@ -58,7 +58,7 @@ public abstract class TCPClient implements Closeable {
 
     protected ConcurrentHashMap<Object, RequestContext> contexts = new ConcurrentHashMap<>();
 
-    protected String host = "10.255.34.120";
+    protected String host = "127.0.0.1";
 
     protected int port = 10000;
 
diff --git a/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java b/eventmesh-runtime/src/test/java/org/apache/eventmesh/runtime/util/RemotingHelperTest.java
@@ -36,10 +36,10 @@ public void testExceptionSimpleDesc() {
 
     @Test
     public void testString2SocketAddress() {
-        String addr = "10.1.1.1:11002";
+        String addr = "127.0.0.1:8080";
         InetSocketAddress address = (InetSocketAddress) RemotingHelper.string2SocketAddress(addr);
         Assertions.assertNotNull(address);
-        Assertions.assertEquals("10.1.1.1:11002", address.getHostString() + ":" + address.getPort());
+        Assertions.assertEquals("127.0.0.1:8080", address.getHostString() + ":" + address.getPort());
     }
 
     @Test
diff --git a/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf b/eventmesh-sdks/eventmesh-sdk-c/configs/rmb.conf
@@ -20,7 +20,7 @@ consumerDcn A00
 orgId 99996
 localIdc A
 wemq_user wemq
-wemq_passwd wemq@123
+wemq_passwd default
 
 #log configure
 logFile sub
@@ -51,9 +51,9 @@ ReqGslSwitch 0
 wemqUseHttpCfg 1
 configCenterIp 10.255.34.57
 configCenterPort 8090
-configCenterAddrMulti 172.22.1.82:8090
+configCenterAddrMulti 127.0.0.1:8090
 #connect directly to access when: wemqUseHttpCfg 0
-wemqProxyIp 172.22.0.51
+wemqProxyIp 127.0.0.1
 wemqProxyPort 10000
 # tlsOnoff：控制与eventmesh的tcp连接是否开启tls
 #   0: 不开启（默认）
diff --git a/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/EventMeshTestUtils.java b/eventmesh-sdks/eventmesh-sdk-java/src/test/java/org/apache/eventmesh/client/tcp/common/EventMeshTestUtils.java
@@ -111,7 +111,7 @@ public static EventMeshMessage generateSyncRRMqMsg() {
     private static EventMeshMessage generateAsyncRRMqMsg() {
         EventMeshMessage mqMsg = new EventMeshMessage();
         mqMsg.setTopic(TOPIC_PRX_SyncSubscribeTest);
-        mqMsg.getProperties().put("REPLY_TO", "10.36.0.109@ProducerGroup-producerPool-9-access#V1_4_0#CI");
+        mqMsg.getProperties().put("REPLY_TO", "127.0.0.1@ProducerGroup-producerPool-9-access#V1_4_0#CI");
         mqMsg.getProperties().put("TTL", "300000");
         mqMsg.getProperties().put("PROPERTY_MESSAGE_REPLY_TO", "notnull");
         mqMsg.setBody("testAsyncRR");
@@ -121,7 +121,7 @@ private static EventMeshMessage generateAsyncRRMqMsg() {
     private static EventMeshMessage generateAsyncEventMqMsg() {
         EventMeshMessage mqMsg = new EventMeshMessage();
         mqMsg.setTopic(TOPIC_PRX_WQ2ClientUniCast);
-        mqMsg.getProperties().put("REPLY_TO", "10.36.0.109@ProducerGroup-producerPool-9-access#V1_4_0#CI");
+        mqMsg.getProperties().put("REPLY_TO", "127.0.0.1@ProducerGroup-producerPool-9-access#V1_4_0#CI");
         mqMsg.getProperties().put("TTL", "30000");
         mqMsg.getProperties().put("PROPERTY_MESSAGE_REPLY_TO", "notnull");
         mqMsg.setBody("testAsyncMessage");
@@ -131,7 +131,7 @@ private static EventMeshMessage generateAsyncEventMqMsg() {
     public static EventMeshMessage generateBroadcastMqMsg() {
         EventMeshMessage mqMsg = new EventMeshMessage();
         mqMsg.setTopic(TOPIC_PRX_WQ2ClientBroadCast);
-        mqMsg.getProperties().put("REPLY_TO", "10.36.0.109@ProducerGroup-producerPool-9-access#V1_4_0#CI");
+        mqMsg.getProperties().put("REPLY_TO", "127.0.0.1@ProducerGroup-producerPool-9-access#V1_4_0#CI");
         mqMsg.getProperties().put("TTL", "30000");
         mqMsg.getProperties().put("PROPERTY_MESSAGE_REPLY_TO", "notnull");
         mqMsg.setBody("testAsyncMessage");
diff --git a/settings.gradle b/settings.gradle
@@ -16,17 +16,18 @@
  */
 
 plugins {
-    id 'com.gradle.develocity' version '3.18.1'
+    id 'com.gradle.develocity' version '3.18.2'
     id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
 }
 
 def isCiServer = System.getenv().containsKey("CI")
 
 develocity {
-    server = "https://ge.apache.org"
+    server = "https://develocity.apache.org"
+    projectId = "eventmesh"
     buildScan {
         uploadInBackground = !isCiServer
-        publishing.onlyIf { false }
+        publishing.onlyIf { it.isAuthenticated() }
         obfuscation {
             ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0"} }
         }
