From 23d5006f70f519508638615b1cd322a0c892e79c Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Tue, 4 Apr 2023 10:14:41 -0500
Subject: [PATCH] Add prefix to executor metric names

---
 .../textsecuregcm/WhisperServerService.java      | 16 ++++++++--------
 .../textsecuregcm/metrics/MetricsUtil.java       |  2 +-
 .../textsecuregcm/push/ReceiptSender.java        | 12 ++++++------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index ed5269b5b..4f246afb9 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -430,14 +430,14 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
 
     // using 80 threads to match Schedulers.boundedElastic() behavior
     Scheduler messageDeliveryScheduler = Schedulers.fromExecutorService(
-        ExecutorServiceMetrics.monitor(Metrics.globalRegistry,
-            environment.lifecycle().executorService(name(getClass(), "messageDelivery-%d"))
-                .minThreads(80)
-                .maxThreads(80)
-                .workQueue(messageDeliveryQueue)
-                .build(),
-            MetricsUtil.name(getClass(), "messageDeliveryExecutor")),
-        "messageDelivery");
+            ExecutorServiceMetrics.monitor(Metrics.globalRegistry,
+                    environment.lifecycle().executorService(name(getClass(), "messageDelivery-%d"))
+                            .minThreads(80)
+                            .maxThreads(80)
+                            .workQueue(messageDeliveryQueue)
+                            .build(),
+                    MetricsUtil.name(getClass(), "messageDeliveryExecutor"), MetricsUtil.PREFIX),
+            "messageDelivery");
     // TODO: generally speaking this is a DynamoDB I/O executor for the accounts table; we should eventually have a general executor for speaking to the accounts table, but most of the server is still synchronous so this isn't widely useful yet
     ExecutorService batchIdentityCheckExecutor = environment.lifecycle().executorService(name(getClass(), "batchIdentityCheck-%d")).minThreads(32).maxThreads(32).build();
     ExecutorService multiRecipientMessageExecutor = environment.lifecycle()
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 1e845deba..1e9be9f4f 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
@@ -7,7 +7,7 @@ package org.whispersystems.textsecuregcm.metrics;
 
 public class MetricsUtil {
 
-  private static final String PREFIX = "chat";
+  public static final String PREFIX = "chat";
 
   /**
    * Returns a dot-separated ('.') name for the given class and name parts
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java b/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
index 818fdbc1e..a16290f6a 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 Signal Messenger, LLC
+ * Copyright 2013 Signal Messenger, LLC
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
@@ -32,11 +32,11 @@ public class ReceiptSender {
     this.accountManager = accountManager;
     this.messageSender = messageSender;
     this.executor = ExecutorServiceMetrics.monitor(
-        Metrics.globalRegistry,
-        new InstrumentedExecutorService(executor,
-            SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME),
-            MetricsUtil.name(ReceiptSender.class, "executor")),
-        MetricsUtil.name(ReceiptSender.class, "executor"))
+            Metrics.globalRegistry,
+            new InstrumentedExecutorService(executor,
+                    SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME),
+                    MetricsUtil.name(ReceiptSender.class, "executor")),
+            MetricsUtil.name(ReceiptSender.class, "executor"), MetricsUtil.PREFIX)
     ;
   }