release v1.2.1-x

Author: yanhom1314

core/src/main/java/org/dromara/dynamictp/core/notifier/chain/filter/SilentCheckFilter.java

@@ -54,8 +54,13 @@ public void doFilter(BaseNotifyCtx context, Invoker<BaseNotifyCtx> nextInvoker)
     }
 
     protected boolean isSilent(BaseNotifyCtx context) {
-        ExecutorWrapper executorWrapper = context.getExecutorWrapper();
+        // silence period <= 0 indicates that no silence check will be conducted.
         NotifyItem notifyItem = context.getNotifyItem();
+        if (notifyItem.getSilencePeriod() <= 0) {
+            return false;
+        }
+
+        ExecutorWrapper executorWrapper = context.getExecutorWrapper();
         String lockKey = executorWrapper.getThreadPoolName();
         Lock lock = LOCK_MAP.computeIfAbsent(lockKey, k -> new ReentrantLock());
 

dependencies/pom.xml

@@ -12,7 +12,7 @@
     <url>https://github.com/yanhom1314/dynamic-tp</url>
 
     <properties>
-        <revision>1.2.1-beta-x</revision>
+        <revision>1.2.1-x</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <maven.compiler.source>17</maven.compiler.source>

extension/extension-limiter-redis/src/main/java/org/dromara/dynamictp/extension/limiter/redis/ratelimiter/RedisRateLimiter.java

@@ -56,13 +56,13 @@ public interface RedisRateLimiter<T> {
     String[] getArgs(String key, long windowSize, int limit);
 
     /**
-     * check.
+     * Acquires permission of an invocation only if it is available at the time of invoking.
      *
      * @param name the key
      * @param interval the interval
      * @param limit the limit
      * @return the result
      */
-    boolean check(String name, long interval, int limit);
+    boolean tryPass(String name, long interval, int limit);
 
 }

extension/extension-limiter-redis/src/main/java/org/dromara/dynamictp/extension/limiter/redis/ratelimiter/RedisRateLimiterNotifyFilter.java

@@ -18,6 +18,7 @@
 package org.dromara.dynamictp.extension.limiter.redis.ratelimiter;
 
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.dynamictp.common.entity.NotifyItem;
 import org.dromara.dynamictp.common.pattern.filter.Invoker;
 import org.dromara.dynamictp.core.notifier.chain.filter.NotifyFilter;
 import org.dromara.dynamictp.core.notifier.context.BaseNotifyCtx;
@@ -45,13 +46,21 @@ public int getOrder() {
     }
 
     @Override
-    public void doFilter(BaseNotifyCtx context, Invoker<BaseNotifyCtx> nextFilter) {
-        String notifyName = context.getExecutorWrapper().getThreadPoolName() + "#" + context.getNotifyItemEnum().getValue();
-        int silencePeriod = context.getNotifyItem().getSilencePeriod();
-        int clusterLimit = context.getNotifyItem().getClusterLimit();
-        boolean checkResult = redisScriptRateLimiter.check(notifyName, silencePeriod, clusterLimit);
-        if (checkResult) {
-            nextFilter.invoke(context);
+    public void doFilter(BaseNotifyCtx context, Invoker<BaseNotifyCtx> nextInvoker) {
+        if (tryPass(context)) {
+            nextInvoker.invoke(context);
         }
     }
+
+    private boolean tryPass(BaseNotifyCtx context) {
+        // silence period <= 0 indicates that no rate limit check is required.
+        NotifyItem notifyItem = context.getNotifyItem();
+        if (notifyItem.getSilencePeriod() <= 0) {
+            return true;
+        }
+        String notifyName = context.getExecutorWrapper().getThreadPoolName() + "#" + context.getNotifyItemEnum().getValue();
+        int silencePeriod = notifyItem.getSilencePeriod();
+        int clusterLimit = notifyItem.getClusterLimit();
+        return redisScriptRateLimiter.tryPass(notifyName, silencePeriod, clusterLimit);
+    }
 }

extension/extension-limiter-redis/src/main/java/org/dromara/dynamictp/extension/limiter/redis/ratelimiter/SlidingWindowRateLimiter.java

@@ -62,7 +62,7 @@ public String[] getArgs(String key, long windowSize, int limit) {
     }
 
     @Override
-    public boolean check(String name, long interval, int limit) {
+    public boolean tryPass(String name, long interval, int limit) {
         try {
             val res = isAllowed(name, interval, limit);
             if (CollectionUtils.isEmpty(res)) {

pom.xml

@@ -15,7 +15,7 @@
     <url>https://github.com/yanhom1314/dynamic-tp</url>
 
     <properties>
-        <revision>1.2.1-beta-x</revision>
+        <revision>1.2.1-x</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <maven.compiler.source>17</maven.compiler.source>

test/test-extension/test-extension-limiter-redis/src/test/java/org/dromara/dynamictp/test/extension/limiter/redis/RedisRateLimiterTest.java

@@ -43,7 +43,7 @@ class RedisRateLimiterTest {
     void testRedisRateLimiterCheck() throws InterruptedException {
         for (int i = 0; i < 6; i++) {
             TimeUnit.SECONDS.sleep(1);
-            val res = redisScriptRateLimiter.check("rate-limiter", 120, 5);
+            val res = redisScriptRateLimiter.tryPass("rate-limiter", 120, 5);
             System.out.println(res);
         }
     }