From 18480e9d18d6ef4b9e4793f021231fdba28415f1 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Tue, 30 May 2023 09:43:15 -0500
Subject: [PATCH] Move metrics registry `environment.manage()` to utility

---
 .../org/whispersystems/textsecuregcm/WhisperServerService.java | 3 ---
 .../org/whispersystems/textsecuregcm/metrics/MetricsUtil.java  | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index ade6679fc..084497d40 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -133,7 +133,6 @@ import org.whispersystems.textsecuregcm.metrics.GarbageCollectionGauges;
 import org.whispersystems.textsecuregcm.metrics.MaxFileDescriptorGauge;
 import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener;
 import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
-import org.whispersystems.textsecuregcm.metrics.MicrometerRegistryManager;
 import org.whispersystems.textsecuregcm.metrics.NetworkReceivedGauge;
 import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge;
 import org.whispersystems.textsecuregcm.metrics.OperatingSystemMemoryGauge;
@@ -293,8 +292,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
             System.getenv("SIGNAL_USE_SECONDARY_CREDENTIALS_JSON"))
         .isPresent();
 
-    environment.lifecycle().manage(new MicrometerRegistryManager(Metrics.globalRegistry));
-
     HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup =
         new HeaderControlledResourceBundleLookup();
     ConfiguredProfileBadgeConverter profileBadgeConverter = new ConfiguredProfileBadgeConverter(
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 4fad12038..b01177a91 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
@@ -64,5 +64,7 @@ public class MetricsUtil {
 
       Metrics.addRegistry(datadogMeterRegistry);
     }
+
+    environment.lifecycle().manage(new MicrometerRegistryManager(Metrics.globalRegistry));
   }
 }