Register system resource metrics in MetricsUtil#configureRegistries

This commit is contained in:
Chris Eager
2025-09-22 17:52:03 -05:00
committed by Ameya Lokare
parent 4e73162055
commit 850172f6a3
5 changed files with 3 additions and 10 deletions

View File

@@ -1193,8 +1193,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
provisioning.setAsyncSupported(true);
environment.admin().addTask(new SetRequestLoggingEnabledTask());
MetricsUtil.registerSystemResourceMetrics(environment);
}
private void registerExceptionMappers(Environment environment,

View File

@@ -109,6 +109,8 @@ public class MetricsUtil {
environment.lifecycle().addEventListener(new ApplicationShutdownMonitor(Metrics.globalRegistry));
environment.lifecycle().addEventListener(
new MicrometerRegistryManager(Metrics.globalRegistry, shutdownWaitDuration));
registerSystemResourceMetrics();
}
public static void configureLogging(final WhisperServerConfiguration config, final Environment environment) {
@@ -186,7 +188,7 @@ public class MetricsUtil {
&& id.getName().startsWith(awsSdkMetricNamePrefix)));
}
public static void registerSystemResourceMetrics(final Environment environment) {
static void registerSystemResourceMetrics() {
new ProcessorMetrics().bindTo(Metrics.globalRegistry);
new FileDescriptorMetrics().bindTo(Metrics.globalRegistry);

View File

@@ -14,7 +14,6 @@ import java.time.Duration;
import net.sourceforge.argparse4j.inf.Namespace;
import net.sourceforge.argparse4j.inf.Subparser;
import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.storage.MessagePersister;
import org.whispersystems.textsecuregcm.util.logging.UncaughtExceptionHandler;
@@ -70,8 +69,6 @@ public class MessagePersisterServiceCommand extends ServerCommand<WhisperServerC
environment.lifecycle().manage(messagePersister);
MetricsUtil.registerSystemResourceMetrics(environment);
super.run(environment, namespace, configuration);
}

View File

@@ -166,8 +166,6 @@ public class ProcessScheduledJobsServiceCommand extends ServerCommand<WhisperSer
environment.lifecycle().manage(new ScheduledJobProcessor(jobScheduler, scheduledExecutorService, fixedDelaySeconds));
MetricsUtil.registerSystemResourceMetrics(environment);
super.run(environment, namespace, configuration);
}
}

View File

@@ -96,8 +96,6 @@ public class ScheduledApnPushNotificationSenderServiceCommand extends ServerComm
environment.lifecycle().manage(pushNotificationScheduler);
MetricsUtil.registerSystemResourceMetrics(environment);
super.run(environment, namespace, configuration);
}