From 6955e1ee20ce3a0b44bb0aeec94a12c4714b8077 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 1 Aug 2025 18:05:12 -0400
Subject: [PATCH] Retire `RedisClusterHealthCheck`

---
 .../textsecuregcm/WhisperServerService.java   |  4 ----
 .../providers/RedisClusterHealthCheck.java    | 24 -------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisClusterHealthCheck.java

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index c2b1f44c8..6473a1d4b 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -191,7 +191,6 @@ import org.whispersystems.textsecuregcm.metrics.ReportedMessageMetricsListener;
 import org.whispersystems.textsecuregcm.metrics.TlsCertificateExpirationUtil;
 import org.whispersystems.textsecuregcm.metrics.TrafficSource;
 import org.whispersystems.textsecuregcm.providers.MultiRecipientMessageProvider;
-import org.whispersystems.textsecuregcm.providers.RedisClusterHealthCheck;
 import org.whispersystems.textsecuregcm.push.APNSender;
 import org.whispersystems.textsecuregcm.push.FcmSender;
 import org.whispersystems.textsecuregcm.push.MessageSender;
@@ -1174,9 +1173,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     environment.admin().addTask(new SetRequestLoggingEnabledTask());
 
-    // healthcheck, admin port
-    environment.healthChecks().register("cacheCluster", new RedisClusterHealthCheck(cacheCluster));
-
     MetricsUtil.registerSystemResourceMetrics(environment);
   }
 
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisClusterHealthCheck.java b/service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisClusterHealthCheck.java
deleted file mode 100644
index 67b51c752..000000000
--- a/service/src/main/java/org/whispersystems/textsecuregcm/providers/RedisClusterHealthCheck.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2013-2020 Signal Messenger, LLC
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-package org.whispersystems.textsecuregcm.providers;
-
-import com.codahale.metrics.health.HealthCheck;
-import org.whispersystems.textsecuregcm.redis.FaultTolerantRedisClusterClient;
-
-public class RedisClusterHealthCheck extends HealthCheck {
-
-    private final FaultTolerantRedisClusterClient redisCluster;
-
-    public RedisClusterHealthCheck(final FaultTolerantRedisClusterClient redisCluster) {
-        this.redisCluster = redisCluster;
-    }
-
-    @Override
-    protected Result check() {
-        redisCluster.withCluster(connection -> connection.sync().upstream().commands().ping());
-        return Result.healthy();
-    }
-}