fix: memory cost too many when using wildcard feign calls (#1400)

Co-authored-by: andrew shan <45474304+andrewshan@users.noreply.github.com>
pull/1401/head
Fishtail 3 months ago committed by GitHub
parent 2fbbde4ab0
commit ec6854bd1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -21,3 +21,4 @@
- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1396) - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1396)
- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1397) - [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1397)
- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1398) - [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1398)
- [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1400)

@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -106,6 +107,17 @@ public class QuickstartCalleeController {
return String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port); return String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port);
} }
/**
* Check circuit break.
*
* @return circuit break info
*/
@GetMapping("/circuitBreak/wildcard/{uid}")
public String circuitBreakWildcard(@PathVariable String uid) throws InterruptedException {
LOG.info("Quickstart Callee Service uid {} [{}:{}] is called right.", uid, ip, port);
return String.format("Quickstart Callee Service %s [%s:%s] is called right.", uid, ip, port);
}
@GetMapping("/faultDetect") @GetMapping("/faultDetect")
public String health() { public String health() {
LOG.info("Quickstart Callee Service [{}:{}] is detected right.", ip, port); LOG.info("Quickstart Callee Service [{}:{}] is detected right.", ip, port);

@ -30,6 +30,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -119,6 +120,26 @@ public class QuickstartCalleeController {
return new ResponseEntity<>(String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port), HttpStatus.OK); return new ResponseEntity<>(String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port), HttpStatus.OK);
} }
/**
* Check circuit break.
*
* @return circuit break info
*/
@GetMapping("/circuitBreak/wildcard/{uid}")
public ResponseEntity<String> circuitBreakWildcard(@PathVariable String uid) throws InterruptedException {
if (ifBadGateway) {
LOG.info("Quickstart Callee Service with uid {} [{}:{}] is called wrong.", uid, ip, port);
return new ResponseEntity<>("failed for call quickstart callee service wildcard.", HttpStatus.BAD_GATEWAY);
}
if (ifDelay) {
Thread.sleep(200);
LOG.info("Quickstart Callee Service uid {} [{}:{}] is called slow.", uid, ip, port);
return new ResponseEntity<>(String.format("Quickstart Callee Service [%s:%s] is called slow.", ip, port), HttpStatus.OK);
}
LOG.info("Quickstart Callee Service uid {} [{}:{}] is called right.", uid, ip, port);
return new ResponseEntity<>(String.format("Quickstart Callee Service %s [%s:%s] is called right.", uid, ip, port), HttpStatus.OK);
}
@GetMapping("/setBadGateway") @GetMapping("/setBadGateway")
public String setBadGateway(@RequestParam boolean param) { public String setBadGateway(@RequestParam boolean param) {
this.ifBadGateway = param; this.ifBadGateway = param;

@ -25,6 +25,7 @@ import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory;
import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory; import org.springframework.cloud.client.circuitbreaker.ReactiveCircuitBreakerFactory;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
@ -84,6 +85,24 @@ public class CircuitBreakerController {
return circuitBreakerQuickstartCalleeServiceWithFallback.circuitBreak(); return circuitBreakerQuickstartCalleeServiceWithFallback.circuitBreak();
} }
/**
* Feign circuit breaker with fallback from Polaris.
* @return circuit breaker information of callee
*/
@GetMapping("/feign/fallbackFromPolaris/wildcard/{uid}")
public String circuitBreakFeignFallbackFromPolarisWildcard(@PathVariable String uid) {
return circuitBreakerQuickstartCalleeService.circuitBreakWildcard(uid);
}
/**
* Feign circuit breaker with fallback from Polaris.
* @return circuit breaker information of callee
*/
@GetMapping("/feign/fallbackFromCode/wildcard/{uid}")
public String circuitBreakFeignFallbackFromCodeWildcard(@PathVariable String uid) {
return circuitBreakerQuickstartCalleeServiceWithFallback.circuitBreakWildcard(uid);
}
/** /**
* RestTemplate circuit breaker. * RestTemplate circuit breaker.
* @return circuit breaker information of callee * @return circuit breaker information of callee

@ -19,6 +19,7 @@ package com.tencent.cloud.quickstart.caller.circuitbreaker;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/** /**
* Circuit breaker example callee provider. * Circuit breaker example callee provider.
@ -35,4 +36,12 @@ public interface CircuitBreakerQuickstartCalleeService {
*/ */
@GetMapping("/quickstart/callee/circuitBreak") @GetMapping("/quickstart/callee/circuitBreak")
String circuitBreak(); String circuitBreak();
/**
* Check circuit break with uid.
* @param uid uid variable
* @return circuit break info
*/
@GetMapping("/quickstart/callee/circuitBreak/wildcard/{uid}")
String circuitBreakWildcard(@PathVariable String uid);
} }

@ -31,4 +31,9 @@ public class CircuitBreakerQuickstartCalleeServiceFallback implements CircuitBre
public String circuitBreak() { public String circuitBreak() {
return "fallback: trigger the refuse for service callee."; return "fallback: trigger the refuse for service callee.";
} }
@Override
public String circuitBreakWildcard(String uid) {
return String.format("fallback: trigger the refuse for service callee %s.", uid);
}
} }

@ -19,6 +19,7 @@ package com.tencent.cloud.quickstart.caller.circuitbreaker;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
/** /**
* CircuitBreakerQuickstartCalleeServiceWithFallback. * CircuitBreakerQuickstartCalleeServiceWithFallback.
@ -35,4 +36,12 @@ public interface CircuitBreakerQuickstartCalleeServiceWithFallback {
*/ */
@GetMapping("/quickstart/callee/circuitBreak") @GetMapping("/quickstart/callee/circuitBreak")
String circuitBreak(); String circuitBreak();
/**
* Check circuit break with uid.
* @param uid uid variable
* @return circuit break info
*/
@GetMapping("/circuitBreak/wildcard/{uid}")
String circuitBreakWildcard(@PathVariable String uid);
} }

Loading…
Cancel
Save