From cf2353bcf97539d48c3f7f17844eb0bfb524bb17 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 20 Oct 2023 12:43:55 -0500
Subject: [PATCH] Remove InstrumentedExecutorService wrapping
---
.../whispersystems/textsecuregcm/push/ReceiptSender.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
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 ae235e528..ac4c9498f 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
@@ -5,8 +5,6 @@
package org.whispersystems.textsecuregcm.push;
-import com.codahale.metrics.InstrumentedExecutorService;
-import com.codahale.metrics.SharedMetricRegistries;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.binder.jvm.ExecutorServiceMetrics;
import java.util.concurrent.ExecutorService;
@@ -18,7 +16,6 @@ import org.whispersystems.textsecuregcm.identity.ServiceIdentifier;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.Device;
-import org.whispersystems.textsecuregcm.util.Constants;
public class ReceiptSender {
@@ -33,11 +30,7 @@ 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"), MetricsUtil.PREFIX)
+ Metrics.globalRegistry, executor, MetricsUtil.name(ReceiptSender.class, "executor"), MetricsUtil.PREFIX)
;
}
--
GitLab