reduce coupling to caffeine in favor of guava

We generally prefer caffeine caches, however they have compatibility issues with graalvm-native as well as android codebases.
palantir · Jan 30, 2025 · 5e66e89 · 5e66e89
1 parent 4cbd124
commit 5e66e89
Show file tree

Hide file tree

Showing 23 changed files with 52 additions and 34 deletions.
diff --git a/dialogue-clients/build.gradle b/dialogue-clients/build.gradle
@@ -12,7 +12,6 @@ dependencies {
 
     implementation project(':dialogue-apache-hc5-client')
     implementation project(':dialogue-serde')
-    implementation 'com.github.ben-manes.caffeine:caffeine'
     implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.google.errorprone:error_prone_annotations'
     implementation 'com.google.guava:guava'

diff --git a/dialogue-core/build.gradle b/dialogue-core/build.gradle
@@ -6,7 +6,6 @@ dependencies {
     api project(':dialogue-target')
     api 'com.palantir.conjure.java.runtime:client-config'
     implementation project(':dialogue-futures')
-    implementation 'com.github.ben-manes.caffeine:caffeine'
     implementation 'com.google.guava:guava'
     implementation 'com.palantir.safe-logging:logger'
     implementation 'com.palantir.safe-logging:preconditions'

diff --git a/...e-core/src/main/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannel.java b/...e-core/src/main/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannel.java
@@ -16,8 +16,8 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.math.IntMath;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/BalancedScoreTracker.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/BalancedScoreTracker.java
@@ -17,8 +17,8 @@
 package com.palantir.dialogue.core;
 
 import com.codahale.metrics.Meter;
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.FutureCallback;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/ChannelToEndpointChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/ChannelToEndpointChannel.java
@@ -16,8 +16,9 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.dialogue.Channel;
 import com.palantir.dialogue.Endpoint;
@@ -27,14 +28,20 @@
 
 final class ChannelToEndpointChannel implements Channel {
 
+    @SuppressWarnings("checkstyle:IllegalType")
     private final LoadingCache<Endpoint, Channel> cache;
 
     ChannelToEndpointChannel(Function<Endpoint, Channel> loader) {
-        this.cache = Caffeine.newBuilder().weakKeys().maximumSize(10_000).build(loader::apply);
+        this.cache = CacheBuilder.newBuilder().weakKeys().maximumSize(10_000).build(new CacheLoader<>() {
+            @Override
+            public Channel load(Endpoint key) {
+                return loader.apply(key);
+            }
+        });
     }
 
     @Override
     public ListenableFuture<Response> execute(Endpoint endpoint, Request request) {
-        return cache.get(endpoint).execute(endpoint, request);
+        return cache.getUnchecked(endpoint).execute(endpoint, request);
     }
 }
diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/Config.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/Config.java
@@ -16,7 +16,7 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.palantir.conjure.java.client.config.ClientConfiguration;
 import com.palantir.conjure.java.client.config.ClientConfiguration.ClientQoS;
 import com.palantir.logsafe.DoNotLog;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/DeprecationWarningChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/DeprecationWarningChannel.java
@@ -17,9 +17,9 @@
 package com.palantir.dialogue.core;
 
 import com.codahale.metrics.Meter;
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Suppliers;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.dialogue.Endpoint;
@@ -47,8 +47,10 @@
 final class DeprecationWarningChannel implements EndpointChannel {
     private static final SafeLogger log = SafeLoggerFactory.get(DeprecationWarningChannel.class);
     // Static cache avoids poor interactions with the jaxrs shim and consumers which recreate clients too aggressively.
+    @SuppressWarnings("checkstyle:IllegalType")
     private static final Cache<LoggingRateLimiterKey, Object> loggingRateLimiter =
-            Caffeine.newBuilder().expireAfterWrite(Duration.ofMinutes(1)).build();
+            CacheBuilder.newBuilder().expireAfterWrite(Duration.ofMinutes(1)).build();
+
     private static final Object SENTINEL = new Object();
 
     private final EndpointChannel delegate;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/DialogueChannel.java
@@ -17,10 +17,11 @@
 package com.palantir.dialogue.core;
 
 import com.codahale.metrics.Meter;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import com.github.benmanes.caffeine.cache.LoadingCache;
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.errorprone.annotations.CheckReturnValue;
@@ -289,17 +290,23 @@ private static ImmutableList<LimitedChannel> createHostChannels(
          * may or may not be designed to be reused across reloads, and we aim to be more precise with state that is
          * kept across uri changes.
          */
+        @SuppressWarnings("checkstyle:IllegalType")
         private record EndpointChannelState(LoadingCache<Endpoint, ChannelState> cache) {
             private static final ChannelState.Key<EndpointChannelState> KEY =
                     new ChannelState.Key<>(EndpointChannelState.class, EndpointChannelState::create);
 
             ChannelState get(Endpoint endpoint) {
-                return cache.get(endpoint);
+                return cache.getUnchecked(endpoint);
             }
 
             private static EndpointChannelState create() {
                 return new EndpointChannelState(
-                        Caffeine.newBuilder().weakKeys().maximumSize(10_000).build(_key -> new ChannelState()));
+                        CacheBuilder.newBuilder().weakKeys().maximumSize(10_000).build(new CacheLoader<>() {
+                            @Override
+                            public ChannelState load(Endpoint _key) {
+                                return new ChannelState();
+                            }
+                        }));
             }
         }
 

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/HostMetricsChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/HostMetricsChannel.java
@@ -16,7 +16,7 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.conjure.java.client.config.HostEventsSink;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/NodeSelectionStrategyChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/NodeSelectionStrategyChannel.java
@@ -16,8 +16,8 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/...e/src/main/java/com/palantir/dialogue/core/PinUntilErrorNodeSelectionStrategyChannel.java b/...e/src/main/java/com/palantir/dialogue/core/PinUntilErrorNodeSelectionStrategyChannel.java
@@ -17,8 +17,8 @@
 package com.palantir.dialogue.core;
 
 import com.codahale.metrics.Meter;
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/StickyEndpointChannels.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/StickyEndpointChannels.java
@@ -16,9 +16,9 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.palantir.dialogue.Channel;

diff --git a/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java b/dialogue-core/src/main/java/com/palantir/dialogue/core/TimingEndpointChannel.java
@@ -17,8 +17,8 @@
 package com.palantir.dialogue.core;
 
 import com.codahale.metrics.Timer;
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.base.Suppliers;
+import com.google.common.base.Ticker;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.RateLimiter;

diff --git a/...re/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java b/...re/src/test/java/com/palantir/dialogue/core/BalancedNodeSelectionStrategyChannelTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/HostMetricsChannelTest.java
@@ -20,7 +20,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
 import com.palantir.conjure.java.client.config.ClientConfiguration;

diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/NodeSelectionStrategyChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/NodeSelectionStrategyChannelTest.java
@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.palantir.dialogue.Request;

diff --git a/...c/test/java/com/palantir/dialogue/core/PinUntilErrorNodeSelectionStrategyChannelTest.java b/...c/test/java/com/palantir/dialogue/core/PinUntilErrorNodeSelectionStrategyChannelTest.java
@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/StickyEndpointChannelsTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/StickyEndpointChannelsTest.java
@@ -18,6 +18,7 @@
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
@@ -57,7 +58,12 @@ class StickyEndpointChannelsTest {
     private StickyEndpointChannels.Builder builder() {
         return StickyEndpointChannels.builder()
                 .random(new Random(11))
-                .ticker(ticker::getAndIncrement)
+                .ticker(new Ticker() {
+                    @Override
+                    public long read() {
+                        return ticker.getAndIncrement();
+                    }
+                })
                 .taggedMetricRegistry(new DefaultTaggedMetricRegistry())
                 .channelName("channelName");
     }

diff --git a/dialogue-core/src/test/java/com/palantir/dialogue/core/TimingEndpointChannelTest.java b/dialogue-core/src/test/java/com/palantir/dialogue/core/TimingEndpointChannelTest.java
@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 import com.codahale.metrics.Timer;
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.MultimapBuilder;
 import com.google.common.util.concurrent.Futures;

diff --git a/dialogue-jmh/src/main/java/com/palantir/dialogue/core/NodeSelectionBenchmark.java b/dialogue-jmh/src/main/java/com/palantir/dialogue/core/NodeSelectionBenchmark.java
@@ -16,7 +16,7 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
+import com.google.common.base.Ticker;
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/dialogue-serde/build.gradle b/dialogue-serde/build.gradle
@@ -24,7 +24,6 @@ dependencies {
     implementation 'com.palantir.conjure.java:conjure-lib'
     implementation 'com.palantir.safe-logging:logger'
     implementation 'com.palantir.safe-logging:safe-logging'
-    implementation 'com.github.ben-manes.caffeine:caffeine'
 
     testImplementation project(':dialogue-test-common')
     testImplementation project(':dialogue-example')

diff --git a/simulation/src/main/java/com/palantir/dialogue/core/Simulation.java b/simulation/src/main/java/com/palantir/dialogue/core/Simulation.java
@@ -16,7 +16,6 @@
 
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.google.common.util.concurrent.ListeningScheduledExecutorService;
 import com.palantir.logsafe.logger.SafeLogger;
 import com.palantir.logsafe.logger.SafeLoggerFactory;
@@ -45,7 +44,7 @@ final class Simulation {
         this.listenableExecutor = new ExternalDeterministicScheduler(deterministicExecutor, ticker);
     }
 
-    public Ticker clock() {
+    public TestCaffeineTicker clock() {
         return ticker; // read only!
     }
 

diff --git a/simulation/src/main/java/com/palantir/dialogue/core/TestCaffeineTicker.java b/simulation/src/main/java/com/palantir/dialogue/core/TestCaffeineTicker.java
@@ -15,12 +15,12 @@
  */
 package com.palantir.dialogue.core;
 
-import com.github.benmanes.caffeine.cache.Ticker;
 import com.palantir.logsafe.SafeArg;
 import com.palantir.logsafe.exceptions.SafeIllegalStateException;
 import java.time.Duration;
 
-final class TestCaffeineTicker implements Ticker {
+final class TestCaffeineTicker extends com.google.common.base.Ticker
+        implements com.github.benmanes.caffeine.cache.Ticker {
     private long nanos = 0;
 
     @Override