feat: add dstService path parameter for circuit breaker endpoint

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpoint.java

@@ -27,12 +27,14 @@ import com.google.protobuf.util.JsonFormat;
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.util.JacksonUtils;
 import com.tencent.cloud.polaris.context.ServiceRuleManager;
+import com.tencent.polaris.api.utils.CollectionUtils;
 import com.tencent.polaris.specification.api.v1.fault.tolerance.CircuitBreakerProto;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+import org.springframework.boot.actuate.endpoint.annotation.Selector;
 
 /**
  * Endpoint of polaris circuit breaker, include circuit breaker rules.
@@ -51,25 +53,30 @@ public class PolarisCircuitBreakerEndpoint {
 	}
 
 	@ReadOperation
-	public Map<String, Object> circuitBreaker() {
+	public Map<String, Object> circuitBreaker(@Selector String dstService) {
-		CircuitBreakerProto.CircuitBreaker circuitBreaker = serviceRuleManager.getServiceCircuitBreakerRule(
+		List<CircuitBreakerProto.CircuitBreakerRule> rules = serviceRuleManager.getServiceCircuitBreakerRule(
 				MetadataContext.LOCAL_NAMESPACE,
-				MetadataContext.LOCAL_SERVICE
+				MetadataContext.LOCAL_SERVICE,
+				dstService
 		);
 
 		Map<String, Object> polarisCircuitBreakerInfo = new HashMap<>();
 
 		polarisCircuitBreakerInfo.put("namespace", MetadataContext.LOCAL_NAMESPACE);
 		polarisCircuitBreakerInfo.put("service", MetadataContext.LOCAL_SERVICE);
-		polarisCircuitBreakerInfo.put("circuitBreakerRules", parseCircuitBreakerRule(circuitBreaker));
 
+		List<Object> circuitBreakerRules = new ArrayList<>();
+		if (CollectionUtils.isNotEmpty(rules)) {
+			for (CircuitBreakerProto.CircuitBreakerRule rule : rules) {
+				circuitBreakerRules.add(parseCircuitBreakerRule(rule));
+
+			}
+		}
+		polarisCircuitBreakerInfo.put("circuitBreakerRules", circuitBreakerRules);
 		return polarisCircuitBreakerInfo;
 	}
 
-	private List<Object> parseCircuitBreakerRule(CircuitBreakerProto.CircuitBreaker circuitBreaker) {
+	private Object parseCircuitBreakerRule(CircuitBreakerProto.CircuitBreakerRule circuitBreakerRule) {
-		List<Object> circuitBreakerRuleList = new ArrayList<>();
-
-		for (CircuitBreakerProto.CircuitBreakerRule circuitBreakerRule : circuitBreaker.getRulesList()) {
 		String ruleJson;
 		try {
 			ruleJson = JsonFormat.printer().print(circuitBreakerRule);
@@ -78,9 +85,6 @@ public class PolarisCircuitBreakerEndpoint {
 			LOG.error("rule to Json failed. check rule {}.", circuitBreakerRule, e);
 			throw new RuntimeException("Json failed.", e);
 		}
-			circuitBreakerRuleList.add(JacksonUtils.deserialize2Map(ruleJson));
+		return JacksonUtils.deserialize2Map(ruleJson);
-		}
-
-		return circuitBreakerRuleList;
 	}
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/endpoint/PolarisCircuitBreakerEndpointTest.java

@@ -56,7 +56,7 @@ public class PolarisCircuitBreakerEndpointTest {
 	@BeforeEach
 	void setUp() {
 		serviceRuleManager = mock(ServiceRuleManager.class);
-		when(serviceRuleManager.getServiceCircuitBreakerRule(anyString(), anyString())).thenAnswer(invocation -> {
+		when(serviceRuleManager.getServiceCircuitBreakerRule(anyString(), anyString(), anyString())).thenAnswer(invocation -> {
 			CircuitBreakerProto.CircuitBreakerRule.Builder ruleBuilder = CircuitBreakerProto.CircuitBreakerRule.newBuilder();
 			ruleBuilder.setName("test_for_circuit_breaker");
 			ruleBuilder.setEnable(true);
@@ -74,7 +74,7 @@ public class PolarisCircuitBreakerEndpointTest {
 	public void testPolarisCircuitBreaker() {
 		contextRunner.run(context -> {
 			PolarisCircuitBreakerEndpoint endpoint = new PolarisCircuitBreakerEndpoint(serviceRuleManager);
-			Map<String, Object> circuitBreakerInfo = endpoint.circuitBreaker();
+			Map<String, Object> circuitBreakerInfo = endpoint.circuitBreaker("test");
 			assertThat(circuitBreakerInfo).isNotNull();
 			assertThat(circuitBreakerInfo.get("namespace")).isNotNull();
 			assertThat(circuitBreakerInfo.get("service")).isNotNull();

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/pom.xml

@@ -43,6 +43,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/resources/bootstrap.yml

@@ -22,3 +22,9 @@ logging:
     root: info
     com.tencent.cloud: debug
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - polaris-circuit-breaker

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/pom.xml

@@ -53,6 +53,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/src/main/resources/bootstrap.yml

@@ -57,3 +57,9 @@ logging:
     com.tencent.polaris.plugins.registry: off
     com.tencent.cloud: debug
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - polaris-circuit-breaker

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/pom.xml

@@ -38,6 +38,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/resources/bootstrap.yml

@@ -18,3 +18,9 @@ logging:
     root: info
     com.tencent.cloud: debug
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - polaris-circuit-breaker

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/pom.xml

@@ -38,6 +38,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bootstrap</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/src/main/resources/bootstrap.yml

@@ -18,3 +18,9 @@ logging:
     root: info
     com.tencent.cloud: debug
 
+management:
+  endpoints:
+    web:
+      exposure:
+        include:
+          - polaris-circuit-breaker

spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/ServiceRuleManager.java

@@ -89,18 +89,30 @@ public class ServiceRuleManager {
 		return rules;
 	}
 
-	public CircuitBreakerProto.CircuitBreaker getServiceCircuitBreakerRule(String namespace, String service) {
+	public List<CircuitBreakerProto.CircuitBreakerRule> getServiceCircuitBreakerRule(String namespace, String sourceService, String dstService) {
-		LOG.debug("Get service circuit breaker rules with namespace:{} and service:{}.", namespace, service);
+		LOG.debug("Get service circuit breaker rules with namespace:{} and sourceService:{} and dstService:{}.", namespace, sourceService, dstService);
 
-		ServiceRule serviceRule = getServiceRule(namespace, service, ServiceEventKey.EventType.CIRCUIT_BREAKING);
+		List<CircuitBreakerProto.CircuitBreakerRule> rules = new ArrayList<>();
-		if (serviceRule != null) {
+
-			Object rule = serviceRule.getRule();
+		// get source service circuit breaker rules.
+		ServiceRule sourceServiceRule = getServiceRule(namespace, sourceService, ServiceEventKey.EventType.CIRCUIT_BREAKING);
+		if (sourceServiceRule != null) {
+			Object rule = sourceServiceRule.getRule();
 			if (rule instanceof CircuitBreakerProto.CircuitBreaker) {
-				return (CircuitBreakerProto.CircuitBreaker) rule;
+				rules.addAll(((CircuitBreakerProto.CircuitBreaker) rule).getRulesList());
 			}
 		}
 
-		return null;
+		// get peer service circuit breaker rules.
+		ServiceRule dstServiceRule = getServiceRule(namespace, dstService, ServiceEventKey.EventType.CIRCUIT_BREAKING);
+		if (dstServiceRule != null) {
+			Object rule = dstServiceRule.getRule();
+			if (rule instanceof CircuitBreakerProto.CircuitBreaker) {
+				rules.addAll(((CircuitBreakerProto.CircuitBreaker) rule).getRulesList());
+			}
+		}
+
+		return rules;
 	}
 
 	private ServiceRule getServiceRule(String namespace, String service, ServiceEventKey.EventType eventType) {