From dfa4a412f3b716547726bf75c499b8be967dced0 Mon Sep 17 00:00:00 2001
From: andrew shan <45474304+andrewshan@users.noreply.github.com>
Date: Wed, 19 Jun 2024 12:46:52 +0800
Subject: [PATCH] fix: fix test case unstable issues (#1324)

---
 CHANGELOG.md                                      |  3 ++-
 .../lossless/LosslessRegistryAspectTest.java      |  4 ++--
 .../polaris/context/PolarisSDKContextManager.java | 15 +++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33efb6cc..5fbfb76d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,4 +19,5 @@
 - [fix:fix the ratelimit bug for 2022](https://github.com/Tencent/spring-cloud-tencent/pull/1314)
 - [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1317)
 - [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1319)
-- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1322)
\ No newline at end of file
+- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1322)
+- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1324)
\ No newline at end of file
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java
index 67d0e98a..ba05d661 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/plugin/lossless/LosslessRegistryAspectTest.java
@@ -140,8 +140,8 @@ public class LosslessRegistryAspectTest {
 			assertThatCode(() -> {
 				assertThat(OkHttpUtil.checkUrl(HOST, LOSSLESS_PORT_1, "/online", Collections.EMPTY_MAP)).isFalse();
 			}).doesNotThrowAnyException();
-			// delay register after 5s
-			Thread.sleep(5000);
+			// delay register after 10s
+			Thread.sleep(10000);
 			PolarisServiceRegistry registry = context.getBean(PolarisServiceRegistry.class);
 			PolarisRegistration registration = context.getBean(PolarisRegistration.class);
 
diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java
index 8d4fd852..26fe59e6 100644
--- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java
+++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/PolarisSDKContextManager.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Objects;
 
 import com.tencent.cloud.polaris.context.config.PolarisContextProperties;
+import com.tencent.polaris.api.config.Configuration;
 import com.tencent.polaris.api.control.Destroyable;
 import com.tencent.polaris.api.core.ConsumerAPI;
 import com.tencent.polaris.api.core.LosslessAPI;
@@ -229,9 +230,10 @@ public class PolarisSDKContextManager {
 					}
 				}
 				// init SDKContext
-				serviceSdkContext = SDKContext.initContextByConfig(properties.configuration(serviceModifierList,
+				Configuration configuration = properties.configuration(serviceModifierList,
 						() -> environment.getProperty("spring.cloud.client.ip-address"),
-						() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0)));
+						() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0));
+				serviceSdkContext = SDKContext.initContextByConfig(configuration);
 				serviceSdkContext.init();
 
 				// init ProviderAPI
@@ -269,7 +271,7 @@ public class PolarisSDKContextManager {
 						}
 					}
 				}));
-				LOG.info("create Polaris SDK context successfully. properties: {}, ", properties);
+				LOG.info("create Polaris SDK context successfully. properties: {}, configuration: {}", properties, configuration);
 			}
 			catch (Throwable throwable) {
 				LOG.error("create Polaris SDK context failed. properties: {}, ", properties, throwable);
@@ -289,14 +291,15 @@ public class PolarisSDKContextManager {
 		if (null == configSDKContext && CollectionUtils.isNotEmpty(configModifierList)) {
 			try {
 				// init config SDKContext
-				configSDKContext = SDKContext.initContextByConfig(properties.configuration(configModifierList,
+				Configuration configuration = properties.configuration(configModifierList,
 						() -> environment.getProperty("spring.cloud.client.ip-address"),
-						() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0)));
+						() -> environment.getProperty("spring.cloud.polaris.local-port", Integer.class, 0));
+				configSDKContext = SDKContext.initContextByConfig(configuration);
 				configSDKContext.init();
 
 				// add shutdown hook
 				Runtime.getRuntime().addShutdownHook(new Thread(PolarisSDKContextManager::innerConfigDestroy));
-				LOG.info("create Polaris config SDK context successfully. properties: {}, ", properties);
+				LOG.info("create Polaris config SDK context successfully. properties: {}, configuration: {}", properties, configuration);
 			}
 			catch (Throwable throwable) {
 				LOG.error("create Polaris config SDK context failed. properties: {}, ", properties, throwable);