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

Temporarily restore explicit service/version/environment/host tags

This commit is contained in:
Jon Chambers 2023-08-17 18:16:34 -04:00 committed by Jon Chambers
parent ab83990170
commit 76305190a2
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/config/sample.yml
View File

@ -224,6 +224,9 @@ cdn:
bucket: cdn # S3 Bucket name bucket: cdn # S3 Bucket name
region: us-west-2 # AWS region region: us-west-2 # AWS region
dogstatsd:
environment: dev
unidentifiedDelivery: unidentifiedDelivery:
certificate: secret://unidentifiedDelivery.certificate certificate: secret://unidentifiedDelivery.certificate
privateKey: secret://unidentifiedDelivery.privateKey privateKey: secret://unidentifiedDelivery.privateKey

9
service/src/main/java/org/whispersystems/textsecuregcm/configuration/DogstatsdConfiguration.java
View File

@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import io.micrometer.statsd.StatsdConfig; import io.micrometer.statsd.StatsdConfig;
import io.micrometer.statsd.StatsdFlavor; import io.micrometer.statsd.StatsdFlavor;
import java.time.Duration; import java.time.Duration;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
public class DogstatsdConfiguration implements StatsdConfig { public class DogstatsdConfiguration implements StatsdConfig {
@ -17,11 +18,19 @@ public class DogstatsdConfiguration implements StatsdConfig {
@NotNull @NotNull
private Duration step = Duration.ofSeconds(10); private Duration step = Duration.ofSeconds(10);
@JsonProperty
@NotBlank
private String environment;
@Override @Override
public Duration step() { public Duration step() {
return step; return step;
} }
public String getEnvironment() {
return environment;
}
@Override @Override
public StatsdFlavor flavor() { public StatsdFlavor flavor() {
return StatsdFlavor.DATADOG; return StatsdFlavor.DATADOG;

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

@ -11,13 +11,16 @@ import io.dropwizard.setup.Environment;
import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
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.statsd.StatsdMeterRegistry; import io.micrometer.statsd.StatsdMeterRegistry;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.whispersystems.textsecuregcm.WhisperServerConfiguration; import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
import org.whispersystems.textsecuregcm.WhisperServerVersion;
import org.whispersystems.textsecuregcm.push.PushLatencyManager; import org.whispersystems.textsecuregcm.push.PushLatencyManager;
import org.whispersystems.textsecuregcm.util.Constants; import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.HostnameUtil;
public class MetricsUtil { public class MetricsUtil {
@ -46,6 +49,13 @@ public class MetricsUtil {
final StatsdMeterRegistry dogstatsdMeterRegistry = new StatsdMeterRegistry( final StatsdMeterRegistry dogstatsdMeterRegistry = new StatsdMeterRegistry(
config.getDatadogConfiguration(), io.micrometer.core.instrument.Clock.SYSTEM); config.getDatadogConfiguration(), io.micrometer.core.instrument.Clock.SYSTEM);
dogstatsdMeterRegistry.config().commonTags(
Tags.of(
"service", "chat",
"host", HostnameUtil.getLocalHostname(),
"version", WhisperServerVersion.getServerVersion(),
"env", config.getDatadogConfiguration().getEnvironment()));
configureMeterFilters(dogstatsdMeterRegistry.config()); configureMeterFilters(dogstatsdMeterRegistry.config());
Metrics.addRegistry(dogstatsdMeterRegistry); Metrics.addRegistry(dogstatsdMeterRegistry);
} }