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

Migrate from `host` tag to `dd.internal.entity_id`

This commit is contained in:
Chris Eager 2024-01-22 10:56:03 -06:00 committed by Chris Eager
parent a5ed07a666
commit ffdb0db6c6
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,6 @@ import org.whispersystems.textsecuregcm.WhisperServerConfiguration;
import org.whispersystems.textsecuregcm.WhisperServerVersion; 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 {
@ -52,7 +51,6 @@ public class MetricsUtil {
dogstatsdMeterRegistry.config().commonTags( dogstatsdMeterRegistry.config().commonTags(
Tags.of( Tags.of(
"service", "chat", "service", "chat",
"host", HostnameUtil.getLocalHostname(),
"version", WhisperServerVersion.getServerVersion(), "version", WhisperServerVersion.getServerVersion(),
"env", config.getDatadogConfiguration().getEnvironment())); "env", config.getDatadogConfiguration().getEnvironment()));

18
service/src/main/java/org/whispersystems/textsecuregcm/metrics/SignalDatadogReporterFactory.java
View File

@ -21,6 +21,7 @@ import java.util.List;
import javax.validation.Valid; import javax.validation.Valid;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils;
import org.coursera.metrics.datadog.DatadogReporter; import org.coursera.metrics.datadog.DatadogReporter;
import org.coursera.metrics.datadog.DatadogReporter.Expansion; import org.coursera.metrics.datadog.DatadogReporter.Expansion;
import org.coursera.metrics.datadog.DefaultMetricNameFormatterFactory; import org.coursera.metrics.datadog.DefaultMetricNameFormatterFactory;
@ -28,7 +29,6 @@ import org.coursera.metrics.datadog.DynamicTagsCallbackFactory;
import org.coursera.metrics.datadog.MetricNameFormatterFactory; import org.coursera.metrics.datadog.MetricNameFormatterFactory;
import org.coursera.metrics.datadog.transport.UdpTransport; import org.coursera.metrics.datadog.transport.UdpTransport;
import org.whispersystems.textsecuregcm.WhisperServerVersion; import org.whispersystems.textsecuregcm.WhisperServerVersion;
import org.whispersystems.textsecuregcm.util.HostnameUtil;
@JsonTypeName("signal-datadog") @JsonTypeName("signal-datadog")
public class SignalDatadogReporterFactory extends BaseReporterFactory { public class SignalDatadogReporterFactory extends BaseReporterFactory {
@ -66,23 +66,27 @@ public class SignalDatadogReporterFactory extends BaseReporterFactory {
); );
public ScheduledReporter build(final MetricRegistry registry) { public ScheduledReporter build(final MetricRegistry registry) {
final List<String> tagsWithVersion; final List<String> combinedTags;
{ {
final String versionTag = "version:" + WhisperServerVersion.getServerVersion(); final String versionTag = "version:" + WhisperServerVersion.getServerVersion();
if (tags != null) { if (tags != null) {
tagsWithVersion = new ArrayList<>(tags); combinedTags = new ArrayList<>(tags);
tagsWithVersion.add(versionTag); combinedTags.add(versionTag);
} else { } else {
tagsWithVersion = List.of(versionTag); combinedTags = new ArrayList<>((List.of(versionTag)));
} }
} }
final String entityId = StringUtils.stripToNull(System.getenv("DD_ENTITY_ID"));
if (entityId != null) {
combinedTags.add("dd.internal.entity_id:" + entityId);
}
return DatadogReporter.forRegistry(registry) return DatadogReporter.forRegistry(registry)
.withTransport(udpTransportConfig.udpTransport()) .withTransport(udpTransportConfig.udpTransport())
.withHost(HostnameUtil.getLocalHostname()) .withTags(combinedTags)
.withTags(tagsWithVersion)
.withPrefix(prefix) .withPrefix(prefix)
.withExpansions(EXPANSIONS) .withExpansions(EXPANSIONS)
.withMetricNameFormatter(metricNameFormatter.build()) .withMetricNameFormatter(metricNameFormatter.build())