Merge branch '2.x' into 2.x_26_02_17

Author: slievrly

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

changes/en-us/2.x.md

@@ -24,7 +24,7 @@ Add changes here for all PR submitted to the 2.x branch.
 - [[#7000](https://github.com/apache/incubator-seata/pull/7000)] support multi-version codec & fix not returning client registration failure msg.
 - [[#7865](https://github.com/apache/incubator-seata/pull/7865)] add Benchmark CLI tool
 - [[#7903](https://github.com/apache/incubator-seata/pull/7903)] Support HTTP/2 stream push for the Watch API in Server Raft mode
-
+- [[#8002](https://github.com/apache/incubator-seata/pull/8002)] add Grafana dashboard JSON for NamingServer metrics
 
 ### bugfix:
 
@@ -49,7 +49,10 @@ Add changes here for all PR submitted to the 2.x branch.
 ### security:
 
 ### test:
+
 - [[#7962](https://github.com/apache/incubator-seata/pull/7962)] add unit tests for NacosRegistryProvider and NacosRegistryServiceImpl
+- [[#8003](https://github.com/apache/incubator-seata/pull/8003)] Enhance NacosRegistryServiceImplTest with additional mocks for service name group and cluster
+- [[#7915](https://github.com/apache/incubator-seata/pull/7915)] add unit tests for saga-engine low coverage components
 
 ### refactor:
 

changes/zh-cn/2.x.md

@@ -25,6 +25,7 @@
 - [[#7000](https://github.com/apache/incubator-seata/pull/7000)] 支持多版本codec，修复不返回客户端注册失败消息的问题
 - [[#7865](https://github.com/apache/incubator-seata/pull/7865)] 新增 Benchmark 命令行工具
 - [[#7903](https://github.com/apache/incubator-seata/pull/7903)] 在Server Raft模式下支持Watch API的HTTP/2流推送
+- [[#8002](https://github.com/apache/incubator-seata/pull/8002)] 为namingserver指标增加Grafana dashboard JSON
 
 ### bugfix:
 
@@ -54,7 +55,11 @@
 
 
 ### test:
+
 - [[#7962](https://github.com/apache/incubator-seata/pull/7962)] 为 NacosRegistryProvider 和 NacosRegistryServiceImpl 添加单元测试用例
+- [[#8003](https://github.com/apache/incubator-seata/pull/8003)] 为 NacosRegistryServiceImplTest 增加服务名称、分组和集群的额外模拟
+- [[#7915](https://github.com/apache/incubator-seata/pull/7915)] 为 saga-engine 添加单元测试用例
+
 
 ### refactor:
 

discovery/seata-discovery-nacos/src/main/java/org/apache/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java

@@ -72,7 +72,11 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
     private static final String PUBLIC_NAMING_ADDRESS_PREFIX = "public_";
     private static final String PUBLIC_NAMING_SERVICE_META_IP_KEY = "publicIp";
     private static final String PUBLIC_NAMING_SERVICE_META_PORT_KEY = "publicPort";
-    private static final Configuration FILE_CONFIG = ConfigurationFactory.CURRENT_FILE_INSTANCE;
+    // Use a method to retrieve file config dynamically to support test mocking on Java 17+
+    private static Configuration getFileConfig() {
+        return ConfigurationFactory.CURRENT_FILE_INSTANCE;
+    }
+
     private static volatile NamingService naming;
     private static final ConcurrentMap<String, List<EventListener>> LISTENER_SERVICE_MAP = new ConcurrentHashMap<>();
     private static final ConcurrentMap<String, List<InetSocketAddress>> CLUSTER_ADDRESS_MAP = new ConcurrentHashMap<>();
@@ -86,7 +90,7 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
     private String transactionServiceGroup;
 
     private NacosRegistryServiceImpl() {
-        String configForNacosSLB = FILE_CONFIG.getConfig(getNacosUrlPatternOfSLB());
+        String configForNacosSLB = getFileConfig().getConfig(getNacosUrlPatternOfSLB());
         Pattern patternOfNacosRegistryForSLB = StringUtils.isBlank(configForNacosSLB)
                 ? DEFAULT_SLB_REGISTRY_PATTERN
                 : Pattern.compile(configForNacosSLB);
@@ -278,15 +282,15 @@ private static Properties getNamingProperties() {
         if (System.getProperty(PRO_SERVER_ADDR_KEY) != null) {
             properties.setProperty(PRO_SERVER_ADDR_KEY, System.getProperty(PRO_SERVER_ADDR_KEY));
         } else {
-            String address = FILE_CONFIG.getConfig(getNacosAddrFileKey());
+            String address = getFileConfig().getConfig(getNacosAddrFileKey());
             if (address != null) {
                 properties.setProperty(PRO_SERVER_ADDR_KEY, address);
             }
         }
         if (System.getProperty(PRO_NAMESPACE_KEY) != null) {
             properties.setProperty(PRO_NAMESPACE_KEY, System.getProperty(PRO_NAMESPACE_KEY));
         } else {
-            String namespace = FILE_CONFIG.getConfig(getNacosNameSpaceFileKey());
+            String namespace = getFileConfig().getConfig(getNacosNameSpaceFileKey());
             if (namespace == null) {
                 namespace = DEFAULT_NAMESPACE;
             }
@@ -297,7 +301,7 @@ private static Properties getNamingProperties() {
         }
         String contextPath = StringUtils.isNotBlank(System.getProperty(CONTEXT_PATH))
                 ? System.getProperty(CONTEXT_PATH)
-                : FILE_CONFIG.getConfig(getNacosContextPathKey());
+                : getFileConfig().getConfig(getNacosContextPathKey());
         if (StringUtils.isNotBlank(contextPath)) {
             properties.setProperty(CONTEXT_PATH, contextPath);
         }
@@ -315,11 +319,11 @@ private static Properties getNamingProperties() {
     private static boolean initNacosAuthProperties(Properties sourceProperties) {
         String userName = StringUtils.isNotBlank(System.getProperty(USER_NAME))
                 ? System.getProperty(USER_NAME)
-                : FILE_CONFIG.getConfig(getNacosUserName());
+                : getFileConfig().getConfig(getNacosUserName());
         if (StringUtils.isNotBlank(userName)) {
             String password = StringUtils.isNotBlank(System.getProperty(PASSWORD))
                     ? System.getProperty(PASSWORD)
-                    : FILE_CONFIG.getConfig(getNacosPassword());
+                    : getFileConfig().getConfig(getNacosPassword());
             if (StringUtils.isNotBlank(password)) {
                 sourceProperties.setProperty(USER_NAME, userName);
                 sourceProperties.setProperty(PASSWORD, password);
@@ -329,14 +333,14 @@ private static boolean initNacosAuthProperties(Properties sourceProperties) {
         } else {
             String accessKey = StringUtils.isNotBlank(System.getProperty(ACCESS_KEY))
                     ? System.getProperty(ACCESS_KEY)
-                    : FILE_CONFIG.getConfig(getNacosAccessKey());
+                    : getFileConfig().getConfig(getNacosAccessKey());
             String ramRoleName = StringUtils.isNotBlank(System.getProperty(RAM_ROLE_NAME_KEY))
                     ? System.getProperty(RAM_ROLE_NAME_KEY)
-                    : FILE_CONFIG.getConfig(getNacosRamRoleNameKey());
+                    : getFileConfig().getConfig(getNacosRamRoleNameKey());
             if (StringUtils.isNotBlank(accessKey)) {
                 String secretKey = StringUtils.isNotBlank(System.getProperty(SECRET_KEY))
                         ? System.getProperty(SECRET_KEY)
-                        : FILE_CONFIG.getConfig(getNacosSecretKey());
+                        : getFileConfig().getConfig(getNacosSecretKey());
                 if (StringUtils.isNotBlank(secretKey)) {
                     sourceProperties.put(ACCESS_KEY, accessKey);
                     sourceProperties.put(SECRET_KEY, secretKey);
@@ -353,15 +357,15 @@ private static boolean initNacosAuthProperties(Properties sourceProperties) {
     }
 
     private static String getClusterName() {
-        return FILE_CONFIG.getConfig(getNacosClusterFileKey(), DEFAULT_CLUSTER);
+        return getFileConfig().getConfig(getNacosClusterFileKey(), DEFAULT_CLUSTER);
     }
 
     private static String getServiceName() {
-        return FILE_CONFIG.getConfig(getNacosApplicationFileKey(), DEFAULT_APPLICATION);
+        return getFileConfig().getConfig(getNacosApplicationFileKey(), DEFAULT_APPLICATION);
     }
 
     private static String getServiceGroup() {
-        return FILE_CONFIG.getConfig(getNacosApplicationGroupKey(), DEFAULT_GROUP);
+        return getFileConfig().getConfig(getNacosApplicationGroupKey(), DEFAULT_GROUP);
     }
 
     private static String getNacosAddrFileKey() {

discovery/seata-discovery-nacos/src/test/java/org/apache/seata/discovery/registry/nacos/NacosRegistryServiceImplTest.java

@@ -88,11 +88,20 @@ public void beforeEach() throws Exception {
         when(mockedCurrentNacosConfiguration.getConfig(SLB_PATTERN_KEY)).thenReturn("");
         when(mockedCurrentNacosConfiguration.getConfig(SERVER_ADDR_KEY)).thenReturn("127.0.0.1");
 
+        // Mock for getServiceName() -> registry.nacos.application
+        when(mockedCurrentNacosConfiguration.getConfig(APPLICATION_KEY)).thenReturn(NACOS_MOCKED_APPLICATION);
         when(mockedCurrentNacosConfiguration.getConfig(APPLICATION_KEY, "seata-server"))
                 .thenReturn(NACOS_MOCKED_APPLICATION);
+
+        // Mock for getServiceGroup() -> registry.nacos.group
+        when(mockedCurrentNacosConfiguration.getConfig(GROUP_KEY)).thenReturn(NACOS_MOCKED_GROUP);
         when(mockedCurrentNacosConfiguration.getConfig(GROUP_KEY, "DEFAULT_GROUP"))
                 .thenReturn(NACOS_MOCKED_GROUP);
+
+        // Mock for getClusterName() -> registry.nacos.cluster
+        when(mockedCurrentNacosConfiguration.getConfig(CLUSTER_KEY)).thenReturn(NACOS_MOCKED_CLUSTER);
         when(mockedCurrentNacosConfiguration.getConfig(CLUSTER_KEY, "default")).thenReturn(NACOS_MOCKED_CLUSTER);
+
         when(mockedCurrentNacosConfiguration.getConfig(CONTEXT_PATH_KEY)).thenReturn("/foo");
 
         nacosRegistryService = NacosRegistryServiceImpl.getInstance();