merge 1.3.3 to 2.1.8 (#222)

* Feat: Support web gateway config in biz module (#206)

* add name for base metadata

* add versionRange for adaptor

* change regExr to versionRange

* support compositeAdapterConfig

* move arklet logger to koupleless common

* Update koupleless_runtime_unit_test.yml

---------

Co-authored-by: Lipeng <44571204+gaosaroma@users.noreply.github.com>
Co-authored-by: gaosaroma <gaosaroma@gmail.com>

Author: lvjing2

.github/workflows/koupleless_runtime_release_2.1.x.yml

@@ -131,6 +131,7 @@ jobs:
           # 创建一个映射来存储模块名到 JDK 版本的映射
           modules=(${{ join(fromJSON(steps.find-maven-modules.outputs.modules-list), ' ') }})
           modules_in_right_jdk=""
+          modules_in_right_jdk_array=()
           for module in "${modules[@]}"; do
             # 读取模块中的 pom.xml 来确定 JDK 版本
             jdk_version=$(grep -m 1 '<java.version>' $module/pom.xml | sed 's/<[^>]*>//g' | xargs)
@@ -139,15 +140,38 @@ jobs:
 
             if [[ "${jdk_version}" == "17" ]]; then
               modules_in_right_jdk="${modules_in_right_jdk}${module},"
+              modules_in_right_jdk_array+=(${module})
             fi
           done
           
-          if [[ -n ${modules_in_right_jdk} ]]; then
-            modules_in_right_jdk="${modules_in_right_jdk:0:-1}"
-            echo "release for module ${modules_in_right_jdk}"
-            mvn --batch-mode deploy -Prelease -pl ${modules_in_right_jdk} -am -amd -B -U
-            echo "release completed for module ${modules_in_right_jdk}"
+          # 过滤出需要发布的 adapter，过滤条件：adapter 版本与 pom.xml 中的版本一致
+          adapter_release_version=$(grep '<revision>' pom.xml | sed -e 's/.*<revision>\(.*\)<\/revision>.*/\1/' | tr -d ' ')
+          modules_in_release_version=""
+          for module in "${modules_in_right_jdk_array[@]}"; do
+            # 如果没有 adapter-mapping.yaml，则跳过（koupleless-adapter-configs 没有 adapter-mapping.yaml）
+            if [[ ! -f $module/conf/adapter-mapping.yaml ]]; then
+              continue
+            fi
+          
+            # 读取模块中的 adapter-mapping.yaml 来确定 adapter 版本
+            adapter_version=$(grep 'version:' $module/conf/adapter-mapping.yaml | sed -e 's/.*version:\(.*\)/\1/' | tr -d ' ')
+            echo "${module} adapter version: ${adapter_version}"
+          
+            # 如果是目标 adapter 版本，则记录
+            if [[ "${adapter_version}" == "${adapter_release_version}" ]]; then
+              modules_in_release_version="${modules_in_release_version}${module},"
+            fi
+          done
+          
+          if [[ -n ${modules_in_release_version} ]]; then
+            modules_in_release_version="${modules_in_release_version:0:-1}"
+            echo "release for module ${modules_in_release_version}"
+            mvn --batch-mode deploy -Prelease -pl ${modules_in_release_version} -am -amd -B -U
+            echo "release completed for module ${modules_in_release_version}"
           fi
+          
+          # 请在发布 koupleless-adapter-configs 之前，发布 jdk8 和 jdk17 所有的 koupleless-adapters
+          mvn --batch-mode deploy -Prelease -pl koupleless-adapter-configs -am -amd -B -U
         working-directory: adapter/
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

.github/workflows/koupleless_runtime_snapshot_2.1.x.yml

@@ -130,24 +130,46 @@ jobs:
         run: |
           # 创建一个映射来存储模块名到 JDK 版本的映射
           modules=(${{ join(fromJSON(steps.find-maven-modules.outputs.modules-list), ' ') }})
-          modules_in_right_jdk=""
+          modules_in_right_jdk_array=()
           for module in "${modules[@]}"; do
             # 读取模块中的 pom.xml 来确定 JDK 版本
             jdk_version=$(grep -m 1 '<java.version>' $module/pom.xml | sed 's/<[^>]*>//g' | xargs)
             echo "${module} JDK version: ${jdk_version}"
-            # 如果是目标 jdk 版本，则执行 release 操作
 
+            # 如果是目标 jdk 版本，则记录
             if [[ "${jdk_version}" == "17" ]]; then
-              modules_in_right_jdk="${modules_in_right_jdk}${module},"
+              modules_in_right_jdk_array+=(${module})
             fi
           done
           
-          if [[ -n ${modules_in_right_jdk} ]]; then
-            modules_in_right_jdk="${modules_in_right_jdk:0:-1}"
-            echo "release for module ${modules_in_right_jdk}"
-            mvn --batch-mode deploy -Psnapshot -pl ${modules_in_right_jdk} -am -amd -B -U
-            echo "release completed for module ${modules_in_right_jdk}"
+          # 过滤出需要发布的 adapter，过滤条件：adapter 版本与 pom.xml 中的版本一致
+          adapter_snapshot_version=$(grep '<revision>' pom.xml | sed -e 's/.*<revision>\(.*\)<\/revision>.*/\1/' | tr -d ' ')
+          modules_in_snapshot_version=""
+          for module in "${modules_in_right_jdk_array[@]}"; do
+            # 如果没有 adapter-mapping.yaml，则跳过（ koupleless-adapter-configs 没有 adapter-mapping.yaml）
+            if [[ ! -f $module/conf/adapter-mapping.yaml ]]; then
+              continue
+            fi
+          
+            # 读取模块中的 adapter-mapping.yaml 来确定 adapter 版本
+            adapter_version=$(grep 'version:' $module/conf/adapter-mapping.yaml | sed -e 's/.*version:\(.*\)/\1/' | tr -d ' ')
+            echo "${module} adapter version: ${adapter_version}"
+          
+            # 如果是目标 adapter 版本，则记录
+            if [[ "${adapter_version}" == "${adapter_snapshot_version}" ]]; then
+              modules_in_snapshot_version="${modules_in_snapshot_version}${module},"
+            fi
+          done
+          
+          if [[ -n ${modules_in_snapshot_version} ]]; then
+            modules_in_snapshot_version="${modules_in_snapshot_version:0:-1}"
+            echo "release for module ${modules_in_snapshot_version}"
+            mvn --batch-mode deploy -Psnapshot -pl ${modules_in_snapshot_version} -am -amd -B -U
+            echo "release completed for module ${modules_in_snapshot_version}"
           fi
+          
+          # 请在发布 koupleless-adapter-configs 之前，发布 jdk8 和 jdk17 所有的 koupleless-adapters
+          mvn --batch-mode deploy -Psnapshot -pl koupleless-adapter-configs -am -amd -B -U
         working-directory: adapter/
         env:
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

.github/workflows/koupleless_runtime_unit_test.yml

@@ -19,7 +19,7 @@ env:
   WORK_DIR: .
 
 jobs:
-  unit-test-for-jdk8-in-linux:
+  unit-test-for-jdk17-in-linux:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-  unit-test-for-jdk8-in-windows:
+  unit-test-for-jdk17-in-windows:
     runs-on:  windows-latest
     steps:
       - uses: actions/checkout@v3

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/ArkletComponentRegistry.java

@@ -25,8 +25,7 @@
 import com.alipay.sofa.koupleless.arklet.core.api.ApiClient;
 import com.alipay.sofa.koupleless.arklet.core.command.CommandService;
 import com.alipay.sofa.koupleless.arklet.core.command.CommandServiceImpl;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.ops.UnifiedOperationService;
 import com.alipay.sofa.koupleless.arklet.core.ops.UnifiedOperationServiceImpl;
 import com.google.inject.AbstractModule;

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/api/tunnel/http/HeartBeatScheduledMission.java

@@ -19,8 +19,8 @@
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.sofa.ark.spi.model.BizState;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.ArkletRuntimeException;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLogger;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.common.model.BaseMetadata;
 import com.alipay.sofa.koupleless.arklet.core.common.model.BaseStatus;
 import com.alipay.sofa.koupleless.arklet.core.hook.base.BaseMetadataHook;
@@ -86,7 +86,7 @@ private HttpURLConnection getHttpURLConnection() throws IOException {
     public void run() {
         try {
             // send heart beat message
-            BaseMetadata baseMetadata = BaseMetadata.builder()
+            BaseMetadata baseMetadata = BaseMetadata.builder().name(baseMetadataHook.getName())
                 .identity(baseMetadataHook.getIdentity())
                 .clusterName(baseMetadataHook.getClusterName()).build();
             BaseStatus baseStatus = BaseStatus.builder().baseMetadata(baseMetadata)

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/api/tunnel/http/HttpTunnel.java

@@ -30,8 +30,8 @@
 import com.alipay.sofa.koupleless.arklet.core.command.CommandService;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.ArkletInitException;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.ArkletRuntimeException;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLogger;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.hook.base.BaseMetadataHook;
 import com.google.inject.Singleton;
 

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/api/tunnel/http/netty/NettyHttpServer.java

@@ -26,8 +26,8 @@
 import com.alipay.sofa.koupleless.arklet.core.api.model.Response;
 import com.alipay.sofa.koupleless.arklet.core.command.CommandService;
 import com.alipay.sofa.koupleless.arklet.core.command.meta.Output;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLogger;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.util.ExceptionUtils;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.ByteBuf;

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/command/CommandServiceImpl.java

@@ -45,8 +45,8 @@
 import com.alipay.sofa.koupleless.arklet.core.command.record.ProcessRecordHolder;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.ArkletInitException;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.CommandValidationException;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLogger;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.util.AssertUtils;
 import com.google.inject.Singleton;
 

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/command/builtin/handler/InstallBizHandler.java

@@ -31,8 +31,8 @@
 import com.alipay.sofa.koupleless.arklet.core.command.meta.bizops.ArkBizOps;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.ArkletRuntimeException;
 import com.alipay.sofa.koupleless.arklet.core.common.exception.CommandValidationException;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLogger;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.koupleless.arklet.core.common.model.InstallRequest;
 import lombok.Getter;
 import lombok.Setter;

arklet-core/src/main/java/com/alipay/sofa/koupleless/arklet/core/command/record/ProcessRecord.java

@@ -17,8 +17,7 @@
 package com.alipay.sofa.koupleless.arklet.core.command.record;
 
 import com.alipay.sofa.koupleless.arklet.core.command.meta.bizops.ArkBizMeta;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLogger;
-import com.alipay.sofa.koupleless.arklet.core.common.log.ArkletLoggerFactory;
+import com.alipay.sofa.koupleless.common.log.ArkletLoggerFactory;
 import lombok.Getter;
 import lombok.Setter;