feat:upgrade api circuit breaker. (#1441)

* feat:upgrade api circuit breaker.

* feat:upgrade api circuit breaker.

* update junit test.

Author: SkyeBeFreeman

CHANGELOG.md

@@ -29,3 +29,4 @@
 - [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1406)
 - [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1425)
 - [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1432)
+- [feat:upgrade api circuit breaker.](https://github.com/Tencent/spring-cloud-tencent/pull/1441)

spring-cloud-starter-tencent-polaris-circuitbreaker/pom.xml

@@ -118,12 +118,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.tencent.polaris</groupId>
 			<artifactId>polaris-test-common</artifactId>

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

@@ -52,7 +52,8 @@ public class PolarisCircuitBreaker implements CircuitBreaker {
 	public PolarisCircuitBreaker(PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration conf,
 			ConsumerAPI consumerAPI,
 			CircuitBreakAPI circuitBreakAPI) {
-		FunctionalDecoratorRequest makeDecoratorRequest = new FunctionalDecoratorRequest(new ServiceKey(conf.getNamespace(), conf.getService()), conf.getMethod());
+		FunctionalDecoratorRequest makeDecoratorRequest = new FunctionalDecoratorRequest(
+				new ServiceKey(conf.getNamespace(), conf.getService()), conf.getProtocol(), conf.getMethod(), conf.getPath());
 		makeDecoratorRequest.setSourceService(new ServiceKey(conf.getSourceNamespace(), conf.getSourceService()));
 		makeDecoratorRequest.setResultToErrorCode(new PolarisResultToErrorCode());
 		this.consumerAPI = consumerAPI;

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

@@ -43,24 +43,25 @@
 public class PolarisCircuitBreakerFactory
 		extends CircuitBreakerFactory<PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration, PolarisCircuitBreakerConfigBuilder> implements DisposableBean {
 
+	private final CircuitBreakAPI circuitBreakAPI;
+
+	private final ConsumerAPI consumerAPI;
+
+	private final ScheduledExecutorService cleanupService = Executors.newSingleThreadScheduledExecutor(
+			new NamedThreadFactory("sct-circuitbreaker-cleanup", true));
+
 	private Function<String, PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration> defaultConfiguration =
 			id -> {
 				String[] metadata = PolarisCircuitBreakerUtils.resolveCircuitBreakerId(id);
 				return new PolarisCircuitBreakerConfigBuilder()
 						.namespace(metadata[0])
 						.service(metadata[1])
-						.method(metadata[2])
+						.path(metadata[2])
+						.protocol(metadata[3])
+						.method(metadata[4])
 						.build();
 			};
 
-
-	private final CircuitBreakAPI circuitBreakAPI;
-
-	private final ConsumerAPI consumerAPI;
-
-	private final ScheduledExecutorService cleanupService = Executors.newSingleThreadScheduledExecutor(
-			new NamedThreadFactory("sct-circuitbreaker-cleanup", true));
-
 	public PolarisCircuitBreakerFactory(CircuitBreakAPI circuitBreakAPI, ConsumerAPI consumerAPI,
 			PolarisCircuitBreakerProperties polarisCircuitBreakerProperties) {
 		this.circuitBreakAPI = circuitBreakAPI;
@@ -83,7 +84,7 @@ public CircuitBreaker create(String id) {
 	@Override
 	protected PolarisCircuitBreakerConfigBuilder configBuilder(String id) {
 		String[] metadata = PolarisCircuitBreakerUtils.resolveCircuitBreakerId(id);
-		return new PolarisCircuitBreakerConfigBuilder(metadata[0], metadata[1], metadata[2]);
+		return new PolarisCircuitBreakerConfigBuilder(metadata[0], metadata[1], metadata[2], metadata[3], metadata[4]);
 	}
 
 	@Override
@@ -93,7 +94,7 @@ public void configureDefault(Function<String, PolarisCircuitBreakerConfigBuilder
 
 	@Override
 	public void destroy() {
-		ThreadPoolUtils.waitAndStopThreadPools(new ExecutorService[]{cleanupService});
+		ThreadPoolUtils.waitAndStopThreadPools(new ExecutorService[] {cleanupService});
 	}
 
 }

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

@@ -51,7 +51,8 @@ public class ReactivePolarisCircuitBreaker implements ReactiveCircuitBreaker {
 	public ReactivePolarisCircuitBreaker(PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration conf,
 			ConsumerAPI consumerAPI,
 			CircuitBreakAPI circuitBreakAPI) {
-		InvokeContext.RequestContext requestContext = new FunctionalDecoratorRequest(new ServiceKey(conf.getNamespace(), conf.getService()), conf.getMethod());
+		InvokeContext.RequestContext requestContext = new FunctionalDecoratorRequest(
+				new ServiceKey(conf.getNamespace(), conf.getService()), conf.getProtocol(), conf.getMethod(), conf.getPath());
 		requestContext.setSourceService(new ServiceKey(conf.getSourceNamespace(), conf.getSourceService()));
 		requestContext.setResultToErrorCode(new PolarisResultToErrorCode());
 		this.consumerAPI = consumerAPI;

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

@@ -43,23 +43,25 @@
 public class ReactivePolarisCircuitBreakerFactory extends
 		ReactiveCircuitBreakerFactory<PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration, PolarisCircuitBreakerConfigBuilder> implements DisposableBean {
 
+	private final CircuitBreakAPI circuitBreakAPI;
+
+	private final ConsumerAPI consumerAPI;
+
+	private final ScheduledExecutorService cleanupService = Executors.newSingleThreadScheduledExecutor(
+			new NamedThreadFactory("sct-reactive-circuitbreaker-cleanup", true));
+
 	private Function<String, PolarisCircuitBreakerConfigBuilder.PolarisCircuitBreakerConfiguration> defaultConfiguration =
 			id -> {
 				String[] metadata = PolarisCircuitBreakerUtils.resolveCircuitBreakerId(id);
 				return new PolarisCircuitBreakerConfigBuilder()
 						.namespace(metadata[0])
 						.service(metadata[1])
-						.method(metadata[2])
+						.path(metadata[2])
+						.protocol(metadata[3])
+						.method(metadata[4])
 						.build();
 			};
 
-	private final CircuitBreakAPI circuitBreakAPI;
-
-	private final ConsumerAPI consumerAPI;
-
-	private final ScheduledExecutorService cleanupService = Executors.newSingleThreadScheduledExecutor(
-			new NamedThreadFactory("sct-reactive-circuitbreaker-cleanup", true));
-
 	public ReactivePolarisCircuitBreakerFactory(CircuitBreakAPI circuitBreakAPI, ConsumerAPI consumerAPI,
 			PolarisCircuitBreakerProperties polarisCircuitBreakerProperties) {
 		this.circuitBreakAPI = circuitBreakAPI;
@@ -82,7 +84,7 @@ public ReactiveCircuitBreaker create(String id) {
 	@Override
 	protected PolarisCircuitBreakerConfigBuilder configBuilder(String id) {
 		String[] metadata = PolarisCircuitBreakerUtils.resolveCircuitBreakerId(id);
-		return new PolarisCircuitBreakerConfigBuilder(metadata[0], metadata[1], metadata[2]);
+		return new PolarisCircuitBreakerConfigBuilder(metadata[0], metadata[1], metadata[2], metadata[3], metadata[4]);
 	}
 
 	@Override
@@ -93,6 +95,6 @@ public void configureDefault(
 
 	@Override
 	public void destroy() {
-		ThreadPoolUtils.waitAndStopThreadPools(new ExecutorService[]{cleanupService});
+		ThreadPoolUtils.waitAndStopThreadPools(new ExecutorService[] {cleanupService});
 	}
 }

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/common/PolarisCircuitBreakerConfigBuilder.java

@@ -32,15 +32,21 @@ public class PolarisCircuitBreakerConfigBuilder implements ConfigBuilder<Polaris
 
 	private String service;
 
+	private String protocol;
+
 	private String method;
 
+	private String path;
+
 	public PolarisCircuitBreakerConfigBuilder() {
 
 	}
 
-	public PolarisCircuitBreakerConfigBuilder(String namespace, String service, String method) {
+	public PolarisCircuitBreakerConfigBuilder(String namespace, String service, String path, String protocol, String method) {
 		this.namespace = namespace;
 		this.service = service;
+		this.path = path;
+		this.protocol = protocol;
 		this.method = method;
 	}
 
@@ -54,17 +60,29 @@ public PolarisCircuitBreakerConfigBuilder service(String service) {
 		return this;
 	}
 
+	public PolarisCircuitBreakerConfigBuilder protocol(String protocol) {
+		this.protocol = protocol;
+		return this;
+	}
+
 	public PolarisCircuitBreakerConfigBuilder method(String method) {
 		this.method = method;
 		return this;
 	}
 
+	public PolarisCircuitBreakerConfigBuilder path(String path) {
+		this.path = path;
+		return this;
+	}
+
 	@Override
 	public PolarisCircuitBreakerConfiguration build() {
 		PolarisCircuitBreakerConfiguration conf = new PolarisCircuitBreakerConfiguration();
 		conf.setNamespace(namespace);
 		conf.setService(service);
+		conf.setProtocol(protocol);
 		conf.setMethod(method);
+		conf.setPath(path);
 		return conf;
 	}
 
@@ -78,8 +96,12 @@ public static class PolarisCircuitBreakerConfiguration {
 
 		private String service;
 
+		private String protocol;
+
 		private String method;
 
+		private String path;
+
 		public String getNamespace() {
 			return namespace;
 		}
@@ -96,6 +118,14 @@ public void setService(String service) {
 			this.service = service;
 		}
 
+		public String getProtocol() {
+			return protocol;
+		}
+
+		public void setProtocol(String protocol) {
+			this.protocol = protocol;
+		}
+
 		public String getMethod() {
 			return method;
 		}
@@ -104,6 +134,14 @@ public void setMethod(String method) {
 			this.method = method;
 		}
 
+		public String getPath() {
+			return path;
+		}
+
+		public void setPath(String path) {
+			this.path = path;
+		}
+
 		public String getSourceNamespace() {
 			return sourceNamespace;
 		}

spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/feign/PolarisCircuitBreakerNameResolver.java

@@ -22,13 +22,16 @@
 import java.net.URISyntaxException;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.polaris.api.utils.CollectionUtils;
+import com.tencent.polaris.api.utils.StringUtils;
+import feign.Request;
 import feign.Target;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.springframework.cloud.openfeign.CircuitBreakerNameResolver;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 import static org.springframework.core.annotation.AnnotatedElementUtils.findMergedAnnotation;
 
@@ -47,7 +50,7 @@ public String resolveCircuitBreakerName(String feignClientName, Target<?> target
 		String path = "";
 
 		// Get path in @FeignClient.
-		if (StringUtils.hasText(target.url())) {
+		if (StringUtils.isNotBlank(target.url())) {
 			URI uri = null;
 			try {
 				uri = new URI(target.url());
@@ -60,16 +63,24 @@ public String resolveCircuitBreakerName(String feignClientName, Target<?> target
 			}
 		}
 
-		// Get path in @RequestMapping.
+		// Get path and method in @RequestMapping.
 		RequestMapping requestMapping = findMergedAnnotation(method, RequestMapping.class);
+		String httpMethod = Request.HttpMethod.GET.name();
 		if (requestMapping != null) {
 			path += requestMapping.path().length == 0 ?
 					requestMapping.value().length == 0 ? "" : requestMapping.value()[0] :
 					requestMapping.path()[0];
+
+			RequestMethod[] requestMethods = requestMapping.method();
+			if (CollectionUtils.isNotEmpty(requestMethods)) {
+				httpMethod = requestMethods[0].name();
+			}
 		}
-		return "".equals(path) ?
+
+
+		return StringUtils.isBlank(path) ?
 				MetadataContext.LOCAL_NAMESPACE + "#" + serviceName :
-				MetadataContext.LOCAL_NAMESPACE + "#" + serviceName + "#" + path;
+				MetadataContext.LOCAL_NAMESPACE + "#" + serviceName + "#" + path + "#http#" + httpMethod;
 	}
 
 }