From 88c4b2be97edf6b3503bda551b9312d6f6ef271c Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Mon, 7 Jun 2021 15:52:01 -0400
Subject: [PATCH] Correct a misunderstanding about the metrics host tag.
---
.../whispersystems/textsecuregcm/WhisperServerService.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index de95b21d7..579ec8411 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -275,7 +275,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
});
{
- final String host;
+ final String hostname;
{
String localHostName = "unknown";
@@ -285,7 +285,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
} catch (final UnknownHostException ignored) {
}
- host = localHostName;
+ hostname = localHostName;
}
final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(new DatadogConfig() {
@@ -306,13 +306,14 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
@Override
public String hostTag() {
- return host;
+ return "host";
}
}, Clock.SYSTEM);
datadogMeterRegistry.config().commonTags(
Tags.of(
"service", "chat",
+ "host", hostname,
"version", WhisperServerVersion.getServerVersion(),
"env", config.getDatadogConfiguration().getEnvironment()))
.meterFilter(MeterFilter.denyNameStartsWith(MetricsRequestEventListener.REQUEST_COUNTER_NAME))
--
GitLab