Merge branch '2023' into 2023-gw-ctx-exp

.github/workflows/junit.yml

@@ -10,6 +10,7 @@ on:
       - 2020
       - hoxton
       - greenwich
+      - release/*
   pull_request:
     branches:
       - 2024
@@ -19,6 +20,7 @@ on:
       - 2020
       - hoxton
       - greenwich
+      - release/*
 
 jobs:
   set-jdks:

.github/workflows/license-checker.yml

@@ -10,6 +10,7 @@ on:
       - 2020
       - hoxton
       - greenwich
+      - release/*
   pull_request:
     branches:
       - 2024
@@ -19,6 +20,7 @@ on:
       - 2020
       - hoxton
       - greenwich
+      - release/*
 jobs:
   check-license:
     runs-on: ubuntu-latest

.github/workflows/snapshot.yml

@@ -10,6 +10,7 @@ on:
       - 2020
       - hoxton
       - greenwich
+      - release/*
 
 jobs:
   check-snapshot:

CHANGELOG.md

@@ -1,62 +1,4 @@
 # Change Log
 ---
 
-- [fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5.](https://github.com/Tencent/spring-cloud-tencent/pull/1239)
+- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1564)
-- [feat: support lossless online and offline](https://github.com/Tencent/spring-cloud-tencent/pull/1254)
-- [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256)
-- [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260)
-- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262)
-- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263)
-- [refactor:let the configuration SDK context stand alone.](https://github.com/Tencent/spring-cloud-tencent/pull/1266)
-- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
-- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274)
-- [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1279)
-- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1297)
-- [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1310)
-- [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1312)
-- [fix:fix the ratelimit bug for 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1316)
-- [fix:update spring boot version](https://github.com/Tencent/spring-cloud-tencent/pull/1333)
-- [feat:add scg-mvc example](https://github.com/Tencent/spring-cloud-tencent/pull/1367)
-- [feat:add zero protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1408)
-- [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1409)
-- [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1410)
-- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1411)
-- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1412)
-- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1413)
-- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1414)
-- [fix: move ConditionalOnTsfEnabled to spring-cloud-tencent-commons and fix PolarisInetUtilsAutoConfiguration.](https://github.com/Tencent/spring-cloud-tencent/pull/1415)
-- [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1416)
-- [feat:support consul config data. ](https://github.com/Tencent/spring-cloud-tencent/pull/1417)
-- [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1419)
-- [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1420)
-- [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1421)
-- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1422)
-- [fix: fix TSF context bootstrap configuration](https://github.com/Tencent/spring-cloud-tencent/pull/1424)
-- [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1426)
-- [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1431)
-- [feat:upgrade api circuit breaker.](https://github.com/Tencent/spring-cloud-tencent/pull/1442)
-- [feat: support lossless config from console & support warmup.](https://github.com/Tencent/spring-cloud-tencent/pull/1445)
-- [feat:add admin http handler.](https://github.com/Tencent/spring-cloud-tencent/pull/1450)
-- [feat:upgrade spring cloud 2023 version.](https://github.com/Tencent/spring-cloud-tencent/pull/1451)
-- [feat:support concurrency rate limit.](https://github.com/Tencent/spring-cloud-tencent/pull/1455)
-- [feat:support auth.](https://github.com/Tencent/spring-cloud-tencent/pull/1479)
-- [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1480)
-- [feat:support smooth upgrade from tsf.](https://github.com/Tencent/spring-cloud-tencent/pull/1482)
-- [fix:fix caller disposable metadata handle when using tracing.](https://github.com/Tencent/spring-cloud-tencent/pull/1483)
-- [refactor:update registry status.](https://github.com/Tencent/spring-cloud-tencent/pull/1484)
-- [feat:support polaris route for gateway mvc.](https://github.com/Tencent/spring-cloud-tencent/pull/1493)
-- [feat: implement circuit breaker in enhance plugin, support listen config group, support refresh single config in refresh_context mode.](https://github.com/Tencent/spring-cloud-tencent/pull/1501)
-- [feat:support polaris event.](https://github.com/Tencent/spring-cloud-tencent/pull/1502)
-- [feat:support circuit breaker metrics reporting.](https://github.com/Tencent/spring-cloud-tencent/pull/1503)
-- [feat: support gateway context, feign eager-load support default value.](https://github.com/Tencent/spring-cloud-tencent/pull/1504)
-- [feat:use polaris-all for shading third-party dependencies.](https://github.com/Tencent/spring-cloud-tencent/pull/1505)
-- [feat:support default instance circuit breaker rule.](https://github.com/Tencent/spring-cloud-tencent/pull/1506)
-- [docs:update JDK version configuration in GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1507)
-- [fix: fix count circuit breaker in gateway & return 404 when context api does not match.](https://github.com/Tencent/spring-cloud-tencent/pull/1509)
-- [fix:fix watch tsf config, fix bean refresh with RefreshScope and ConfigurationProperties.](https://github.com/Tencent/spring-cloud-tencent/pull/1512)
-- [docs:simplify GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1513)
-- [feat: support config event.](https://github.com/Tencent/spring-cloud-tencent/pull/1535)
-- [feat:support stat and event report with service discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1537)
-- [fix: update EnhancedRequestContext toString method.](https://github.com/Tencent/spring-cloud-tencent/pull/1546)
-- [docs: update GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1556)
-- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1564)

changes/changes-2.0.1.0.md

@@ -0,0 +1,62 @@
+# Change Log
+---
+
+- [fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5.](https://github.com/Tencent/spring-cloud-tencent/pull/1239)
+- [feat: support lossless online and offline](https://github.com/Tencent/spring-cloud-tencent/pull/1254)
+- [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256)
+- [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260)
+- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262)
+- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263)
+- [refactor:let the configuration SDK context stand alone.](https://github.com/Tencent/spring-cloud-tencent/pull/1266)
+- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
+- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274)
+- [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1279)
+- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1297)
+- [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1310)
+- [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1312)
+- [fix:fix the ratelimit bug for 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1316)
+- [fix:update spring boot version](https://github.com/Tencent/spring-cloud-tencent/pull/1333)
+- [feat:add scg-mvc example](https://github.com/Tencent/spring-cloud-tencent/pull/1367)
+- [feat:add zero protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1408)
+- [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1409)
+- [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1410)
+- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1411)
+- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1412)
+- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1413)
+- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1414)
+- [fix: move ConditionalOnTsfEnabled to spring-cloud-tencent-commons and fix PolarisInetUtilsAutoConfiguration.](https://github.com/Tencent/spring-cloud-tencent/pull/1415)
+- [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1416)
+- [feat:support consul config data. ](https://github.com/Tencent/spring-cloud-tencent/pull/1417)
+- [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1419)
+- [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1420)
+- [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1421)
+- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1422)
+- [fix: fix TSF context bootstrap configuration](https://github.com/Tencent/spring-cloud-tencent/pull/1424)
+- [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1426)
+- [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1431)
+- [feat:upgrade api circuit breaker.](https://github.com/Tencent/spring-cloud-tencent/pull/1442)
+- [feat: support lossless config from console & support warmup.](https://github.com/Tencent/spring-cloud-tencent/pull/1445)
+- [feat:add admin http handler.](https://github.com/Tencent/spring-cloud-tencent/pull/1450)
+- [feat:upgrade spring cloud 2023 version.](https://github.com/Tencent/spring-cloud-tencent/pull/1451)
+- [feat:support concurrency rate limit.](https://github.com/Tencent/spring-cloud-tencent/pull/1455)
+- [feat:support auth.](https://github.com/Tencent/spring-cloud-tencent/pull/1479)
+- [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1480)
+- [feat:support smooth upgrade from tsf.](https://github.com/Tencent/spring-cloud-tencent/pull/1482)
+- [fix:fix caller disposable metadata handle when using tracing.](https://github.com/Tencent/spring-cloud-tencent/pull/1483)
+- [refactor:update registry status.](https://github.com/Tencent/spring-cloud-tencent/pull/1484)
+- [feat:support polaris route for gateway mvc.](https://github.com/Tencent/spring-cloud-tencent/pull/1493)
+- [feat: implement circuit breaker in enhance plugin, support listen config group, support refresh single config in refresh_context mode.](https://github.com/Tencent/spring-cloud-tencent/pull/1501)
+- [feat:support polaris event.](https://github.com/Tencent/spring-cloud-tencent/pull/1502)
+- [feat:support circuit breaker metrics reporting.](https://github.com/Tencent/spring-cloud-tencent/pull/1503)
+- [feat: support gateway context, feign eager-load support default value.](https://github.com/Tencent/spring-cloud-tencent/pull/1504)
+- [feat:use polaris-all for shading third-party dependencies.](https://github.com/Tencent/spring-cloud-tencent/pull/1505)
+- [feat:support default instance circuit breaker rule.](https://github.com/Tencent/spring-cloud-tencent/pull/1506)
+- [docs:update JDK version configuration in GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1507)
+- [fix: fix count circuit breaker in gateway & return 404 when context api does not match.](https://github.com/Tencent/spring-cloud-tencent/pull/1509)
+- [fix:fix watch tsf config, fix bean refresh with RefreshScope and ConfigurationProperties.](https://github.com/Tencent/spring-cloud-tencent/pull/1512)
+- [docs:simplify GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1513)
+- [feat: support config event.](https://github.com/Tencent/spring-cloud-tencent/pull/1535)
+- [feat:support stat and event report with service discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1537)
+- [fix: update EnhancedRequestContext toString method.](https://github.com/Tencent/spring-cloud-tencent/pull/1546)
+- [docs: update GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1556)
+- [fix: fix javaagent ratelimit pb method not found error](https://github.com/Tencent/spring-cloud-tencent/pull/1569)

pom.xml

@@ -90,7 +90,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.1.0-2023.0.3-SNAPSHOT</revision>
+		<revision>2.0.2.0-2023.0.3-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>6.1.14</spring.framework.version>

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java

@@ -131,7 +131,7 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 				response.getHeaders()
 						.add(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc());
 				// set trace span
-				RateLimitUtils.reportTrace(assemblyAPI, quotaResponse.getActiveRule().getId().getValue());
+				RateLimitUtils.reportTrace(assemblyAPI, quotaResponse.getActiveRuleId());
 				if (Objects.nonNull(quotaResponse.getActiveRule())) {
 					try {
 						String encodedActiveRuleName = URLEncoder.encode(

spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java

@@ -118,7 +118,7 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 				// set flow control to header
 				response.addHeader(HeaderConstant.INTERNAL_CALLEE_RET_STATUS, RetStatus.RetFlowControl.getDesc());
 				// set trace span
-				RateLimitUtils.reportTrace(assemblyAPI, quotaResponse.getActiveRule().getId().getValue());
+				RateLimitUtils.reportTrace(assemblyAPI, quotaResponse.getActiveRuleId());
 				if (Objects.nonNull(quotaResponse.getActiveRule())) {
 					try {
 						String encodedActiveRuleName = URLEncoder.encode(

spring-cloud-tencent-dependencies/pom.xml

@@ -71,10 +71,10 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>2.0.1.0-2023.0.3-SNAPSHOT</revision>
+		<revision>2.0.2.0-2023.0.3-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>2.0.1.0-SNAPSHOT</polaris.version>
+		<polaris.version>2.0.1.0</polaris.version>
 
 		<!-- Dependencies -->
 		<springdoc.version>2.2.0</springdoc.version>

spring-cloud-tencent-examples/tsf-example/consumer-demo/src/main/java/com/tencent/cloud/tsf/demo/consumer/proxy/ProviderDemoService.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name = "provider-demo")
+@FeignClient(name = "${provider.name:provider-demo}")
 public interface ProviderDemoService {
 	@RequestMapping(value = "/echo/{str}", method = RequestMethod.GET)
 	String echo(@PathVariable("str") String str);