instana 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf63c6985d10b3ce5403036d809fb7bf7aff1e25
-  data.tar.gz: 790c3025b8282144f1acd64d4bdf5afb5ad011c9
+  metadata.gz: 4cb7dba41c21a606e4cdbfa46abe2f365235cd6a
+  data.tar.gz: 45236a2a90db9f2b559808febe3bd03007c35bc3
 SHA512:
-  metadata.gz: e132178b3619e5c16a954dec186d771e8606a78156f4c8c8ebddab3b2ba10d46d78a444b81f07497948362888e33face1e6a401f52fbf8f98c9492e3bfa9c95a
-  data.tar.gz: 5bc7cf25c2deeb665b3a71a2202df5911783501727f5df174ff605ab72c2278560897c0b785f3d5e66801d219fe560ef4e78c8a2e7b4cbe53874a0f8dddc8089
+  metadata.gz: 94e3a10570b4a2513dd2ecd26bf1cae2e2d08dedcf165cbd30e549a3ce49003cc3bcca943de158959c55fed7d44cd2504a57855f97486e239561e0c6baaff4fa
+  data.tar.gz: 4f9e776398af412dd270bfe61b6d73d140780b32217d101ed0340ef04b60fc33a7642d8f173c7fb59d649bf3c814479da7ca3bfc5294f70f6c46ecda84775cc9

data/lib/instana/agent.rb

@@ -9,12 +9,14 @@ module Instana
   class Agent
     attr_accessor :state
 
+    LOCALHOST = '127.0.0.1'.freeze
+    MIME_JSON = 'application/json'.freeze
+    DISCOVERY_PATH = 'com.instana.plugin.ruby.discovery'.freeze
+
     def initialize
       # Host agent defaults.  Can be configured via Instana.config
-      @request_timeout = 5000
-      @host = '127.0.0.1'
+      @host = LOCALHOST
       @port = 42699
-      @server_header = 'Instana Agent'
 
       # Supported two states (unannounced & announced)
       @state = :unannounced
@@ -35,6 +37,13 @@ module Instana
       @timers = ::Timers::Group.new
       @announce_timer = nil
       @collect_timer = nil
+
+      # Detect if we're on linux or not (used in host_agent_ready?)
+      @is_linux = (RUBY_PLATFORM =~ /linux/i) ? true : false
+
+      # In case we're running in Docker, have the default gateway available
+      # to check in case we're running in bridged network mode
+      @default_gateway = `/sbin/ip route | awk '/default/ { print $3 }'`.chomp
     end
 
     ##
@@ -99,8 +108,7 @@ module Instana
       arguments.shift
       announce_payload[:args] = arguments
 
-      path = 'com.instana.plugin.ruby.discovery'
-      uri = URI.parse("http://#{@host}:#{@port}/#{path}")
+      uri = URI.parse("http://#{@host}:#{@port}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
       req.body = announce_payload.to_json
 
@@ -152,15 +160,37 @@ module Instana
     ##
     # host_agent_ready?
     #
-    # Check that the host agent is available and can be contacted.
+    # Check that the host agent is available and can be contacted.  This will
+    # first check localhost and if not, then attempt on the default gateway
+    # for docker in bridged mode.  It will save where it found the host agent
+    # in @host that is used in subsequent HTTP calls.
     #
     def host_agent_ready?
-      uri = URI.parse("http://#{@host}:#{@port}/")
+      # Localhost
+      uri = URI.parse("http://#{LOCALHOST}:#{@port}/")
+      req = Net::HTTP::Get.new(uri)
+
+      response = make_host_agent_request(req)
+
+      if response && (response.code.to_i == 200)
+        @host = LOCALHOST
+        return true
+      end
+
+      return false unless @is_linux
+
+      # We are potentially running on Docker in bridged networking mode.
+      # Attempt to contact default gateway
+      uri = URI.parse("http://#{@default_gateway}:#{@port}/")
       req = Net::HTTP::Get.new(uri)
 
       response = make_host_agent_request(req)
 
-      (response && response.code.to_i == 200) ? true : false
+      if response && (response.code.to_i == 200)
+        @host = @default_gateway
+        return true
+      end
+      false
     rescue => e
       Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
@@ -202,8 +232,8 @@ module Instana
     # of type Net::HTTP::Get|Put|Head
     #
     def make_host_agent_request(req)
-      req['Accept'] = 'application/json'
-      req['Content-Type'] = 'application/json'
+      req[:Accept] = MIME_JSON
+      req[:'Content-Type'] = MIME_JSON
 
       response = nil
       Net::HTTP.start(req.uri.hostname, req.uri.port, :open_timeout => 1, :read_timeout => 1) do |http|
@@ -218,7 +248,6 @@ module Instana
       return nil
     end
 
-    private
     ##
     # take_snapshot
     #

data/lib/instana/version.rb

@@ -1,3 +1,3 @@
 module Instana
-  VERSION = "0.8.3"
+  VERSION = "0.8.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler