fix:fix contract reporting bug when using TSF. (Tencent#1373)

fuyuwei01 · Aug 20, 2024 · a2f6835 · a2f6835
1 parent 4487317
commit a2f6835
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,4 +24,5 @@
 - [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1400)
 - [feat:support consul config data.](https://github.com/Tencent/spring-cloud-tencent/pull/1401)
 - [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1402)
-- [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1403)
+- [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1403)
+- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1406)
diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-tencent-polaris-config/src/main/resources/META-INF/spring.factories
@@ -1,7 +1,9 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigAutoConfiguration,\
   com.tencent.cloud.polaris.config.PolarisConfigAutoConfiguration,\
-  com.tencent.cloud.polaris.config.endpoint.PolarisConfigEndpointAutoConfiguration
+  com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration,\
+  com.tencent.cloud.polaris.config.endpoint.PolarisConfigEndpointAutoConfiguration,\
+  com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigBootstrapConfiguration
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
   com.tencent.cloud.polaris.config.PolarisConfigBootstrapAutoConfiguration,\
   com.tencent.cloud.polaris.config.tsf.PolarisAdaptorTsfConfigBootstrapConfiguration

diff --git a/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/...ct/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
@@ -161,17 +161,11 @@ public void setExposure(boolean exposure) {
 
 	@Override
 	public boolean isReportEnabled() {
-		if (Objects.nonNull(extendContractProperties)) {
-			return extendContractProperties.isReportEnabled();
-		}
 		return reportEnabled;
 	}
 
 	@Override
 	public void setReportEnabled(boolean reportEnabled) {
-		if (Objects.nonNull(extendContractProperties)) {
-			extendContractProperties.setReportEnabled(reportEnabled);
-		}
 		this.reportEnabled = reportEnabled;
 	}
 

diff --git a/...-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java b/...-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
@@ -56,7 +56,7 @@ public class TsfContractProperties implements ExtendedContractProperties {
 
 	@Override
 	public boolean isEnabled() {
-		return false;
+		return enabled;
 	}
 
 	@Override