optimize: seata-server remove cms parameters

.github/workflows/publishes.yml

@@ -46,10 +46,10 @@ jobs:
       - name: "Package and Publish-Image-To-DockerHub"
         if: matrix.type == 'image'
         env:
+          IMAGE_NAME: openjdk:17.0.2
           REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
         run: |
-          echo "IMAGE_NAME=openjdk:8u332" >> $GITHUB_ENV;
           if [ "${{github.ref}}" == "refs/heads/snapshot" ]; then
             ./mvnw -T 4C clean package -Pimage               -DskipTests -e -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
           else

.gitignore

@@ -29,11 +29,13 @@ dependency-reduced-pom.xml
 /distribution/bin/
 /distribution/conf/
 /distribution/lib/
+/distribution/ext/
 /distribution/logs/
 /distribution/*/bin/
 /distribution/*/conf/
 /distribution/*/lib/
 /distribution/*/logs/
+/distribution/*/ext/
 /server/*root.*
 /server/.root.*
 /server/sessionStore/

all/pom.xml

@@ -417,8 +417,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
         <dependency>
             <groupId>aopalliance</groupId>

build/pom.xml

@@ -73,8 +73,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- The version of spring-boot for 'spring-boot-dependencies' and 'spring-boot-maven-plugin' -->
-        <spring-boot.version>2.4.13</spring-boot.version>
-        <spring-framework.version>5.3.18</spring-framework.version>
+        <spring-boot.version>2.5.14</spring-boot.version>
+        <spring-framework.version>5.3.22</spring-framework.version>
 
         <!-- Maven plugin versions -->
         <!-- Build -->

config/seata-config-core/pom.xml

@@ -41,8 +41,8 @@
             <artifactId>snakeyaml</artifactId>
         </dependency>
         <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
+            <groupId>net.bytebuddy</groupId>
+            <artifactId>byte-buddy</artifactId>
         </dependency>
     </dependencies>
 

config/seata-config-core/src/main/java/io/seata/config/ConfigurationCache.java

@@ -20,12 +20,12 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-
 import io.seata.common.util.CollectionUtils;
 import io.seata.common.util.DurationUtil;
 import io.seata.common.util.StringUtils;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
+import net.bytebuddy.ByteBuddy;
+import net.bytebuddy.implementation.InvocationHandlerAdapter;
+import net.bytebuddy.matcher.ElementMatchers;
 
 /**
  * @author funkye
@@ -36,7 +36,7 @@ public class ConfigurationCache implements ConfigurationChangeListener {
 
     private static final String METHOD_LATEST_CONFIG = METHOD_PREFIX + "LatestConfig";
 
-    private static final ConcurrentHashMap<String, ObjectWrapper> CONFIG_CACHE = new ConcurrentHashMap<>();
+    private static final Map<String, ObjectWrapper> CONFIG_CACHE = new ConcurrentHashMap<>();
 
     private Map<String, HashSet<ConfigurationChangeListener>> configListenersMap = new HashMap<>();
 
@@ -100,11 +100,16 @@ public void onChangeEvent(ConfigurationChangeEvent event) {
         }
     }
 
-    public Configuration proxy(Configuration originalConfiguration) {
-        return (Configuration)Enhancer.create(Configuration.class,
-            (MethodInterceptor)(proxy, method, args, methodProxy) -> {
-                if (method.getName().startsWith(METHOD_PREFIX)
-                        && !method.getName().equalsIgnoreCase(METHOD_LATEST_CONFIG)) {
+    public Configuration proxy(Configuration originalConfiguration) throws Exception {
+        Class<?> clazz;
+        if (originalConfiguration.getClass().getName().contains("$$")) {
+            clazz = originalConfiguration.getClass().getSuperclass();
+        } else {
+            clazz = originalConfiguration.getClass();
+        }
+        return (Configuration)new ByteBuddy().subclass(clazz).method(ElementMatchers.nameStartsWith(METHOD_PREFIX))
+            .intercept(InvocationHandlerAdapter.of((proxy, method, args) -> {
+                if (!method.getName().equalsIgnoreCase(METHOD_LATEST_CONFIG)) {
                     String rawDataId = (String)args[0];
                     ObjectWrapper wrapper = CONFIG_CACHE.get(rawDataId);
                     ObjectWrapper.ConfigType type = ObjectWrapper.getTypeByName(method.getName().substring(METHOD_PREFIX.length()));
@@ -123,7 +128,7 @@ public Configuration proxy(Configuration originalConfiguration) {
                     return wrapper == null ? null : wrapper.convertData(type);
                 }
                 return method.invoke(originalConfiguration, args);
-            });
+            })).make().load(this.getClass().getClassLoader()).getLoaded().getDeclaredConstructor().newInstance();
     }
 
     private static class ConfigurationCacheInstance {
@@ -244,7 +249,8 @@ public String getCode() {
             }
 
             public static ConfigType fromCode(String code) {
-                return CODE_TO_VALUE.get(code.toUpperCase());
+                ConfigType configType = CODE_TO_VALUE.get(code.toUpperCase());
+                return configType == null ? ConfigType.STRING : configType;
             }
 
             public static ConfigType fromName(String name) {

config/seata-config-core/src/test/java/io/seata/config/FileConfigurationTest.java

@@ -16,6 +16,7 @@
 package io.seata.config;
 
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +47,7 @@ void addConfigListener() throws InterruptedException {
             countDownLatch.countDown();
         });
         System.setProperty("service.disableGlobalTransaction", String.valueOf(!value));
-        countDownLatch.await();
+        countDownLatch.await(5, TimeUnit.SECONDS);
         System.setProperty("file.listener.enabled", "false");
         System.setProperty("service.disableGlobalTransaction", String.valueOf(value));
         Thread.sleep(2000);

dependencies/pom.xml

@@ -35,6 +35,7 @@
         <dubbo.version>2.7.4</dubbo.version>
         <brpc.version>2.5.9</brpc.version>
         <hsf.version>1.8.3</hsf.version>
+        <bytebuddy.version>1.12.13</bytebuddy.version>
         <dubbo.alibaba.version>2.6.5</dubbo.alibaba.version>
         <sofa.rpc.version>5.5.3</sofa.rpc.version>
         <fastjson.version>1.2.83</fastjson.version>
@@ -48,7 +49,7 @@
         <apache-zookeeper.version>3.5.9</apache-zookeeper.version>
         <curator-test.version>2.9.1</curator-test.version>
         <spring-context-support.version>1.0.2</spring-context-support.version>
-        <apollo-client.version>1.6.0</apollo-client.version>
+        <apollo-client.version>2.0.1</apollo-client.version>
         <mock-jedis.version>0.1.16</mock-jedis.version>
         <eureka-clients.version>1.10.17</eureka-clients.version>
         <consul-clients.version>1.4.2</consul-clients.version>
@@ -247,9 +248,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>cglib</groupId>
-                <artifactId>cglib</artifactId>
-                <version>${cglib.version}</version>
+                <groupId>net.bytebuddy</groupId>
+                <artifactId>byte-buddy</artifactId>
+                <version>${bytebuddy.version}</version>
             </dependency>
             <dependency>
                 <groupId>aopalliance</groupId>

distribution/Dockerfile

@@ -9,7 +9,7 @@
 # 1. docker run --name=seata-server -d seata-server:1.6.0-dev
 #
 # https://hub.docker.com/orgs/seataio
-FROM openjdk:8u332
+FROM openjdk:17.0.2
 
 # set label
 LABEL maintainer="Seata <seata.io>"
@@ -26,4 +26,5 @@ ADD LICENSE /seata-server/LICENSE
 
 # set extra environment
 ENV LOADER_PATH="/seata-server/lib"
+ENV JVM_GC="-XX:+UseZGC"
 CMD ["bash","-c","/seata-server/bin/seata-server.sh && tail -f /dev/null"]

distribution/bin/seata-server.bat

@@ -93,7 +93,7 @@ if "%SKYWALKING_ENABLE%"=="true" (
   echo "apm-skywalking not enabled"
 )
 
-%JAVACMD% %JAVA_OPTS% %SKYWALKING_OPTS% -server -Dloader.path=../lib -Xmx2048m -Xms2048m -Xmn1024m -Xss512k -XX:SurvivorRatio=10 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:MaxDirectMemorySize=1024m -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%BASEDIR%"/logs/java_heapdump.hprof -XX:+DisableExplicitGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75 -Xloggc:"%BASEDIR%"/logs/seata_gc.log -verbose:gc -Dio.netty.leakDetectionLevel=advanced -classpath %CLASSPATH% -Dapp.name="seata-server" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" -Dspring.config.location="%BASEDIR%"/conf/application.yml -Dlogging.config="%BASEDIR%"/conf/logback-spring.xml -jar "%BASEDIR%"/target/seata-server.jar %CMD_LINE_ARGS%
+%JAVACMD% %JAVA_OPTS% %SKYWALKING_OPTS% -server -Dloader.path=../lib -Xmx2048m -Xms2048m -Xmn1024m -Xss512k -XX:SurvivorRatio=10 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:MaxDirectMemorySize=1024m -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath="%BASEDIR%"/logs/java_heapdump.hprof -XX:+DisableExplicitGC -Xloggc:"%BASEDIR%"/logs/seata_gc.log -verbose:gc -Dio.netty.leakDetectionLevel=advanced -classpath %CLASSPATH% -Dapp.name="seata-server" -Dapp.repo="%REPO%" -Dapp.home="%BASEDIR%" -Dbasedir="%BASEDIR%" -Dspring.config.location="%BASEDIR%"/conf/application.yml -Dlogging.config="%BASEDIR%"/conf/logback-spring.xml -jar "%BASEDIR%"/target/seata-server.jar %CMD_LINE_ARGS%
 if %ERRORLEVEL% NEQ 0 goto error
 goto end
 

distribution/bin/seata-server.sh

@@ -123,16 +123,22 @@ JVM_XMX=$JVM_XMX
 JVM_XMS=$JVM_XMS
 JVM_XMN=$JVM_XMN
 JVM_XSS=$JVM_XSS
+JVM_GC=$JVM_GC
 JVM_MetaspaceSize=$JVM_MetaspaceSize
 JVM_MaxMetaspaceSize=$JVM_MaxMetaspaceSize
 JVM_MaxDirectMemorySize=$JVM_MaxDirectMemorySize
 LOADER_PATH=$LOADER_PATH
-JAVA_OPT="${JAVA_OPT} -server -Dloader.path=${LOADER_PATH:="../lib"} -Xmx${JVM_XMX:="2048m"} -Xms${JVM_XMS:="2048m"} -Xmn${JVM_XMN:="1024m"} -Xss${JVM_XSS:="512k"} -XX:SurvivorRatio=10 -XX:MetaspaceSize=${JVM_MetaspaceSize:="128m"} -XX:MaxMetaspaceSize=${JVM_MaxMetaspaceSize:="256m"} -XX:MaxDirectMemorySize=${JVM_MaxDirectMemorySize:=1024m} -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy"
-JAVA_OPT="${JAVA_OPT} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASEDIR}/logs/java_heapdump.hprof -XX:+DisableExplicitGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75"
+JAVA_OPT="${JAVA_OPT} -server -Dloader.path=${LOADER_PATH:="../lib"} ${JVM_GC:="-XX:+UseG1GC"} -Xmx${JVM_XMX:="2048m"} -Xms${JVM_XMS:="2048m"} -Xmn${JVM_XMN:="1024m"} -Xss${JVM_XSS:="512k"} -XX:SurvivorRatio=10 -XX:MetaspaceSize=${JVM_MetaspaceSize:="128m"} -XX:MaxMetaspaceSize=${JVM_MaxMetaspaceSize:="256m"} -XX:MaxDirectMemorySize=${JVM_MaxDirectMemorySize:=1024m} -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy"
+JAVA_OPT="${JAVA_OPT} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${BASEDIR}/logs/java_heapdump.hprof -XX:+DisableExplicitGC"
 
 JAVA_MAJOR_VERSION=$($JAVACMD -version 2>&1 | sed '1!d' | sed -e 's/"//g' | awk '{print $3}' | awk -F '.' '{print $2}')
+if [[ "$JAVA_MAJOR_VERSION" -ge "0" ]] ; then
+  JAVA_MAJOR_VERSION=$($JAVACMD -version 2>&1 | sed '1!d' | sed -e 's/"//g' | awk '{print $3}' | awk -F '.' '{print $1}')
+fi
 if [[ "$JAVA_MAJOR_VERSION" -ge "9" ]] ; then
   JAVA_OPT="${JAVA_OPT} -Xlog:gc*:file=${BASEDIR}/logs/seata_gc.log:time,tags:filecount=10,filesize=102400"
+elif [[ "$JAVA_MAJOR_VERSION" -ge "17" ]] ; then
+  JAVA_OPT="${JAVA_OPT} -Xlog:gc=trace:file=${BASEDIR}/logs/seata_gc.log:time,tags:filecount=10,filesize=10M"
 else
   JAVA_OPT="${JAVA_OPT} -Xloggc:${BASEDIR}/logs/seata_gc.log -verbose:gc -XX:+PrintGCDetails  -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
 fi
@@ -152,4 +158,4 @@ CMD_LINE_ARGS=$@
 # start
 echo "$JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS}" > ${BASEDIR}/logs/start.out 2>&1 &
 nohup $JAVACMD ${JAVA_OPT} ${CMD_LINE_ARGS} >> ${BASEDIR}/logs/start.out 2>&1 &
-echo "seata-server is starting, you can check the ${BASEDIR}/logs/start.out"
+echo "seata-server is starting, you can check the ${BASEDIR}/logs/start.out"

distribution/release-seata.xml

@@ -53,7 +53,7 @@
 
         <fileSet>
             <directory>../ext/apm-seata-skywalking-plugin/target/ext/skywalking-agent/</directory>
-            <outputDirectory>ext/apm-skywalking/</outputDirectory>
+            <outputDirectory>ext/apm-skywalking</outputDirectory>
         </fileSet>
 
         <fileSet>

server/pom.xml

@@ -291,10 +291,8 @@
                             <jvmFlag>-XX:HeapDumpPath=/var/log/seata_heapdump.hprof</jvmFlag>
                             <!--gc-->
                             <jvmFlag>-XX:+DisableExplicitGC</jvmFlag>
-                            <jvmFlag>-XX:+CMSParallelRemarkEnabled</jvmFlag>
-                            <jvmFlag>-XX:+UseCMSInitiatingOccupancyOnly</jvmFlag>
-                            <jvmFlag>-XX:CMSInitiatingOccupancyFraction=75</jvmFlag>
-                            <jvmFlag>-Xloggc:/var/log/seata_gc.log</jvmFlag>
+                            <jvmFlag>-XX:+UseZGC</jvmFlag>
+                            <jvmFlag>-Xlog:gc=trace:file=/var/log/seata_gc.log:time,tags:filecount=10,filesize=10M</jvmFlag>
                             <jvmFlag>-verbose:gc</jvmFlag>
                             <!--netty-->
                             <jvmFlag>-Dio.netty.leakDetectionLevel=advanced</jvmFlag>

spring/pom.xml

@@ -54,10 +54,6 @@
             <artifactId>seata-serializer-all</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib</artifactId>
-        </dependency>
 
         <!-- spring  -->
         <dependency>