diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
index 3dba6f5b8f4..50ad147e9ef 100644
--- a/internal-api/src/main/java/datadog/trace/api/Config.java
+++ b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -4191,40 +4191,67 @@ private static <T> Set<T> convertStringSetToSet(
 
   /** Returns the detected hostname. First tries locally, then using DNS */
   static String initHostName() {
-    String possibleHostname;
-
     // Try environment variable.  This works in almost all environments
-    if (isWindowsOS()) {
-      possibleHostname = getEnv("COMPUTERNAME");
-    } else {
-      possibleHostname = getEnv("HOSTNAME");
-    }
-
-    if (possibleHostname != null && !possibleHostname.isEmpty()) {
-      log.debug("Determined hostname from environment variable");
-      return possibleHostname.trim();
+    String possibleHostname = initHostNameFromEnv();
+    if (possibleHostname != null) {
+      return possibleHostname;
     }
 
-    // Try hostname files
     final String[] hostNameFiles = new String[] {"/proc/sys/kernel/hostname", "/etc/hostname"};
     for (final String hostNameFile : hostNameFiles) {
-      try {
-        final Path hostNamePath = FileSystems.getDefault().getPath(hostNameFile);
-        if (Files.isRegularFile(hostNamePath)) {
-          byte[] bytes = Files.readAllBytes(hostNamePath);
-          possibleHostname = new String(bytes, StandardCharsets.ISO_8859_1);
-        }
-      } catch (Throwable t) {
-        // Ignore
-      }
-      possibleHostname = Strings.trim(possibleHostname);
-      if (!possibleHostname.isEmpty()) {
-        log.debug("Determined hostname from file {}", hostNameFile);
+      possibleHostname = initHostNameFromFile(hostNameFile);
+      if (possibleHostname != null) {
         return possibleHostname;
       }
     }
 
-    // Try hostname command
+    possibleHostname = initHostNameFromCommand();
+    if (possibleHostname != null) {
+      return possibleHostname;
+    }
+
+    return initHostNameFromDNS();
+  }
+
+  private static String initHostNameFromEnv() {
+    String possibleHostname = null;
+    final String envVar = isWindowsOS() ? "COMPUTERNAME" : "HOSTNAME";
+    possibleHostname = getEnv(envVar);
+    if (possibleHostname == null) {
+      return null;
+    }
+    possibleHostname = possibleHostname.trim();
+    if (possibleHostname.isEmpty()) {
+      return null;
+    }
+    log.debug("Determined hostname from environment variable: {}", envVar);
+    return possibleHostname;
+  }
+
+  private static String initHostNameFromFile(final String fileName) {
+    String possibleHostname = null;
+    try {
+      final Path hostNamePath = FileSystems.getDefault().getPath(fileName);
+      if (Files.isRegularFile(hostNamePath)) {
+        byte[] bytes = Files.readAllBytes(hostNamePath);
+        possibleHostname = new String(bytes, StandardCharsets.ISO_8859_1);
+      }
+    } catch (Throwable t) {
+      return null;
+    }
+    if (possibleHostname == null) {
+      return null;
+    }
+    possibleHostname = possibleHostname.trim();
+    if (possibleHostname.isEmpty()) {
+      return null;
+    }
+    log.debug("Determined hostname from file {}", fileName);
+    return possibleHostname;
+  }
+
+  private static String initHostNameFromCommand() {
+    String possibleHostname = null;
     try (final TraceScope scope = AgentTracer.get().muteTracing();
         final BufferedReader reader =
             new BufferedReader(
@@ -4232,21 +4259,35 @@ static String initHostName() {
       possibleHostname = reader.readLine();
     } catch (final Throwable ignore) {
       // Ignore.  Hostname command is not always available
+      return null;
     }
-
-    if (possibleHostname != null && !possibleHostname.isEmpty()) {
-      log.debug("Determined hostname from hostname command");
-      return possibleHostname.trim();
+    if (possibleHostname == null) {
+      return null;
     }
+    possibleHostname = possibleHostname.trim();
+    if (possibleHostname.isEmpty()) {
+      return null;
+    }
+    log.debug("Determined hostname from hostname command");
+    return possibleHostname;
+  }
 
-    // From DNS
+  private static String initHostNameFromDNS() {
+    String possibleHostname = null;
     try {
-      return InetAddress.getLocalHost().getHostName();
+      possibleHostname = InetAddress.getLocalHost().getHostName();
     } catch (final UnknownHostException e) {
-      // If we are not able to detect the hostname we do not throw an exception.
+      return null;
     }
-
-    return null;
+    if (possibleHostname == null) {
+      return null;
+    }
+    possibleHostname = possibleHostname.trim();
+    if (possibleHostname.isEmpty()) {
+      return null;
+    }
+    log.debug("Determined hostname from DNS");
+    return possibleHostname;
   }
 
   private static boolean isWindowsOS() {
diff --git a/telemetry/src/test/groovy/datadog/telemetry/HostInfoTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/HostInfoTest.groovy
index e6ea908694b..485822c3199 100644
--- a/telemetry/src/test/groovy/datadog/telemetry/HostInfoTest.groovy
+++ b/telemetry/src/test/groovy/datadog/telemetry/HostInfoTest.groovy
@@ -1,11 +1,20 @@
 package datadog.telemetry
 
+import datadog.trace.api.Config
 import datadog.trace.api.Platform
 import org.junit.Assume
+import spock.lang.Shared
 import spock.lang.Specification
 
 class HostInfoTest extends Specification {
-  void 'getHostname'() {
+
+  @Shared
+  final boolean unameAvailable = 'uname -a'.execute().waitFor() == 0
+
+  @Shared
+  final String unameN = 'uname -n'.execute().text.trim()
+
+  void 'getHostname is not null or empty'() {
     when:
     final hostname = HostInfo.getHostname()
 
@@ -14,6 +23,71 @@ class HostInfoTest extends Specification {
     !hostname.trim().isEmpty()
   }
 
+  void 'getHostname matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = HostInfo.getHostname()
+
+    then:
+    hostname == unameN
+  }
+
+  void 'getHostname from env var matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = Config.initHostNameFromEnv()
+    Assume.assumeNotNull(hostname)
+
+    then:
+    hostname == unameN
+  }
+
+  void 'getHostname from /proc/sys/kernel/hostname matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = Config.initHostNameFromFile("/proc/sys/kernel/hostname")
+    Assume.assumeNotNull(hostname)
+
+    then:
+    hostname == unameN
+  }
+
+  void 'getHostname from /etc/hostname matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = Config.initHostNameFromFile("/etc/hostname")
+    Assume.assumeNotNull(hostname)
+
+    then:
+    hostname == unameN
+  }
+
+  void 'getHostname from hostname command matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = Config.initHostNameFromCommand()
+    Assume.assumeNotNull(hostname)
+
+    then:
+    hostname == unameN
+  }
+
+  void 'getHostname from DNS matches uname -n'() {
+    Assume.assumeTrue(unameAvailable)
+
+    when:
+    final hostname = Config.initHostNameFromDNS()
+    Assume.assumeNotNull(hostname)
+
+    then:
+    hostname == unameN
+  }
+
   void 'getOsName'() {
     when:
     final osName = HostInfo.getOsName()
@@ -32,7 +106,7 @@ class HostInfoTest extends Specification {
   }
 
   void 'compare to uname'() {
-    Assume.assumeTrue('uname -a'.execute().waitFor() == 0)
+    Assume.assumeTrue(unameAvailable)
 
     expect:
     HostInfo.getHostname() == 'uname -n'.execute().text.trim()