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

Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
pull/1399/head
Fishtail 1 year ago committed by GitHub
parent 64cc79be22
commit 545cf3f5ce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -27,3 +27,4 @@
- [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1366) - [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: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) - [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)

@ -161,17 +161,11 @@ public class PolarisContractProperties implements ContractProperties {
@Override @Override
public boolean isReportEnabled() { public boolean isReportEnabled() {
if (Objects.nonNull(extendContractProperties)) {
return extendContractProperties.isReportEnabled();
}
return reportEnabled; return reportEnabled;
} }
@Override @Override
public void setReportEnabled(boolean reportEnabled) { public void setReportEnabled(boolean reportEnabled) {
if (Objects.nonNull(extendContractProperties)) {
extendContractProperties.setReportEnabled(reportEnabled);
}
this.reportEnabled = reportEnabled; this.reportEnabled = reportEnabled;
} }

@ -56,7 +56,7 @@ public class TsfContractProperties implements ExtendedContractProperties {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
return false; return enabled;
} }
@Override @Override

@ -5,8 +5,6 @@ spring:
name: provider-demo name: provider-demo
cloud: cloud:
polaris: polaris:
config:
address: grpc://127.0.0.1:8091
namespace: default namespace: default
enabled: true enabled: true
stat: stat:

@ -105,6 +105,7 @@ public final class TsfCoreEnvironmentPostProcessor implements EnvironmentPostPro
defaultProperties.put("spring.cloud.polaris.config.enabled", "true"); defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
} }
else { else {
defaultProperties.put("spring.cloud.polaris.contract.report.enabled", "false");
defaultProperties.put("spring.cloud.polaris.config.enabled", "true"); defaultProperties.put("spring.cloud.polaris.config.enabled", "true");
defaultProperties.put("spring.cloud.polaris.config.internal-enabled", "false"); defaultProperties.put("spring.cloud.polaris.config.internal-enabled", "false");
defaultProperties.put("spring.cloud.polaris.config.data-source", "consul"); defaultProperties.put("spring.cloud.polaris.config.data-source", "consul");

Loading…
Cancel
Save