Attempt at better "instance" variable for metrics

1 files changed, 13 insertions, 1 deletions

diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt
index 923ebcb5..93ff0be7 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/SevenWonders.kt
@@ -21,7 +21,19 @@ class SevenWonders {
     fun metricsCommonTags(): MeterRegistryCustomizer<MeterRegistry>? = MeterRegistryCustomizer { registry ->
         registry.config()
             .commonTags("application", "seven-wonders")
-            .commonTags("instance", InetAddress.getLocalHost().hostAddress)
+            .commonTags("instance", findInstanceName())
+    }
+
+    private fun findInstanceName(): String? {
+        val hostname = System.getenv("HOSTNAME")?.takeIf { it.isNotBlank() }
+        if (hostname != null) {
+            return hostname
+        }
+        val computerName = System.getenv("COMPUTERNAME")?.takeIf { it.isNotBlank() }
+        if (computerName != null) {
+            return computerName
+        }
+        return InetAddress.getLocalHost().hostName
     }
 }