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

Implement DatadogConfig in DatadogConfiguration

This commit is contained in:
Chris Eager 2021-06-30 16:49:04 -05:00 committed by Chris Eager
parent 7395489bac
commit e52b8c8423
2 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tags; import io.micrometer.core.instrument.Tags;
import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.config.MeterFilter;
import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; import io.micrometer.core.instrument.distribution.DistributionStatisticConfig;
import io.micrometer.datadog.DatadogConfig;
import io.micrometer.datadog.DatadogMeterRegistry; import io.micrometer.datadog.DatadogMeterRegistry;
import io.micrometer.wavefront.WavefrontConfig; import io.micrometer.wavefront.WavefrontConfig;
import io.micrometer.wavefront.WavefrontMeterRegistry; import io.micrometer.wavefront.WavefrontMeterRegistry;
@ -282,32 +281,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
}); });
{ {
final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(new DatadogConfig() { final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(config.getDatadogConfiguration(), Clock.SYSTEM);
@Override
public String get(final String key) {
return null;
}
@Override
public String apiKey() {
return config.getDatadogConfiguration().getApiKey();
}
@Override
public Duration step() {
return config.getDatadogConfiguration().getStep();
}
@Override
public int batchSize() {
return config.getDatadogConfiguration().getBatchSize();
}
@Override
public String hostTag() {
return "host";
}
}, Clock.SYSTEM);
datadogMeterRegistry.config().commonTags( datadogMeterRegistry.config().commonTags(
Tags.of( Tags.of(

22
service/src/main/java/org/whispersystems/textsecuregcm/configuration/DatadogConfiguration.java
View File

@ -6,12 +6,13 @@
package org.whispersystems.textsecuregcm.configuration; package org.whispersystems.textsecuregcm.configuration;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import io.micrometer.datadog.DatadogConfig;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.time.Duration; import java.time.Duration;
public class DatadogConfiguration { public class DatadogConfiguration implements DatadogConfig {
@JsonProperty @JsonProperty
@NotBlank @NotBlank
@ -29,11 +30,13 @@ public class DatadogConfiguration {
@Min(1) @Min(1)
private int batchSize = 5_000; private int batchSize = 5_000;
public String getApiKey() { @Override
public String apiKey() {
return apiKey; return apiKey;
} }
public Duration getStep() { @Override
public Duration step() {
return step; return step;
} }
@ -41,7 +44,18 @@ public class DatadogConfiguration {
return environment; return environment;
} }
public int getBatchSize() { @Override
public int batchSize() {
return batchSize; return batchSize;
} }
@Override
public String hostTag() {
return "host";
}
@Override
public String get(final String key) {
return null;
}
} }