From 5f5409e34aac1cc77746ac50b77bb950f8a5a3d0 Mon Sep 17 00:00:00 2001 From: simonredfern Date: Wed, 31 Dec 2025 06:06:07 +0100 Subject: [PATCH] call counter prefix --- obp-api/src/main/scala/code/api/constant/constant.scala | 2 +- obp-api/src/main/scala/code/api/util/RateLimitingUtil.scala | 3 ++- obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/obp-api/src/main/scala/code/api/constant/constant.scala b/obp-api/src/main/scala/code/api/constant/constant.scala index ab0756407..4c16f99e9 100644 --- a/obp-api/src/main/scala/code/api/constant/constant.scala +++ b/obp-api/src/main/scala/code/api/constant/constant.scala @@ -129,7 +129,7 @@ object Constant extends MdcLoggable { final val SHOW_USED_CONNECTOR_METHODS: Boolean = APIUtil.getPropsAsBoolValue(s"show_used_connector_methods", false) // Rate Limiting Cache Prefixes - final val CALL_COUNTER_PREFIX = "rl_counter_" + final val CALL_COUNTER_PREFIX = "call_counter_" final val RATE_LIMIT_ACTIVE_PREFIX = "rl_active_" final val RATE_LIMIT_ACTIVE_CACHE_TTL: Int = APIUtil.getPropsValue("rateLimitActive.cache.ttl.seconds", "3600").toInt diff --git a/obp-api/src/main/scala/code/api/util/RateLimitingUtil.scala b/obp-api/src/main/scala/code/api/util/RateLimitingUtil.scala index d5ff5265d..97b501769 100644 --- a/obp-api/src/main/scala/code/api/util/RateLimitingUtil.scala +++ b/obp-api/src/main/scala/code/api/util/RateLimitingUtil.scala @@ -5,6 +5,7 @@ import code.ratelimiting.{RateLimiting, RateLimitingDI} import scala.concurrent.Future import scala.concurrent.ExecutionContext.Implicits.global import code.api.{APIFailureNewStyle, JedisMethod} +import code.api.Constant._ import code.api.cache.Redis import code.api.util.APIUtil.fullBoxOrException import code.api.util.ErrorMessages.TooManyRequests @@ -192,7 +193,7 @@ object RateLimitingUtil extends MdcLoggable { RateLimitCounterState(calls, normalizedTtl, status) } - private def createUniqueKey(consumerKey: String, period: LimitCallPeriod) = "rl_counter_" + consumerKey + "_" + RateLimitingPeriod.toString(period) + private def createUniqueKey(consumerKey: String, period: LimitCallPeriod) = CALL_COUNTER_PREFIX + consumerKey + "_" + RateLimitingPeriod.toString(period) private def underConsumerLimits(consumerKey: String, period: LimitCallPeriod, limit: Long): Boolean = { if (useConsumerLimits) { diff --git a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala index c03f6888b..2bb695137 100644 --- a/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala +++ b/obp-api/src/main/scala/code/api/v6_0_0/APIMethods600.scala @@ -1059,7 +1059,7 @@ trait APIMethods600 { CacheNamespacesJsonV600( namespaces = List( CacheNamespaceJsonV600( - prefix = "rl_counter_", + prefix = "call_counter_", description = "Rate limiting counters per consumer and time period", ttl_seconds = "varies", category = "Rate Limiting",