From 5522376584cf74fa535a6613d4e6f6ef89733b94 Mon Sep 17 00:00:00 2001
From: Jon Chambers <jon@signal.org>
Date: Fri, 4 Jun 2021 17:50:13 -0400
Subject: [PATCH] Include a host tag with metrics.

---
 .../textsecuregcm/WhisperServerService.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 57b261d7d..66b1da23d 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -40,6 +40,8 @@ import io.micrometer.datadog.DatadogConfig;
 import io.micrometer.datadog.DatadogMeterRegistry;
 import io.micrometer.wavefront.WavefrontConfig;
 import io.micrometer.wavefront.WavefrontMeterRegistry;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.net.http.HttpClient;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -272,6 +274,19 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
     });
 
     {
+      final String host;
+
+      {
+        String localHostName = "unknown";
+
+        try {
+          localHostName = InetAddress.getLocalHost().getHostName();
+        } catch (final UnknownHostException ignored) {
+        }
+
+        host = localHostName;
+      }
+
       final DatadogMeterRegistry datadogMeterRegistry = new DatadogMeterRegistry(new DatadogConfig() {
         @Override
         public String get(final String key) {
@@ -287,6 +302,11 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         public Duration step() {
           return config.getDatadogConfiguration().getStep();
         }
+
+        @Override
+        public String hostTag() {
+          return host;
+        }
       }, Clock.SYSTEM);
 
       datadogMeterRegistry.config().meterFilter(new MeterFilter() {