diff --git a/CHANGELOG.md b/CHANGELOG.md index 33efb6cc0..5fbfb76df 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 67d0e98af..ba05d6619 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 void testRegister() { 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 8d4fd852a..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.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 void initService() { } } // 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 void initService() { } } })); - 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 void initConfig() { 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);