Merge branch 'apache:master' into fix_patch_5127

apache · Dec 4, 2024 · 33d251f · 33d251f
2 parents 19cb55c + dd9698f
commit 33d251f
Show file tree

Hide file tree

Showing 184 changed files with 5,952 additions and 2,244 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -24,7 +24,7 @@ updates:
       interval: "monthly"
     ignore:
       - dependency-name: "*"
-        update-types: [ "version-update:semver-major" ]
+        update-types: [ "version-update:semver-major", "version-update:semver-patch" ]
       - dependency-name: "software.amazon.awssdk:s3"
         update-types: [ "version-update:semver-patch" ]
       - dependency-name: "com.aliyun:dingtalk"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,16 +39,15 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+        with:
+          submodules: true
 
-      - if: matrix.language == 'cpp' || matrix.language == 'csharp'
-        name: Build C
-        run: |
-          git submodule init
-          git submodule update
-          make -C ./eventmesh-sdks/eventmesh-sdk-c  
+      - name: Build C SDK
+        if: matrix.language == 'cpp'
+        run: make -C ./eventmesh-sdks/eventmesh-sdk-c
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v4

diff --git a/.github/workflows/code-scanning.yml b/.github/workflows/code-scanning.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Setup Gradle
         if: matrix.language == 'java'
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           cache-disabled: true
 

diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -38,7 +38,7 @@ jobs:
           java-version: 11
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Check license compatibility
         run: ./gradlew clean checkDeniedLicense
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -42,7 +42,7 @@ jobs:
             It has been 60 days since the last activity on this pull request. I am reaching out here to gently remind you that the Apache EventMesh community values every pull request, and please feel free to get in touch with the reviewers at any time. They are available to assist you in advancing the progress of your pull request and offering the latest feedback.
             
             If you encounter any challenges during development, seeking support within the community is encouraged. We sincerely appreciate your contributions to Apache EventMesh.
-          exempt-issue-labels: 'pinned,discussion,help wanted,WIP,weopen-star,GLCC,summer of code'
+          exempt-issue-labels: 'pinned,discussion,help wanted,WIP,weopen-star,GLCC,GSoC'
           exempt-pr-labels: 'help wanted,dependencies'
           exempt-all-milestones: true # Exempt all issues/PRs with milestones from stale
           operations-per-run: 300
diff --git a/build.gradle b/build.gradle
@@ -46,13 +46,13 @@ buildscript {
         classpath "com.diffplug.spotless:spotless-plugin-gradle:6.13.0"
 
         classpath "org.apache.httpcomponents:httpclient:4.5.14"
-        classpath "commons-io:commons-io:2.16.1"
+        classpath "commons-io:commons-io:2.18.0"
     }
 }
 
 plugins {
     id 'org.cyclonedx.bom' version '1.8.2'
-    id 'com.github.jk1.dependency-license-report' version '2.8'
+    id 'com.github.jk1.dependency-license-report' version '2.9'
 }
 
 allprojects {
@@ -109,7 +109,7 @@ allprojects {
                 url "https://maven.aliyun.com/repository/public"
             }
         }
-        testImplementation "org.junit.jupiter:junit-jupiter:5.10.3"
+        testImplementation "org.junit.jupiter:junit-jupiter:5.11.0"
     }
 
     spotless {
@@ -697,9 +697,9 @@ subprojects {
         sign publishing.publications.mavenJava
     }
 
-    def grpcVersion = '1.65.1'
-    def log4jVersion = '2.23.1'
-    def jacksonVersion = '2.17.2'
+    def grpcVersion = '1.68.0'
+    def log4jVersion = '2.24.1'
+    def jacksonVersion = '2.18.0'
     def dropwizardMetricsVersion = '4.2.26'
     def opentelemetryVersion = '1.36.0'
     def cloudeventsVersion = '3.0.0'
@@ -708,12 +708,12 @@ subprojects {
 
     dependencyManagement {
         dependencies {
-            dependency "org.apache.commons:commons-lang3:3.14.0"
+            dependency "org.apache.commons:commons-lang3:3.17.0"
             dependency "org.apache.commons:commons-collections4:4.4"
             dependency "org.apache.commons:commons-text:1.12.0"
-            dependency "commons-io:commons-io:2.16.1"
+            dependency "commons-io:commons-io:2.18.0"
             dependency "commons-validator:commons-validator:1.9.0"
-            dependency "com.google.guava:guava:33.2.1-jre"
+            dependency "com.google.guava:guava:33.3.0-jre"
 
             dependency "org.slf4j:slf4j-api:2.0.13"
             dependency "org.apache.logging.log4j:log4j-api:${log4jVersion}"
@@ -733,7 +733,7 @@ subprojects {
             dependency "org.asynchttpclient:async-http-client:2.12.3"
             dependency "org.apache.httpcomponents:httpclient:4.5.14"
 
-            dependency "io.netty:netty-all:4.1.111.Final"
+            dependency "io.netty:netty-all:4.1.112.Final"
 
             dependency "io.dropwizard.metrics:metrics-core:${dropwizardMetricsVersion}"
             dependency "io.dropwizard.metrics:metrics-healthchecks:${dropwizardMetricsVersion}"
@@ -757,7 +757,7 @@ subprojects {
             dependency "org.springframework.boot:spring-boot-starter-web:2.7.18"
             dependency "io.openmessaging:registry-server:0.0.1"
 
-            dependency "org.junit.jupiter:junit-jupiter:5.10.3"
+            dependency "org.junit.jupiter:junit-jupiter:5.11.0"
             dependency "org.junit-pioneer:junit-pioneer:1.9.1"
             dependency "org.assertj:assertj-core:3.26.3"
 
@@ -782,7 +782,7 @@ subprojects {
 
             dependency "org.javassist:javassist:3.30.2-GA"
 
-            dependency "com.alibaba.nacos:nacos-client:2.3.3"
+            dependency "com.alibaba.nacos:nacos-client:2.4.1"
 
             dependency 'org.apache.zookeeper:zookeeper:3.9.2'
             dependency "org.apache.curator:curator-client:${curatorVersion}"
@@ -794,15 +794,14 @@ subprojects {
             dependency "javax.annotation:javax.annotation-api:1.3.2"
             dependency "com.alibaba.fastjson2:fastjson2:2.0.52"
 
-            dependency "software.amazon.awssdk:s3:2.26.3"
+            dependency "software.amazon.awssdk:s3:2.29.5"
             dependency "com.github.rholder:guava-retrying:2.0.0"
 
             dependency "com.alibaba:druid-spring-boot-starter:1.2.23"
-            dependency "com.baomidou:mybatis-plus-boot-starter:3.5.5"
-            dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18"
+            dependency "com.baomidou:mybatis-plus-boot-starter:3.5.7"
             dependency "com.mysql:mysql-connector-j:8.4.0"
-            dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.10"
-            dependency "org.locationtech.jts:jts-core:1.19.0"
+            dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18"
+            dependency "org.locationtech.jts:jts-core:1.20.0"
         }
     }
 }
diff --git a/eventmesh-admin-server/bin/start-admin.sh b/eventmesh-admin-server/bin/start-admin.sh
@@ -56,34 +56,34 @@ function extract_java_version {
 #}
 
 function get_pid {
-	local ppid=""
-	if [ -f ${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file ]; then
-		ppid=$(cat ${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file)
-		# If the process does not exist, it indicates that the previous process terminated abnormally.
+        local ppid=""
+        if [ -f ${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file ]; then
+                ppid=$(cat ${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file)
+                # If the process does not exist, it indicates that the previous process terminated abnormally.
     if [ ! -d /proc/$ppid ]; then
       # Remove the residual file.
       rm ${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file
       echo -e "ERROR\t EventMesh process had already terminated unexpectedly before, please check log output."
       ppid=""
     fi
-	else
-		if [[ $OS =~ Msys ]]; then
-			# There is a Bug on Msys that may not be able to kill the identified process
-			ppid=`jps -v | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
-		elif [[ $OS =~ Darwin ]]; then
-			# Known problem: grep Java may not be able to accurately identify Java processes
-			ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | grep -Ev "^root" |awk -F ' ' {'print $2'})
-		else
-		  if [ $DOCKER ]; then
-		    # No need to exclude root user in Docker containers.
-		    ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_ADMIN_HOME | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | awk -F ' ' {'print $2'})
-		  else
+        else
+                if [[ $OS =~ Msys ]]; then
+                        # There is a Bug on Msys that may not be able to kill the identified process
+                        ppid=`jps -v | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | grep java | grep -v grep | awk -F ' ' {'print $1'}`
+                elif [[ $OS =~ Darwin ]]; then
+                        # Known problem: grep Java may not be able to accurately identify Java processes
+                        ppid=$(/bin/ps -o user,pid,command | grep "java" | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | grep -Ev "^root" |awk -F ' ' {'print $2'})
+                else
+                  if [ $DOCKER ]; then
+                    # No need to exclude root user in Docker containers.
+                    ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_ADMIN_HOME | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | awk -F ' ' {'print $2'})
+                  else
         # It is required to identify the process as accurately as possible on Linux.
         ppid=$(ps -C java -o user,pid,command --cols 99999 | grep -w $EVENTMESH_ADMIN_HOME | grep -i "org.apache.eventmesh.admin.server.ExampleAdminServer" | grep -Ev "^root" | awk -F ' ' {'print $2'})
       fi
-		fi
-	fi
-	echo "$ppid";
+                fi
+        fi
+        echo "$ppid";
 }
 
 #===========================================================================================
@@ -136,8 +136,7 @@ export JAVA_HOME
 
 GC_LOG_FILE="${EVENTMESH_ADMIN_LOG_HOME}/eventmesh_admin_gc_%p.log"
 
-#JAVA_OPT="${JAVA_OPT} -server -Xms2048M -Xmx4096M -Xmn2048m -XX:SurvivorRatio=4"
-JAVA_OPT=`cat ${EVENTMESH_ADMIN_HOME}/conf/server.env | grep APP_START_JVM_OPTION::: | awk -F ':::' {'print $2'}`
+JAVA_OPT="${JAVA_OPT} -server -Xms1g -Xmx1g"
 JAVA_OPT="${JAVA_OPT} -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:G1ReservePercent=25 -XX:InitiatingHeapOccupancyPercent=30 -XX:SoftRefLRUPolicyMSPerMB=0 -XX:SurvivorRatio=8 -XX:MaxGCPauseMillis=50"
 JAVA_OPT="${JAVA_OPT} -verbose:gc"
 if [[ "$JAVA_VERSION" == "8" ]]; then
@@ -172,7 +171,7 @@ JAVA_OPT="${JAVA_OPT} -DeventMeshPluginDir=${EVENTMESH_ADMIN_HOME}/plugin"
 #            echo "proxy is running already"
 #            exit 9;
 #        else
-#	    echo "err pid$pid, rm pid.file"
+#           echo "err pid$pid, rm pid.file"
 #            rm pid.file
 #        fi
 #fi
@@ -183,8 +182,8 @@ if [[ $pid == "ERROR"* ]]; then
   exit 9
 fi
 if [ -n "$pid" ]; then
-	echo -e "ERROR\t The server is already running (pid=$pid), there is no need to execute start.sh again."
-	exit 9
+        echo -e "ERROR\t The server is already running (pid=$pid), there is no need to execute start.sh again."
+        exit 9
 fi
 
 make_logs_dir
@@ -193,9 +192,9 @@ echo "Using Java version: $JAVA_VERSION, path: $JAVA" >> ${EVENTMESH_ADMIN_LOG_H
 
 EVENTMESH_ADMIN_MAIN=org.apache.eventmesh.admin.server.ExampleAdminServer
 if [ $DOCKER ]; then
-	$JAVA $JAVA_OPT -classpath ${EVENTMESH_ADMIN_HOME}/conf:${EVENTMESH_ADMIN_HOME}/apps/*:${EVENTMESH_ADMIN_HOME}/lib/* $EVENTMESH_ADMIN_MAIN >> ${EVENTMESH_ADMIN_LOG_HOME}/eventmesh-admin.out
+        $JAVA $JAVA_OPT -classpath ${EVENTMESH_ADMIN_HOME}/conf:${EVENTMESH_ADMIN_HOME}/apps/*:${EVENTMESH_ADMIN_HOME}/lib/* $EVENTMESH_ADMIN_MAIN >> ${EVENTMESH_ADMIN_LOG_HOME}/eventmesh-admin.out
 else
-	$JAVA $JAVA_OPT -classpath ${EVENTMESH_ADMIN_HOME}/conf:${EVENTMESH_ADMIN_HOME}/apps/*:${EVENTMESH_ADMIN_HOME}/lib/* $EVENTMESH_ADMIN_MAIN >> ${EVENTMESH_ADMIN_LOG_HOME}/eventmesh-admin.out 2>&1 &
+        $JAVA $JAVA_OPT -classpath ${EVENTMESH_ADMIN_HOME}/conf:${EVENTMESH_ADMIN_HOME}/apps/*:${EVENTMESH_ADMIN_HOME}/lib/* $EVENTMESH_ADMIN_MAIN >> ${EVENTMESH_ADMIN_LOG_HOME}/eventmesh-admin.out 2>&1 &
 echo $!>${EVENTMESH_ADMIN_HOME}/bin/pid-admin.file
 fi
 exit 0
diff --git a/eventmesh-admin-server/build.gradle b/eventmesh-admin-server/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     implementation project(":eventmesh-common")
     implementation project(":eventmesh-registry:eventmesh-registry-api")
     implementation project(":eventmesh-registry:eventmesh-registry-nacos")
-    implementation project(':eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api')
+    implementation project(":eventmesh-openconnect:eventmesh-openconnect-offsetmgmt-plugin:eventmesh-openconnect-offsetmgmt-api")
     implementation "com.alibaba.nacos:nacos-client"
     implementation("org.springframework.boot:spring-boot-starter-web") {
         exclude group: "org.springframework.boot", module: "spring-boot-starter-tomcat"
@@ -38,6 +38,8 @@ dependencies {
 	implementation "com.alibaba:druid-spring-boot-starter"
     compileOnly 'com.mysql:mysql-connector-j'
 	compileOnly 'org.projectlombok:lombok'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 }
 

diff --git a/eventmesh-admin-server/conf/application.yaml b/eventmesh-admin-server/conf/application.yaml
@@ -26,7 +26,17 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: false
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# http server port
+server:
+  port: 8082
 event-mesh:
   admin-server:
-    service-name: DEFAULT_GROUP@@em_adm_server
-    port: 8081
+    serviceName: DEFAULT_GROUP@@em_adm_server
+    # grpc server port
+    port: 8081
+    adminServerList:
+      R1:
+        - http://localhost:8082
+      R2:
+        - http://localhost:8082
+    region: R1