From 66c32b10badb64a2a59b54428973abb234a22f8a Mon Sep 17 00:00:00 2001 From: fishtailfu Date: Fri, 31 Jul 2026 11:49:13 +0800 Subject: [PATCH] feat: adapt to polaris-java CLIENT_REPORTER plugin for config watch reporting - Upgrade polaris.version from 2.1.2.0-SNAPSHOT to 2.1.2.0 - Enable clientReporter in ConfigurationModifier.modify() - Add ClientReporterConfigImpl mock to ConfigurationModifierTest - Add clientReporter verification to test assertions --- .../tencent/cloud/polaris/config/ConfigurationModifier.java | 2 ++ .../cloud/polaris/config/ConfigurationModifierTest.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java index 2ead9c840..6014e06a2 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java +++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/ConfigurationModifier.java @@ -67,6 +67,8 @@ public class ConfigurationModifier implements PolarisConfigurationConfigModifier @Override public void modify(ConfigurationImpl configuration) { configuration.getGlobal().getStatReporter().setEnable(false); + // Enable client reporter to report config watch metadata via ReportClient. + configuration.getGlobal().getClientReporter().setEnable(true); configuration.getConsumer().getOutlierDetection().setWhen(OutlierDetectionConfig.When.never); configuration.getConsumer().getCircuitBreaker().setEnable(false); diff --git a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java index 69315674a..006d08de3 100644 --- a/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java +++ b/spring-cloud-starter-tencent-polaris-config/src/test/java/com/tencent/cloud/polaris/config/ConfigurationModifierTest.java @@ -40,6 +40,7 @@ import com.tencent.polaris.factory.config.consumer.CircuitBreakerConfigImpl; import com.tencent.polaris.factory.config.consumer.ConsumerConfigImpl; import com.tencent.polaris.factory.config.consumer.OutlierDetectionConfigImpl; import com.tencent.polaris.factory.config.global.APIConfigImpl; +import com.tencent.polaris.factory.config.global.ClientReporterConfigImpl; import com.tencent.polaris.factory.config.global.GlobalConfigImpl; import com.tencent.polaris.factory.config.global.ServerConnectorConfigImpl; import com.tencent.polaris.factory.config.global.StatReporterConfigImpl; @@ -94,9 +95,11 @@ class ConfigurationModifierTest { GlobalConfigImpl globalConfig = mock(GlobalConfigImpl.class); StatReporterConfigImpl statReporter = mock(StatReporterConfigImpl.class); + ClientReporterConfigImpl clientReporter = mock(ClientReporterConfigImpl.class); ServerConnectorConfigImpl serverConnector = mock(ServerConnectorConfigImpl.class); APIConfigImpl apiConfig = mock(APIConfigImpl.class); when(globalConfig.getStatReporter()).thenReturn(statReporter); + when(globalConfig.getClientReporter()).thenReturn(clientReporter); Mockito.lenient().when(globalConfig.getServerConnector()).thenReturn(serverConnector); Mockito.lenient().when(globalConfig.getAPI()).thenReturn(apiConfig); when(configuration.getGlobal()).thenReturn(globalConfig); @@ -153,6 +156,7 @@ class ConfigurationModifierTest { // Assert verify(configuration.getGlobal().getStatReporter()).setEnable(false); + verify(configuration.getGlobal().getClientReporter()).setEnable(true); verify(configuration.getConsumer().getOutlierDetection()).setWhen(OutlierDetectionConfig.When.never); verify(configuration.getConsumer().getCircuitBreaker()).setEnable(false); verify(configuration.getConfigFile(), never()).getServerConnector(); @@ -176,6 +180,7 @@ class ConfigurationModifierTest { // Assert verify(configuration.getGlobal().getStatReporter()).setEnable(false); + verify(configuration.getGlobal().getClientReporter()).setEnable(true); verify(configuration.getConfigFile(), never()).getServerConnector(); }