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

Update a metric provider dependency and remove a workaround for an upstream issue.

This commit is contained in:
Jon Chambers 2020-08-10 16:54:15 -04:00 committed by Jon Chambers
parent b97158bf7b
commit 30948de13d
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
service/pom.xml
View File

@ -77,7 +77,7 @@
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-wavefront</artifactId> <artifactId>micrometer-registry-wavefront</artifactId>
<version>1.5.2</version> <version>1.5.3</version>
</dependency> </dependency>
<dependency> <dependency>

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

@ -227,12 +227,9 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
final Map<String, MicrometerConfiguration> micrometerConfigurationByName = config.getMicrometerConfiguration(); final Map<String, MicrometerConfiguration> micrometerConfigurationByName = config.getMicrometerConfiguration();
{ {
// This is a workaround for an issue where the configured step duration isn't being honored by
// WavefrontMeterRegistry; we can simplify if https://github.com/micrometer-metrics/micrometer/pull/2173 gets
// merged.
final MicrometerConfiguration micrometerWavefrontConfig = micrometerConfigurationByName.get("wavefront"); final MicrometerConfiguration micrometerWavefrontConfig = micrometerConfigurationByName.get("wavefront");
final WavefrontConfig wavefrontConfig = new WavefrontConfig() { Metrics.addRegistry(new WavefrontMeterRegistry(new WavefrontConfig() {
@Override @Override
public String get(final String key) { public String get(final String key) {
return null; return null;
@ -247,15 +244,15 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
public String apiToken() { public String apiToken() {
return micrometerWavefrontConfig.getApiKey(); return micrometerWavefrontConfig.getApiKey();
} }
}; }, Clock.SYSTEM) {
@Override
final WavefrontSender wavefrontSender = WavefrontMeterRegistry.getDefaultSenderBuilder(wavefrontConfig) protected DistributionStatisticConfig defaultHistogramConfig() {
.flushIntervalSeconds((int)wavefrontConfig.step().toSeconds()) return DistributionStatisticConfig.builder()
.build(); .percentiles(.75, .95, .99, .999)
.build()
Metrics.addRegistry(WavefrontMeterRegistry.builder(wavefrontConfig) .merge(super.defaultHistogramConfig());
.wavefrontSender(wavefrontSender) }
.build()); });
} }
{ {