Remove Guava dependency by copying the RateLimiter.

Author: vy

appender-fatjar/pom.xml

@@ -48,10 +48,6 @@
                             <pattern>org.apache.commons.pool2</pattern>
                             <shadedPattern>${project.groupId}.redis.appender.commons.pool2</shadedPattern>
                         </relocation>
-                        <relocation>
-                            <pattern>com.google</pattern>
-                            <shadedPattern>${project.groupId}.redis.appender.google</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>com.twitter</pattern>
                             <shadedPattern>${project.groupId}.redis.appender.twitter</shadedPattern>

appender/pom.xml

@@ -20,11 +20,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.twitter</groupId>
             <artifactId>jsr166e</artifactId>

appender/src/main/java/com/vlkan/log4j2/redis/appender/RedisThrottler.java

@@ -1,6 +1,6 @@
 package com.vlkan.log4j2.redis.appender;
 
-import com.google.common.util.concurrent.RateLimiter;
+import com.vlkan.log4j2.redis.appender.guava.GuavaRateLimiter;
 
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.JMX;
@@ -17,8 +17,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.google.common.base.MoreObjects.firstNonNull;
-
 class RedisThrottler implements AutoCloseable {
 
     /**
@@ -43,9 +41,9 @@ class RedisThrottler implements AutoCloseable {
 
     private final Thread flushTrigger;
 
-    private final RateLimiter eventRateLimiter;
+    private final GuavaRateLimiter eventRateLimiter;
 
-    private final RateLimiter byteRateLimiter;
+    private final GuavaRateLimiter byteRateLimiter;
 
     private final DebugLogger logger;
 
@@ -66,19 +64,20 @@ class RedisThrottler implements AutoCloseable {
         this.buffer = new ArrayBlockingQueue<>(config.getBufferSize());
         this.batch = new byte[config.getBatchSize()][];
         this.flushTrigger = createFlushTrigger();
-        this.eventRateLimiter = config.getMaxEventCountPerSecond() > 0 ? RateLimiter.create(config.getMaxEventCountPerSecond()) : null;
-        this.byteRateLimiter = config.getMaxByteCountPerSecond() > 0 ? RateLimiter.create(config.getMaxByteCountPerSecond()) : null;
+        this.eventRateLimiter = config.getMaxEventCountPerSecond() > 0 ? GuavaRateLimiter.create(config.getMaxEventCountPerSecond()) : null;
+        this.byteRateLimiter = config.getMaxByteCountPerSecond() > 0 ? GuavaRateLimiter.create(config.getMaxByteCountPerSecond()) : null;
         this.logger = new DebugLogger(RedisThrottler.class, debugEnabled);
         this.jmxBeanName = createJmxBeanName();
     }
 
     private ObjectName createJmxBeanName() {
-        String beanName = firstNonNull(
-                config.getJmxBeanName(),
-                String.format(
-                        "org.apache.logging.log4j2:type=%s,component=Appenders,name=%s,subtype=RedisThrottler",
-                        appender.getConfig().getLoggerContext().getName(),
-                        appender.getName()));
+        String beanName = config.getJmxBeanName();
+        if (beanName == null) {
+            beanName = String.format(
+                    "org.apache.logging.log4j2:type=%s,component=Appenders,name=%s,subtype=RedisThrottler",
+                    appender.getConfig().getLoggerContext().getName(),
+                    appender.getName());
+        }
         try {
             return new ObjectName(beanName);
         } catch (MalformedObjectNameException error) {

appender/src/main/java/com/vlkan/log4j2/redis/appender/RedisThrottlerInternalJmxBean.java

@@ -1,6 +1,5 @@
 package com.vlkan.log4j2.redis.appender;
 
-import com.google.common.base.MoreObjects;
 import com.twitter.jsr166e.LongAdder;
 
 public class RedisThrottlerInternalJmxBean implements RedisThrottlerJmxBean {
@@ -95,16 +94,15 @@ public void incrementRedisPushSuccessCount(int increment) {
 
     @Override
     public String toString() {
-        return MoreObjects
-                .toStringHelper(this)
-                .add("totalEventCount", totalEventCount.sum())
-                .add("ignoredEventCount", ignoredEventCount.sum())
-                .add("eventRateLimitFailureCount", eventRateLimitFailureCount.sum())
-                .add("byteRateLimitFailureCount", byteRateLimitFailureCount.sum())
-                .add("unavailableBufferSpaceFailureCount", unavailableBufferSpaceFailureCount.sum())
-                .add("redisPushFailureCount", redisPushFailureCount.sum())
-                .add("redisPushSuccessCount", redisPushSuccessCount.sum())
-                .toString();
+        return "RedisThrottlerInternalJmxBean{" +
+                "totalEventCount=" + totalEventCount.sum() +
+                ", ignoredEventCount=" + ignoredEventCount.sum() +
+                ", eventRateLimitFailureCount=" + eventRateLimitFailureCount.sum() +
+                ", byteRateLimitFailureCount=" + byteRateLimitFailureCount.sum() +
+                ", unavailableBufferSpaceFailureCount=" + unavailableBufferSpaceFailureCount.sum() +
+                ", redisPushFailureCount=" + redisPushFailureCount.sum() +
+                ", redisPushSuccessCount=" + redisPushSuccessCount.sum() +
+                '}';
     }
 
 }

appender/src/main/java/com/vlkan/log4j2/redis/appender/guava/GuavaLongMath.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2007 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vlkan.log4j2.redis.appender.guava;
+
+public enum GuavaLongMath {;
+
+    /**
+     * Returns the sum of {@code a} and {@code b} unless it would overflow or underflow in which case
+     * {@code Long.MAX_VALUE} or {@code Long.MIN_VALUE} is returned, respectively.
+     */
+    public static long saturatedAdd(long a, long b) {
+        long naiveSum = a + b;
+        if ((a ^ b) < 0 | (a ^ naiveSum) >= 0) {
+            // If a and b have different signs or a has the same sign as the result then there was no
+            // overflow, return.
+            return naiveSum;
+        }
+        // we did over/under flow, if the sign is negative we should return MAX otherwise MIN
+        return Long.MAX_VALUE + ((naiveSum >>> (Long.SIZE - 1)) ^ 1);
+    }
+
+}