Do not assume hostname binary is available (#179)

* Do not assume hostname binary is available * Use canonical name * Try Addrinfo.getaddrinfo if hostname file not found
DataDog · Sep 4, 2019 · 2c2606b · 2c2606b
1 parent 3ba08d1
commit 2c2606b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/capistrano/datadog.rb b/lib/capistrano/datadog.rb
@@ -90,7 +90,7 @@ def record_hostname(hostname)
       end
 
       def report()
-        hostname = %x[hostname -f].strip
+        hostname = Dogapi.find_localhost
         user = Etc.getlogin
 
         # Lazy randomness

diff --git a/lib/dogapi/common.rb b/lib/dogapi/common.rb
@@ -2,6 +2,7 @@
 require 'net/https'
 require 'socket'
 require 'uri'
+require 'English'
 
 require 'rubygems'
 require 'multi_json'
@@ -163,11 +164,9 @@ def Dogapi.find_datadog_host
   @@hostname = nil
 
   def Dogapi.find_localhost
-    begin
-      # prefer hostname -f over Socket.gethostname
-      @@hostname ||= %x[hostname -f].strip
-    rescue
-      raise 'Cannot determine local hostname via hostname -f'
-    end
+    @@hostname ||= %x[hostname -f].strip
+  rescue SystemCallError
+    raise $ERROR_INFO unless $ERROR_INFO.class.name == 'Errno::ENOENT'
+    @@hostname = Addrinfo.getaddrinfo(Socket.gethostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
   end
 end