diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index f975163435..e0be0d4c02 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -9,6 +9,7 @@ on: - 2020.0 - hoxton - greenwich + - release/* pull_request: branches: - 2023.0 @@ -17,6 +18,7 @@ on: - 2020.0 - hoxton - greenwich + - release/* jobs: codecov: diff --git a/.github/workflows/junit_test.yml b/.github/workflows/junit_test.yml index 0ecdb273b9..173c4b7d1c 100644 --- a/.github/workflows/junit_test.yml +++ b/.github/workflows/junit_test.yml @@ -10,12 +10,14 @@ on: - 2021.0 - 2020.0 - greenwich + - release/* pull_request: branches: - hoxton - 2021.0 - 2020.0 - greenwich + - release/* jobs: junit: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 77a3333bc1..a33755107a 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -9,6 +9,7 @@ on: - 2020.0 - hoxton - greenwich + - release/* pull_request: branches: - 2023.0 @@ -17,6 +18,7 @@ on: - 2020.0 - hoxton - greenwich + - release/* jobs: check-license: runs-on: ubuntu-latest diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 3a9d462a95..6832a60590 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -9,6 +9,7 @@ on: - 2020.0 - hoxton - greenwich + - release/* jobs: check-snapshot: diff --git a/pom.xml b/pom.xml index 9c36e0fddf..dc661f5695 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 2.0.0.0-Hoxton.SR12 + 2.0.0.1-Hoxton.SR12 5.2.25.RELEASE diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 404ef14d6b..e95c8ff6b2 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,7 +70,7 @@ - 2.0.0.0-Hoxton.SR12 + 2.0.0.1-Hoxton.SR12 2.0.0.0 diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/java/com/tencent/cloud/quickstart/caller/circuitbreaker/CircuitBreakerController.java b/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/java/com/tencent/cloud/quickstart/caller/circuitbreaker/CircuitBreakerController.java index 9079800258..927818069f 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/java/com/tencent/cloud/quickstart/caller/circuitbreaker/CircuitBreakerController.java +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/java/com/tencent/cloud/quickstart/caller/circuitbreaker/CircuitBreakerController.java @@ -18,12 +18,10 @@ package com.tencent.cloud.quickstart.caller.circuitbreaker; import com.tencent.cloud.common.metadata.MetadataContext; -import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory; -import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -64,9 +62,6 @@ public class CircuitBreakerController { @Autowired private CircuitBreakerFactory circuitBreakerFactory; - @Autowired - private ReactiveCircuitBreakerFactory reactiveCircuitBreakerFactory; - @Autowired private WebClient.Builder webClientBuilder; @@ -166,23 +161,4 @@ public ResponseEntity circuitBreakRestTemplateFallbackFromCode() { return new ResponseEntity<>(httpClientErrorException.getResponseBodyAsString(), httpClientErrorException.getStatusCode()); } } - - /** - * Get information of callee. - * @return information of callee - */ - @GetMapping("/webclient") - public Mono webclient() { - return webClientBuilder - .build() - .get() - .uri("/quickstart/callee/circuitBreak") - .retrieve() - .bodyToMono(String.class) - .transform(it -> - reactiveCircuitBreakerFactory - .create(MetadataContext.LOCAL_NAMESPACE + "QuickstartCalleeService#/quickstart/callee/circuitBreak#http#GET") - .run(it, throwable -> Mono.just("fallback: trigger the refuse for service callee")) - ); - } } diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-zuul-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-zuul-service/src/main/resources/bootstrap.yml index 3f18ce4954..903f6009da 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-zuul-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-zuul-service/src/main/resources/bootstrap.yml @@ -23,3 +23,6 @@ zuul: QuickstartCallerService: serviceId: QuickstartCallerService path: /QuickstartCallerService/** + QuickstartCalleeService: + serviceId: QuickstartCalleeService + path: /QuickstartCalleeService/** diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/zuul/EnhancedZuulPluginRunner.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/zuul/EnhancedZuulPluginRunner.java index 70b2d34fe7..0499c3ac2c 100644 --- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/zuul/EnhancedZuulPluginRunner.java +++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/zuul/EnhancedZuulPluginRunner.java @@ -35,6 +35,8 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import static com.tencent.cloud.common.constant.ContextConstant.Zuul.POLARIS_PRE_ROUTE_TIME; + /** * Polaris circuit breaker implement in Zuul. * @@ -75,6 +77,7 @@ public void run() { enhancedPluginContext.setRequest(enhancedRequestContext); enhancedPluginContext.setOriginRequest(context); enhancedPluginContext.setLocalServiceInstance(pluginRunner.getLocalServiceInstance()); + context.set(POLARIS_PRE_ROUTE_TIME, System.currentTimeMillis()); // Run pre enhanced plugins. pluginRunner.run(EnhancedPluginType.Client.PRE, enhancedPluginContext);