use logbacks own hostname resolution

osiegmar · Oct 8, 2023 · 23c220d · 23c220d
1 parent c6aa530
commit 23c220d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 89 deletions.
diff --git a/src/main/java/de/siegmar/logbackgelf/GelfEncoder.java b/src/main/java/de/siegmar/logbackgelf/GelfEncoder.java
@@ -20,19 +20,20 @@
 package de.siegmar.logbackgelf;
 
 import java.math.BigDecimal;
-import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 import ch.qos.logback.classic.PatternLayout;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.util.LevelToSyslogSeverity;
+import ch.qos.logback.core.CoreConstants;
 import ch.qos.logback.core.encoder.EncoderBase;
 import de.siegmar.logbackgelf.mappers.CallerDataFieldMapper;
 import de.siegmar.logbackgelf.mappers.KeyValueFieldMapper;
@@ -324,12 +325,7 @@ private Object convertToNumberIfNeeded(final Object value) {
     @Override
     public void start() {
         if (originHost == null || originHost.isBlank()) {
-            try {
-                originHost = InetUtil.getLocalHostName();
-            } catch (final UnknownHostException e) {
-                addWarn("Could not determine local hostname", e);
-                originHost = "unknown";
-            }
+            originHost = Optional.ofNullable(context.getProperty(CoreConstants.HOSTNAME_KEY)).orElse("unknown");
         }
         if (shortPatternLayout == null) {
             shortPatternLayout = buildPattern(DEFAULT_SHORT_PATTERN);

diff --git a/src/main/java/de/siegmar/logbackgelf/InetUtil.java b/src/main/java/de/siegmar/logbackgelf/InetUtil.java
diff --git a/src/test/java/de/siegmar/logbackgelf/GelfEncoderTest.java b/src/test/java/de/siegmar/logbackgelf/GelfEncoderTest.java
@@ -21,6 +21,7 @@
 
 import static java.time.Duration.ofMillis;
 import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -500,13 +501,13 @@ void rewriteStaticField() {
 
     @ParameterizedTest
     @NullAndEmptySource
-    void originHostDefaultToLocalHostNameIfEmpty(final String configuredHostname) throws IOException {
+    void originHostDefaultToLocalHostNameIfEmpty(final String configuredHostname) {
         encoder.setOriginHost(configuredHostname);
         encoder.start();
 
-        final String localhost = InetUtil.getLocalHostName();
-
-        assertEquals(localhost, encoder.getOriginHost());
+        assertThat(encoder.getOriginHost())
+            .isNotBlank()
+            .isNotEqualTo("unknown");
     }
 
     @Test

diff --git a/src/test/java/de/siegmar/logbackgelf/InetUtilTest.java b/src/test/java/de/siegmar/logbackgelf/InetUtilTest.java