From b1f6ec908d26fbc27582fd492026841954f6a1f5 Mon Sep 17 00:00:00 2001 From: Haotian Zhang Date: Mon, 19 May 2025 21:12:30 +0800 Subject: [PATCH] fix: use getActiveRuleId method to fix javaagent ratelimit pb method not found error. (#1575) Co-authored-by: evelynwei <984178308@qq.com> --- CHANGELOG.md | 3 ++- .../polaris/ratelimit/filter/QuotaCheckReactiveFilter.java | 2 +- .../polaris/ratelimit/filter/QuotaCheckServletFilter.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cd39a4d07..e6957eb1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,4 +35,5 @@ - [docs:simplify GitHub Actions.](https://github.com/Tencent/spring-cloud-tencent/pull/1553) - [feat: support config event.](https://github.com/Tencent/spring-cloud-tencent/pull/1558) - [feat:support stat and event report with service discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1560) -- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1561) \ No newline at end of file +- [fix: add gateway context config example.](https://github.com/Tencent/spring-cloud-tencent/pull/1561) +- [fix: use getActiveRuleId method to fix javaagent ratelimit pb method not found error.](https://github.com/Tencent/spring-cloud-tencent/pull/1575) diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java index 07a13e6e2..f729d2b34 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java +++ b/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( diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java index a93d26686..2e1dc1061 100644 --- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java +++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java @@ -119,7 +119,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(