From c5dc01ee118a505c7078577f44d1f1164d3fa009 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Thu, 8 Feb 2024 19:17:42 -0500
Subject: [PATCH] Restore high-cardinality Lettuce metrics for debugging

---
 .../org/whispersystems/textsecuregcm/metrics/MetricsUtil.java  | 3 +--
 .../whispersystems/textsecuregcm/metrics/MetricsUtilTest.java  | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
index 659d3cbcd..193c1901f 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
@@ -76,7 +76,7 @@ public DistributionStatisticConfig configure(final Meter.Id id, final Distributi
             return defaultDistributionStatisticConfig.merge(config);
           }
         })
-        // Remove high-cardinality `command` and `remote` tags from Lettuce metrics and prepend "chat." to meter names
+        // Remove high-cardinality `command` tags from Lettuce metrics and prepend "chat." to meter names
         .meterFilter(new MeterFilter() {
           @Override
           public Meter.Id map(final Meter.Id id) {
@@ -84,7 +84,6 @@ public Meter.Id map(final Meter.Id id) {
               return id.withName(PREFIX + "." + id.getName())
                   .replaceTags(id.getTags().stream()
                       .filter(tag -> !"command".equals(tag.getKey()))
-                      .filter(tag -> !"remote".equals(tag.getKey()))
                       .toList());
             }
 
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsUtilTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsUtilTest.java
index d253b216d..66016f3ef 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsUtilTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/metrics/MetricsUtilTest.java
@@ -37,7 +37,6 @@ void lettuceTagRejection() {
     Meter meter = meters.get(0);
     assertThat(meter.getId().getName()).isEqualTo("chat.lettuce.command.completion.max");
     assertThat(meter.getId().getTag("command")).isNull();
-    assertThat(meter.getId().getTag("remote")).isNull();
     assertThat(meter.getId().getTag("allowed")).isNotNull();
   }
 }