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

Move metrics registry `environment.manage()` to utility

This commit is contained in:
Chris Eager 2023-05-30 09:43:15 -05:00 committed by Chris Eager
parent 7ffccd9c3a
commit 18480e9d18
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,6 @@ import org.whispersystems.textsecuregcm.metrics.GarbageCollectionGauges;
import org.whispersystems.textsecuregcm.metrics.MaxFileDescriptorGauge; import org.whispersystems.textsecuregcm.metrics.MaxFileDescriptorGauge;
import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener; import org.whispersystems.textsecuregcm.metrics.MetricsApplicationEventListener;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil; import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
import org.whispersystems.textsecuregcm.metrics.MicrometerRegistryManager;
import org.whispersystems.textsecuregcm.metrics.NetworkReceivedGauge; import org.whispersystems.textsecuregcm.metrics.NetworkReceivedGauge;
import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge; import org.whispersystems.textsecuregcm.metrics.NetworkSentGauge;
import org.whispersystems.textsecuregcm.metrics.OperatingSystemMemoryGauge; import org.whispersystems.textsecuregcm.metrics.OperatingSystemMemoryGauge;
@ -293,8 +292,6 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
System.getenv("SIGNAL_USE_SECONDARY_CREDENTIALS_JSON")) System.getenv("SIGNAL_USE_SECONDARY_CREDENTIALS_JSON"))
.isPresent(); .isPresent();
environment.lifecycle().manage(new MicrometerRegistryManager(Metrics.globalRegistry));
HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup = HeaderControlledResourceBundleLookup headerControlledResourceBundleLookup =
new HeaderControlledResourceBundleLookup(); new HeaderControlledResourceBundleLookup();
ConfiguredProfileBadgeConverter profileBadgeConverter = new ConfiguredProfileBadgeConverter( ConfiguredProfileBadgeConverter profileBadgeConverter = new ConfiguredProfileBadgeConverter(

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

@ -64,5 +64,7 @@ public class MetricsUtil {
Metrics.addRegistry(datadogMeterRegistry); Metrics.addRegistry(datadogMeterRegistry);
} }
environment.lifecycle().manage(new MicrometerRegistryManager(Metrics.globalRegistry));
} }
} }