Merge branch '2021' into 2021-add-context-example

.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,18 +1,4 @@
 # Change Log
 ---
 
-- [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/1490)
-- [feat:support polaris event.](https://github.com/Tencent/spring-cloud-tencent/pull/1494)
-- [feat:support circuit breaker metrics reporting.](https://github.com/Tencent/spring-cloud-tencent/pull/1495)
-- [feat: support gateway context, feign eager-load support default value.](https://github.com/Tencent/spring-cloud-tencent/pull/1496)
-- [feat:use polaris-all for shading third-party dependencies.](https://github.com/Tencent/spring-cloud-tencent/pull/1498)
-- [feat:support default instance circuit breaker rule.](https://github.com/Tencent/spring-cloud-tencent/pull/1499)
-- [fix: fix count circuit breaker in gateway & return 404 when context api does not match.](https://github.com/Tencent/spring-cloud-tencent/pull/1508)
-- [docs:update JDK version configuration in GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1510)
-- [fix:fix watch tsf config, fix bean refresh with RefreshScope and ConfigurationProperties.](https://github.com/Tencent/spring-cloud-tencent/pull/1511)
-- [docs:simplify GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1514)
-- [feat: support config event.](https://github.com/Tencent/spring-cloud-tencent/pull/1532)
-- [feat:support stat and event report with service discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1533)
-- [fix: update EnhancedRequestContext toString method.](https://github.com/Tencent/spring-cloud-tencent/pull/1547)
-- [docs: update GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1554)
 - [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1562)

changes/changes-2.0.1.0.md

@@ -0,0 +1,18 @@
+# Change Log
+---
+
+- [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/1490)
+- [feat:support polaris event.](https://github.com/Tencent/spring-cloud-tencent/pull/1494)
+- [feat:support circuit breaker metrics reporting.](https://github.com/Tencent/spring-cloud-tencent/pull/1495)
+- [feat: support gateway context, feign eager-load support default value.](https://github.com/Tencent/spring-cloud-tencent/pull/1496)
+- [feat:use polaris-all for shading third-party dependencies.](https://github.com/Tencent/spring-cloud-tencent/pull/1498)
+- [feat:support default instance circuit breaker rule.](https://github.com/Tencent/spring-cloud-tencent/pull/1499)
+- [fix: fix count circuit breaker in gateway & return 404 when context api does not match.](https://github.com/Tencent/spring-cloud-tencent/pull/1508)
+- [docs:update JDK version configuration in GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1510)
+- [fix:fix watch tsf config, fix bean refresh with RefreshScope and ConfigurationProperties.](https://github.com/Tencent/spring-cloud-tencent/pull/1511)
+- [docs:simplify GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1514)
+- [feat: support config event.](https://github.com/Tencent/spring-cloud-tencent/pull/1532)
+- [feat:support stat and event report with service discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1533)
+- [fix: update EnhancedRequestContext toString method.](https://github.com/Tencent/spring-cloud-tencent/pull/1547)
+- [docs: update GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1554)
+- [fix: use getActiveRuleId method to fix javaagent ratelimit pb method not found error.](https://github.com/Tencent/spring-cloud-tencent/pull/1572)

pom.xml

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

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

@@ -132,7 +132,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

@@ -120,7 +120,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-2021.0.9-RC2</revision>
+		<revision>2.0.2.0-2021.0.9-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>2.0.1.0-SNAPSHOT</polaris.version>
+		<polaris.version>2.0.1.0</polaris.version>
 
 		<!-- Dependencies -->
 		<bcpkix-jdk18on.version>1.78.1</bcpkix-jdk18on.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);