From a049eda7e633e33109048c4a0011fbf640f023f3 Mon Sep 17 00:00:00 2001
From: Jonathan Klabunde Tomer <125505367+jkt-signal@users.noreply.github.com>
Date: Wed, 21 Aug 2024 14:49:05 -0700
Subject: [PATCH] remove configuration for no-longer-used "metrics" redis
 cluster

---
 service/config/sample.yml                              |  3 ---
 .../textsecuregcm/WhisperServerConfiguration.java      | 10 ----------
 .../textsecuregcm/WhisperServerService.java            |  2 --
 service/src/test/resources/config/test.yml             |  3 ---
 4 files changed, 18 deletions(-)

diff --git a/service/config/sample.yml b/service/config/sample.yml
index bbc4bdd20..0c8cdebe2 100644
--- a/service/config/sample.yml
+++ b/service/config/sample.yml
@@ -221,9 +221,6 @@ messageCache: # Redis server configuration for message store cache
   cluster:
     configurationUri: redis://redis.example.com:6379/
 
-metricsCluster:
-  configurationUri: redis://redis.example.com:6379/
-
 awsAttachments: # AWS S3 configuration
   bucket: aws-attachments
   credentials:
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
index 7d8d42b6d..f25f513e4 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java
@@ -128,11 +128,6 @@ public class WhisperServerConfiguration extends Configuration {
   @JsonProperty
   private FaultTolerantRedisClusterFactory cacheCluster;
 
-  @NotNull
-  @Valid
-  @JsonProperty
-  private FaultTolerantRedisClusterFactory metricsCluster;
-
   @NotNull
   @Valid
   @JsonProperty
@@ -399,11 +394,6 @@ public class WhisperServerConfiguration extends Configuration {
     return provisioning;
   }
 
-  public FaultTolerantRedisClusterFactory getMetricsClusterConfiguration() {
-    return metricsCluster;
-  }
-
-
   public SecureValueRecovery2Configuration getSvr2Configuration() {
     return svr2;
   }
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index b400766ba..e058ca917 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -462,8 +462,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             .build("messages", sharedClientResources.mutate());
     FaultTolerantRedisCluster clientPresenceCluster = config.getClientPresenceClusterConfiguration()
         .build("client_presence", sharedClientResources.mutate());
-    FaultTolerantRedisCluster metricsCluster = config.getMetricsClusterConfiguration()
-        .build("metrics", sharedClientResources.mutate());
     FaultTolerantRedisCluster pushSchedulerCluster = config.getPushSchedulerCluster().build("push_scheduler",
         sharedClientResources.mutate());
     FaultTolerantRedisCluster rateLimitersCluster = config.getRateLimitersCluster().build("rate_limiters",
diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml
index 0634c00e9..a5b9c9309 100644
--- a/service/src/test/resources/config/test.yml
+++ b/service/src/test/resources/config/test.yml
@@ -216,9 +216,6 @@ messageCache: # Redis server configuration for message store cache
   cluster:
     type: local
 
-metricsCluster:
-  type: local
-
 awsAttachments: # AWS S3 configuration
   bucket: aws-attachments
   credentials: