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

Add environment tag to datadog metric reporting

This commit is contained in:
Ehren Kret 2020-07-30 13:59:07 -05:00 committed by Jon Chambers
parent dee040318a
commit 7cb24dd96d
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,10 @@ import io.dropwizard.setup.Environment;
import io.lettuce.core.RedisURI; import io.lettuce.core.RedisURI;
import io.lettuce.core.cluster.RedisClusterClient; import io.lettuce.core.cluster.RedisClusterClient;
import io.micrometer.core.instrument.Clock; import io.micrometer.core.instrument.Clock;
import io.micrometer.core.instrument.ImmutableTag;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tag;
import io.micrometer.datadog.DatadogConfig; 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;
@ -156,6 +159,7 @@ import org.whispersystems.textsecuregcm.workers.ZkParamsCommand;
import org.whispersystems.websocket.WebSocketResourceProviderFactory; import org.whispersystems.websocket.WebSocketResourceProviderFactory;
import org.whispersystems.websocket.setup.WebSocketEnvironment; import org.whispersystems.websocket.setup.WebSocketEnvironment;
import javax.annotation.Nonnull;
import javax.servlet.DispatcherType; import javax.servlet.DispatcherType;
import javax.servlet.FilterRegistration; import javax.servlet.FilterRegistration;
import javax.servlet.ServletRegistration; import javax.servlet.ServletRegistration;
@ -269,7 +273,14 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
public String hostTag() { public String hostTag() {
return instanceId; return instanceId;
} }
}, Clock.SYSTEM)); }, Clock.SYSTEM) {
@Override
protected List<Tag> getConventionTags(@Nonnull Meter.Id id) {
final List<Tag> tags = super.getConventionTags(id);
tags.add(new ImmutableTag("environment", micrometerDatadogConfig.getEnvironment()));
return tags;
}
});
} }
environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);

8
service/src/main/java/org/whispersystems/textsecuregcm/configuration/MicrometerConfiguration.java
View File

@ -1,7 +1,6 @@
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.wavefront.WavefrontConfig;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
@ -18,6 +17,9 @@ public class MicrometerConfiguration {
@NotEmpty @NotEmpty
private String apiKey; private String apiKey;
@JsonProperty
private String environment;
public String getName() { public String getName() {
return name; return name;
} }
@ -29,4 +31,8 @@ public class MicrometerConfiguration {
public String getApiKey() { public String getApiKey() {
return apiKey; return apiKey;
} }
public String getEnvironment() {
return environment;
}
} }