diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f29a25b5f..30f3c3e71e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,4 +26,5 @@ - [feat:support consul config data. ](https://github.com/Tencent/spring-cloud-tencent/pull/1365) - [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1366) - [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1372) -- [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1374) \ No newline at end of file +- [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1374) +- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1375) diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java index 3f698288dd..b297fb0d0e 100644 --- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java +++ b/spring-cloud-starter-tencent-polaris-contract/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/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java index 997bfbc1dc..64cd710512 100644 --- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java +++ b/spring-cloud-starter-tencent-polaris-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/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/bootstrap.yml index a32fec844d..5e43105a24 100644 --- a/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/tsf-example/provider-demo/src/main/resources/bootstrap.yml @@ -5,8 +5,6 @@ spring: name: provider-demo cloud: polaris: - config: - address: grpc://127.0.0.1:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java index fd39beb9b4..135f5d9f75 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/tsf/env/TsfCoreEnvironmentPostProcessor.java +++ b/spring-cloud-tencent-polaris-context/src/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");