Merge branch '19-user-agent' into 'master'

Resolve "Can custodian send a user agent string please"

Closes #19

See merge request !13

2 files changed, 22 insertions, 5 deletions

diff --git a/lib/custodian/alerts/graphite.rb b/lib/custodian/alerts/graphite.rb
index 0244047..cca5ece 100644
--- a/lib/custodian/alerts/graphite.rb
+++ b/lib/custodian/alerts/graphite.rb
@@ -1,4 +1,5 @@
 require 'socket'
+require 'timeout'
 
 #
 #  The graphite-alerter.
@@ -61,12 +62,25 @@ module Custodian
         payload = "custodian.#{test}.#{host}.test_duration_ms #{ms} #{Time.now.to_i}"
 
         #
-        #  Send via UDP.
+        #  Send metrics via TCP.
         #
-        socket = UDPSocket.new
-        socket.send(payload, 0, @target, 2003)
-        socket.close
-
+        begin
+          Timeout.timeout(10) do
+            begin
+              socket = TCPSocket.new(@target,2003)
+              puts payload
+              socket.write(payload)
+              socket.flush
+              socket.close
+            rescue Errno::ENETUNREACH
+              puts("Metrics host unreachable: #{e}")
+            rescue StandardError => e
+              puts("Error submitting metrics: #{e}")
+            end
+          end
+        rescue Timeout::Error
+          puts('Timeout submitting metrics')
+        end
       end
 
       register_alert_type 'graphite'
diff --git a/lib/custodian/protocoltest/http.rb b/lib/custodian/protocoltest/http.rb
index 0bf1a68..5f013df 100644
--- a/lib/custodian/protocoltest/http.rb
+++ b/lib/custodian/protocoltest/http.rb
@@ -360,6 +360,9 @@ module Custodian
 
           c = Curl::Easy.new(test_url)
 
+          # setup a user-agent.
+          c.headers["User-Agent"] = "custodian/protocol-tester"
+
           c.resolve_mode = resolve_mode
 
           #