fix: fix nacos CircuitBreaker disable bug (#948)

CHANGELOG.md

@@ -5,3 +5,4 @@
 - [feat:support webclient and gateway report call metrics](https://github.com/Tencent/spring-cloud-tencent/pull/924)
 - [feature: optimize polaris-discovery-example/discovery-callee-service, add client-ip return.](https://github.com/Tencent/spring-cloud-tencent/pull/939)
 - [docs:prevent the release of the final version of the sdk.](https://github.com/Tencent/spring-cloud-tencent/pull/943)
+- [fix: fix nacos CircuitBreaker disable bug.](https://github.com/Tencent/spring-cloud-tencent/pull/948)

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/RouterConfigModifier.java

@@ -0,0 +1,50 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.polaris.router;
+
+import com.tencent.cloud.common.constant.ContextConstant;
+import com.tencent.cloud.polaris.context.PolarisConfigModifier;
+import com.tencent.polaris.api.config.consumer.ServiceRouterConfig;
+import com.tencent.polaris.factory.config.ConfigurationImpl;
+import com.tencent.polaris.plugins.router.healthy.RecoverRouterConfig;
+
+/**
+ * RouterConfigModifier.
+ *
+ * @author sean yu
+ */
+public class RouterConfigModifier implements PolarisConfigModifier {
+
+	@Override
+	public void modify(ConfigurationImpl configuration) {
+		// Set excludeCircuitBreakInstances to false
+		RecoverRouterConfig recoverRouterConfig = configuration.getConsumer().getServiceRouter()
+				.getPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, RecoverRouterConfig.class);
+		recoverRouterConfig.setExcludeCircuitBreakInstances(false);
+
+		// Update modified config to source properties
+		configuration.getConsumer().getServiceRouter()
+				.setPluginConfig(ServiceRouterConfig.DEFAULT_ROUTER_RECOVER, recoverRouterConfig);
+	}
+
+	@Override
+	public int getOrder() {
+		return ContextConstant.ModifierOrder.CONFIG_ORDER;
+	}
+}

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterBootstrapAutoConfiguration.java

@@ -0,0 +1,36 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.polaris.router.config;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * RouterBootstrapAutoConfiguration.
+ *
+ * @author sean yu
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnProperty("spring.cloud.polaris.enabled")
+@Import(RouterConfigModifierAutoConfiguration.class)
+public class RouterBootstrapAutoConfiguration {
+
+
+}

spring-cloud-starter-tencent-polaris-router/src/main/java/com/tencent/cloud/polaris/router/config/RouterConfigModifierAutoConfiguration.java

@@ -0,0 +1,42 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.polaris.router.config;
+
+import com.tencent.cloud.polaris.router.RouterConfigModifier;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * RouterConfigModifierAutoConfiguration.
+ *
+ * @author sean yu
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnPolarisRouterEnabled
+public class RouterConfigModifierAutoConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public RouterConfigModifier routerConfigModifier() {
+		return new RouterConfigModifier();
+	}
+
+}

spring-cloud-starter-tencent-polaris-router/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,7 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.tencent.cloud.polaris.router.config.RouterConfigModifierAutoConfiguration,\
   com.tencent.cloud.polaris.router.config.RouterAutoConfiguration,\
   com.tencent.cloud.polaris.router.config.FeignAutoConfiguration,\
   com.tencent.cloud.polaris.router.endpoint.PolarisRouterEndpointAutoConfiguration
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+  com.tencent.cloud.polaris.router.config.RouterBootstrapAutoConfiguration

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterAutoConfigurationTests.java

@@ -42,6 +42,7 @@ public class RouterAutoConfigurationTests {
 					TestRestTemplatesConfiguration.class,
 					MetadataAutoConfiguration.class,
 					RouterAutoConfiguration.class,
+					RouterBootstrapAutoConfiguration.class,
 					PolarisContextAutoConfiguration.class,
 					RouterAutoConfiguration.RouterLabelRestTemplateConfig.class,
 					ApplicationContextAwareUtils.class

spring-cloud-starter-tencent-polaris-router/src/test/java/com/tencent/cloud/polaris/router/config/RouterBootstrapAutoConfigurationTest.java

@@ -0,0 +1,52 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.polaris.router.config;
+
+import com.tencent.cloud.polaris.context.config.PolarisContextAutoConfiguration;
+import com.tencent.cloud.polaris.router.RouterConfigModifier;
+import com.tencent.cloud.rpc.enhancement.config.RpcEnhancementAutoConfiguration;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * RouterBootstrapAutoConfigurationTest.
+ *
+ * @author sean yu
+ */
+public class RouterBootstrapAutoConfigurationTest {
+
+	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
+			.withConfiguration(AutoConfigurations.of(
+					PolarisContextAutoConfiguration.class,
+					RpcEnhancementAutoConfiguration.class,
+					RouterBootstrapAutoConfiguration.class))
+			.withPropertyValues("spring.cloud.polaris.enabled=true")
+			.withPropertyValues("spring.cloud.polaris.circuitbreaker.enabled=true");
+
+	@Test
+	public void testDefaultInitialization() {
+		this.contextRunner.run(context -> {
+			assertThat(context).hasSingleBean(RouterConfigModifier.class);
+		});
+	}
+}

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/constant/ContextConstant.java

@@ -62,7 +62,7 @@ public final class ContextConstant {
 		/**
 		 * Order of circuit breaker configuration modifier.
 		 */
-		public static Integer CIRCUIT_BREAKER_ORDER = 1;
+		public static Integer CIRCUIT_BREAKER_ORDER = 2;
 
 		/**
 		 * Order of discovery configuration modifier.

spring-cloud-tencent-dependencies/pom.xml

@@ -73,7 +73,7 @@
 		<revision>1.11.0-2021.0.6-SNAPSHOT</revision>
 
 		<!-- Dependencies -->
-		<polaris.version>1.11.5</polaris.version>
+		<polaris.version>1.11.6</polaris.version>
 		<guava.version>31.0.1-jre</guava.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>