diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java index 0d863b595..5c76fef29 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/redis/FaultTolerantRedisCluster.java @@ -1,8 +1,6 @@ package org.whispersystems.textsecuregcm.redis; -import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.SharedMetricRegistries; -import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import io.github.resilience4j.circuitbreaker.CircuitBreaker; import io.github.resilience4j.retry.Retry; @@ -13,8 +11,8 @@ import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; import io.lettuce.core.cluster.event.ClusterTopologyChangedEvent; import io.lettuce.core.cluster.pubsub.StatefulRedisClusterPubSubConnection; import io.lettuce.core.codec.ByteArrayCodec; -import io.lettuce.core.resource.ClientResources; import io.lettuce.core.event.connection.ConnectionEvent; +import io.lettuce.core.resource.ClientResources; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.whispersystems.textsecuregcm.configuration.CircuitBreakerConfiguration; @@ -30,8 +28,6 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; -import static com.codahale.metrics.MetricRegistry.name; - /** * A fault-tolerant access manager for a Redis cluster. A fault-tolerant Redis cluster provides managed, * circuit-breaker-protected access to connections. @@ -50,8 +46,6 @@ public class FaultTolerantRedisCluster { private final CircuitBreaker circuitBreaker; private final Retry retry; - private final Timer executeTimer; - private static final Logger log = LoggerFactory.getLogger(FaultTolerantRedisCluster.class); public FaultTolerantRedisCluster(final String name, final RedisClusterConfiguration clusterConfiguration, final ClientResources clientResources) { @@ -85,10 +79,6 @@ public class FaultTolerantRedisCluster { CircuitBreakerUtil.registerMetrics(SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME), circuitBreaker, FaultTolerantRedisCluster.class); CircuitBreakerUtil.registerMetrics(SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME), retry, FaultTolerantRedisCluster.class); - - final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); - - this.executeTimer = metricRegistry.timer(name(getClass(), name, "execute")); } void shutdown() { @@ -124,11 +114,7 @@ public class FaultTolerantRedisCluster { private void useConnection(final StatefulRedisClusterConnection connection, final Consumer> consumer) { try { - circuitBreaker.executeCheckedRunnable(() -> retry.executeRunnable(() -> { - try (final Timer.Context ignored = executeTimer.time()) { - consumer.accept(connection); - } - })); + circuitBreaker.executeCheckedRunnable(() -> retry.executeRunnable(() -> consumer.accept(connection))); } catch (final Throwable t) { log.warn("Redis operation failure", t); @@ -142,11 +128,7 @@ public class FaultTolerantRedisCluster { private T withConnection(final StatefulRedisClusterConnection connection, final Function, T> function) { try { - return circuitBreaker.executeCheckedSupplier(() -> retry.executeCallable(() -> { - try (final Timer.Context ignored = executeTimer.time()) { - return function.apply(connection); - } - })); + return circuitBreaker.executeCheckedSupplier(() -> retry.executeCallable(() -> function.apply(connection))); } catch (final Throwable t) { log.warn("Redis operation failure", t);