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

Co-authored-by: Haotian Zhang <[email protected]>
Tencent · Aug 28, 2024 · cc927d6 · cc927d6
1 parent 95006a4
commit cc927d6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,3 +30,4 @@
 - [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1419)
 - [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1420)
 - [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1421)
+- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1422)
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

diff --git a/.../main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java b/.../main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java
@@ -105,6 +105,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment, SpringAp
 				defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
 			}
 			else {
+				defaultProperties.put("spring.cloud.polaris.contract.report.enabled", "false");
 				defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
 				defaultProperties.put("spring.cloud.polaris.config.internal-enabled", "false");
 				defaultProperties.put("spring.cloud.polaris.config.data-source", "consul");