self supply

palantir · Mar 7, 2024 · 683c166 · 683c166
1 parent 0af16d2
commit 683c166
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -88,12 +88,12 @@ import com.palantir.tritium.metrics.caffeine.CacheStats;
 TaggedMetricRegistry taggedMetricRegistry = ...
 CacheStats cacheStats = CacheStats.of(taggedMetricRegistry, "unique-cache-name");
 Cache<Integer, String> cache = cacheStats.register(Caffeine.newBuilder()
-        .recordStats(cacheStats.recorder())
+        .recordStats(cacheStats)
         .build());
 
 CacheStats loadingCacheStats = CacheStats.of(taggedMetricRegistry, "unique-loading-cache-name");
 LoadingCache<String, Integer> loadingCache = loadingCacheStats.register(Caffeine.newBuilder()
-        .recordStats(loadingCacheStats.recorder())
+        .recordStats(loadingCacheStats)
         .build(key::length));
 ```
 

diff --git a/tritium-caffeine/src/main/java/com/palantir/tritium/metrics/caffeine/CacheStats.java b/tritium-caffeine/src/main/java/com/palantir/tritium/metrics/caffeine/CacheStats.java
@@ -31,7 +31,7 @@
 import java.util.function.Supplier;
 import org.checkerframework.checker.index.qual.NonNegative;
 
-public final class CacheStats implements StatsCounter {
+public final class CacheStats implements StatsCounter, Supplier<StatsCounter> {
     private final CacheMetrics metrics;
     private final String name;
     private final Counter hitCounter;
@@ -112,8 +112,9 @@ public <K, V> LoadingCache<K, V> register(LoadingCache<K, V> cache) {
         return (LoadingCache<K, V>) register((Cache<K, V>) cache);
     }
 
-    public Supplier<? extends StatsCounter> recorder() {
-        return () -> this;
+    @Override
+    public StatsCounter get() {
+        return this;
     }
 
     @Override

diff --git a/...-caffeine/src/test/java/com/palantir/tritium/metrics/caffeine/CaffeineCacheStatsTest.java b/...-caffeine/src/test/java/com/palantir/tritium/metrics/caffeine/CaffeineCacheStatsTest.java
@@ -214,10 +214,8 @@ void registerCacheWithoutRecordingStatsTagged() {
     @Test
     void registerTaggedMetrics() {
         CacheStats cacheStats = CacheStats.of(taggedMetricRegistry, "test");
-        Cache<Integer, String> cache = cacheStats.register(Caffeine.newBuilder()
-                .recordStats(cacheStats.recorder())
-                .maximumSize(2)
-                .build());
+        Cache<Integer, String> cache = cacheStats.register(
+                Caffeine.newBuilder().recordStats(cacheStats).maximumSize(2).build());
         assertThat(taggedMetricRegistry.getMetrics().keySet())
                 .extracting(MetricName::safeName)
                 .contains(
@@ -264,10 +262,8 @@ void registerTaggedMetrics() {
     @Test
     void registerLoadingTaggedMetrics() {
         CacheStats cacheStats = CacheStats.of(taggedMetricRegistry, "test");
-        LoadingCache<Integer, String> cache = cacheStats.register(Caffeine.newBuilder()
-                .recordStats(cacheStats.recorder())
-                .maximumSize(2)
-                .build(mapping::apply));
+        LoadingCache<Integer, String> cache = cacheStats.register(
+                Caffeine.newBuilder().recordStats(cacheStats).maximumSize(2).build(mapping::apply));
         assertThat(taggedMetricRegistry.getMetrics().keySet())
                 .extracting(MetricName::safeName)
                 .contains(