From 0aafe384966bd2b3228d4005e15792453b88de46 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Tue, 17 Nov 2020 13:02:09 -0500
Subject: [PATCH] Stop recording Lettuce latency metrics.

---
 .../textsecuregcm/WhisperServerService.java   |  3 +-
 ...crometerLettuceCommandLatencyRecorder.java | 31 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/metrics/MicrometerLettuceCommandLatencyRecorder.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 3c7b2c2fb..9389328f1 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -80,7 +80,6 @@ import org.whispersystems.textsecuregcm.metrics.FreeMemoryGauge;
 import org.whispersystems.textsecuregcm.metrics.GarbageCollectionGauges;
 import org.whispersystems.textsecuregcm.metrics.MaxFileDescriptorGauge;
 import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener;
-import org.whispersystems.textsecuregcm.metrics.MicrometerLettuceCommandLatencyRecorder;
 import org.whispersystems.textsecuregcm.metrics.NetworkReceivedGauge;
 import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge;
 import org.whispersystems.textsecuregcm.metrics.OperatingSystemMemoryGauge;
@@ -279,7 +278,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     ReplicatedJedisPool directoryClient     = directoryClientFactory.getRedisClientPool();
     ReplicatedJedisPool pushSchedulerClient = pushSchedulerClientFactory.getRedisClientPool();
 
-    ClientResources redisClusterClientResources = ClientResources.builder().commandLatencyRecorder(new MicrometerLettuceCommandLatencyRecorder()).build();
+    ClientResources redisClusterClientResources = ClientResources.builder().build();
     ConnectionEventLogger.logConnectionEvents(redisClusterClientResources);
 
     FaultTolerantRedisCluster cacheCluster         = new FaultTolerantRedisCluster("main_cache_cluster", config.getCacheClusterConfiguration(), redisClusterClientResources);
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MicrometerLettuceCommandLatencyRecorder.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MicrometerLettuceCommandLatencyRecorder.java
deleted file mode 100644
index 33bddd6b8..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MicrometerLettuceCommandLatencyRecorder.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.metrics;
-
-import io.lettuce.core.metrics.CommandLatencyRecorder;
-import io.lettuce.core.protocol.ProtocolKeyword;
-import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Tag;
-
-import java.net.SocketAddress;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static com.codahale.metrics.MetricRegistry.name;
-
-public class MicrometerLettuceCommandLatencyRecorder implements CommandLatencyRecorder {
-
-    private static final String FIRST_RESPONSE_TIMER_NAME = name(MicrometerLettuceCommandLatencyRecorder.class, "firstResponse");
-    private static final String COMPLETION_TIMER_NAME     = name(MicrometerLettuceCommandLatencyRecorder.class, "completion");
-
-    @Override
-    public void recordCommandLatency(final SocketAddress local, final SocketAddress remote, final ProtocolKeyword commandType, final long firstResponseLatency, final long completionLatency) {
-        final List<Tag> tags = List.of(Tag.of("redisHost", remote.toString()), Tag.of("command", commandType.name()));
-
-        Metrics.timer(FIRST_RESPONSE_TIMER_NAME, tags).record(firstResponseLatency, TimeUnit.NANOSECONDS);
-        Metrics.timer(COMPLETION_TIMER_NAME, tags).record(completionLatency, TimeUnit.NANOSECONDS);
-    }
-}