MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add prefix to executor metric names

This commit is contained in:
Chris Eager 2023-04-04 10:14:41 -05:00 committed by ravi-signal
parent 2697872bdd
commit 23d5006f70
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@ -430,14 +430,14 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
// using 80 threads to match Schedulers.boundedElastic() behavior // using 80 threads to match Schedulers.boundedElastic() behavior
Scheduler messageDeliveryScheduler = Schedulers.fromExecutorService( Scheduler messageDeliveryScheduler = Schedulers.fromExecutorService(
ExecutorServiceMetrics.monitor(Metrics.globalRegistry, ExecutorServiceMetrics.monitor(Metrics.globalRegistry,
environment.lifecycle().executorService(name(getClass(), "messageDelivery-%d")) environment.lifecycle().executorService(name(getClass(), "messageDelivery-%d"))
.minThreads(80) .minThreads(80)
.maxThreads(80) .maxThreads(80)
.workQueue(messageDeliveryQueue) .workQueue(messageDeliveryQueue)
.build(), .build(),
MetricsUtil.name(getClass(), "messageDeliveryExecutor")), MetricsUtil.name(getClass(), "messageDeliveryExecutor"), MetricsUtil.PREFIX),
"messageDelivery"); "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 // 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 batchIdentityCheckExecutor = environment.lifecycle().executorService(name(getClass(), "batchIdentityCheck-%d")).minThreads(32).maxThreads(32).build();
ExecutorService multiRecipientMessageExecutor = environment.lifecycle() ExecutorService multiRecipientMessageExecutor = environment.lifecycle()

2
service/src/main/java/org/whispersystems/textsecuregcm/metrics/MetricsUtil.java
View File

@ -7,7 +7,7 @@ package org.whispersystems.textsecuregcm.metrics;
public class MetricsUtil { 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 * Returns a dot-separated ('.') name for the given class and name parts

12
service/src/main/java/org/whispersystems/textsecuregcm/push/ReceiptSender.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2022 Signal Messenger, LLC * Copyright 2013 Signal Messenger, LLC
* SPDX-License-Identifier: AGPL-3.0-only * SPDX-License-Identifier: AGPL-3.0-only
*/ */
@ -32,11 +32,11 @@ public class ReceiptSender {
this.accountManager = accountManager; this.accountManager = accountManager;
this.messageSender = messageSender; this.messageSender = messageSender;
this.executor = ExecutorServiceMetrics.monitor( this.executor = ExecutorServiceMetrics.monitor(
Metrics.globalRegistry, Metrics.globalRegistry,
new InstrumentedExecutorService(executor, new InstrumentedExecutorService(executor,
SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME), SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME),
MetricsUtil.name(ReceiptSender.class, "executor")), MetricsUtil.name(ReceiptSender.class, "executor")),
MetricsUtil.name(ReceiptSender.class, "executor")) MetricsUtil.name(ReceiptSender.class, "executor"), MetricsUtil.PREFIX)
; ;
} }