diff --git a/CHANGELOG.md b/CHANGELOG.md index 653adeb81..61270ba08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,3 +19,4 @@ - [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1350) - [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1352) - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1353) +- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1355) \ No newline at end of file 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 31b0c3c07..26fe59e6b 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,10 +271,10 @@ 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); + LOG.error("create Polaris SDK context failed. properties: {}, ", properties, throwable); throw 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);