From b5fb33e21e9ab0f44e8a3c29f204c246468e3b26 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Thu, 23 Feb 2023 12:27:56 -0600
Subject: [PATCH] Remove unused metrics

---
 .../textsecuregcm/limits/LockingRateLimiter.java   | 14 ++------------
 .../textsecuregcm/limits/StaticRateLimiter.java    | 14 ++------------
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/LockingRateLimiter.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/LockingRateLimiter.java
index 42820ad3a..c755f83a4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/LockingRateLimiter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/LockingRateLimiter.java
@@ -5,27 +5,20 @@
 
 package org.whispersystems.textsecuregcm.limits;
 
-import static com.codahale.metrics.MetricRegistry.name;
+import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
 
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.SharedMetricRegistries;
 import io.lettuce.core.SetArgs;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
 import java.time.Duration;
 import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
-import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
-import org.whispersystems.textsecuregcm.util.Constants;
 
 public class LockingRateLimiter extends StaticRateLimiter {
 
   private static final RateLimitExceededException REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION
       = new RateLimitExceededException(Duration.ZERO, true);
 
-  @Deprecated
-  private final Meter meter;
   private final Counter counter;
 
 
@@ -34,15 +27,12 @@ public class LockingRateLimiter extends StaticRateLimiter {
       final RateLimiterConfig config,
       final FaultTolerantRedisCluster cacheCluster) {
     super(name, config, cacheCluster);
-    final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
-    this.meter = metricRegistry.meter(name(getClass(), name, "locked"));
-    this.counter = Metrics.counter(MetricsUtil.name(getClass(), "locked"), "name", name);
+    this.counter = Metrics.counter(name(getClass(), "locked"), "name", name);
   }
 
   @Override
   public void validate(final String key, final int amount) throws RateLimitExceededException {
     if (!acquireLock(key)) {
-      meter.mark();
       counter.increment();
       throw REUSABLE_RATE_LIMIT_EXCEEDED_EXCEPTION;
     }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java b/service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java
index 150495190..22d6058c5 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java
@@ -4,12 +4,9 @@
  */
 package org.whispersystems.textsecuregcm.limits;
 
-import static com.codahale.metrics.MetricRegistry.name;
 import static java.util.Objects.requireNonNull;
+import static org.whispersystems.textsecuregcm.metrics.MetricsUtil.name;
 
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.SharedMetricRegistries;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
@@ -18,9 +15,7 @@ import java.time.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.whispersystems.textsecuregcm.controllers.RateLimitExceededException;
-import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
 import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisCluster;
-import org.whispersystems.textsecuregcm.util.Constants;
 import org.whispersystems.textsecuregcm.util.SystemMapper;
 
 public class StaticRateLimiter implements RateLimiter {
@@ -34,19 +29,15 @@ public class StaticRateLimiter implements RateLimiter {
   protected final FaultTolerantRedisCluster cacheCluster;
 
   private final Counter counter;
-  @Deprecated
-  private final Meter meter;
 
   public StaticRateLimiter(
       final String name,
       final RateLimiterConfig config,
       final FaultTolerantRedisCluster cacheCluster) {
-    final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
     this.name = requireNonNull(name);
     this.config = requireNonNull(config);
     this.cacheCluster = requireNonNull(cacheCluster);
-    this.meter = metricRegistry.meter(name(getClass(), name, "exceeded"));
-    this.counter = Metrics.counter(MetricsUtil.name(getClass(), "exceeded"), "name", name);
+    this.counter = Metrics.counter(name(getClass(), "exceeded"), "name", name);
   }
 
   @Override
@@ -55,7 +46,6 @@ public class StaticRateLimiter implements RateLimiter {
     if (bucket.add(amount)) {
       setBucket(key, bucket);
     } else {
-      meter.mark();
       counter.increment();
       throw new RateLimitExceededException(bucket.getTimeUntilSpaceAvailable(amount), true);
     }