instana 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cb7dba41c21a606e4cdbfa46abe2f365235cd6a
-  data.tar.gz: 45236a2a90db9f2b559808febe3bd03007c35bc3
+  metadata.gz: 42faa21829471a9c09aef2c82c1bdf79cee9bb2a
+  data.tar.gz: 7f4d358d30c2bb53b3dc97a39fbcdbfb950a0db5
 SHA512:
-  metadata.gz: 94e3a10570b4a2513dd2ecd26bf1cae2e2d08dedcf165cbd30e549a3ce49003cc3bcca943de158959c55fed7d44cd2504a57855f97486e239561e0c6baaff4fa
-  data.tar.gz: 4f9e776398af412dd270bfe61b6d73d140780b32217d101ed0340ef04b60fc33a7642d8f173c7fb59d649bf3c814479da7ca3bfc5294f70f6c46ecda84775cc9
+  metadata.gz: d1b63875713111313dae3ba16b1374df8d3d70f78074c5617728eead258311d9a65cb537e03b44dc0f2e5a4b15fea7c7a0940f86957f78d91b29fd9bce81e5f9
+  data.tar.gz: 602264940c06d3e4d8ebae06f56e91af16729ead2af6c3bf5add6b434d3b6bd6576d6388dbefdc8d963fe1f4f11e5310fdf4fa9c8a014a7dcd5d0840aadf61bc

data/.travis.yml

@@ -6,11 +6,14 @@ cache:
   - vendor/bundle
 
 rvm:
-  - 2.3.1
+  - 2.3.2
+  - 2.2.6
+  - 2.1.9
+  - ruby-2.0.0-p648
 
 
 before_install:
-  - gem update --system '2.6.1'
+  - gem update --system
   - gem update bundler
   - gem --version
 

data/lib/instana.rb

@@ -19,8 +19,14 @@ module Instana
     def start
       @agent = Instana::Agent.new
       @collectors = []
+
       @logger = Logger.new(STDOUT)
-      @logger.info "Stan is on the scene.  Starting Instana instrumentation."
+      if ENV.key?('INSTANA_GEM_TEST') || ENV.key?('INSTANA_GEM_DEV')
+        @logger.level = Logger::DEBUG
+      else
+        @logger.level = Logger::WARN
+      end
+      @logger.unknown "Stan is on the scene.  Starting Instana instrumentation."
 
       # Store the current pid so we can detect a potential fork
       # later on

data/lib/instana/agent.rb

@@ -25,9 +25,9 @@ module Instana
       # every 10 minutes along side process metrics.
       @snapshot = take_snapshot
 
-      # Set last snapshot to 10 minutes ago
-      # so we send a snapshot on first report
-      @last_snapshot = Time.now - 601
+      # Set last snapshot to just under 10 minutes ago
+      # so we send a snapshot sooner than later
+      @last_snapshot = Time.now - 570
 
       # Timestamp of the last successful response from
       # entity data reporting.
@@ -43,7 +43,23 @@ module Instana
 
       # 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
+      if @is_linux
+        @default_gateway = `/sbin/ip route | awk '/default/ { print $3 }'`.chomp
+      else
+        @default_gateway = nil
+      end
+
+      # The agent UUID returned from the host agent
+      @agent_uuid = nil
+
+      @process = {}
+      cmdline = ProcTable.ps(Process.pid).cmdline.split("\0")
+      @process[:name] = cmdline.shift
+      @process[:arguments] = cmdline
+      @process[:original_pid] = Process.pid
+      # This is usually Process.pid but in the case of docker, the host agent
+      # will return to us the true host pid in which we use to report data.
+      @process[:report_pid] = nil
     end
 
     ##
@@ -100,23 +116,30 @@ module Instana
     # the host agent.
     #
     def announce_sensor
-      process = ProcTable.ps(Process.pid)
       announce_payload = {}
-      announce_payload[:pid] = Process.pid
-
-      arguments = process.cmdline.split(' ')
-      arguments.shift
-      announce_payload[:args] = arguments
+      announce_payload[:pid] = pid_namespace? ? get_real_pid : Process.pid
+      announce_payload[:args] = @process[:arguments]
 
       uri = URI.parse("http://#{@host}:#{@port}/#{DISCOVERY_PATH}")
       req = Net::HTTP::Put.new(uri)
       req.body = announce_payload.to_json
 
+      # ::Instana.logger.debug "Announce: http://#{@host}:#{@port}/#{DISCOVERY_PATH} - payload: #{req.body}"
+
       response = make_host_agent_request(req)
-      response && (response.code.to_i == 200) ? true : false
+
+      if response && (response.code.to_i == 200)
+        data = JSON.parse(response.body)
+        @process[:report_pid] = data['pid']
+        @agent_uuid = data['agentUuid']
+        true
+      else
+        false
+      end
     rescue => e
-      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
+      return false
     end
 
     ##
@@ -126,7 +149,7 @@ module Instana
     #
     def report_entity_data(payload)
       with_snapshot = false
-      path = "com.instana.plugin.ruby.#{Process.pid}"
+      path = "com.instana.plugin.ruby.#{@process[:report_pid]}"
       uri = URI.parse("http://#{@host}:#{@port}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
@@ -134,6 +157,13 @@ module Instana
       if (Time.now - @last_snapshot) > 600
         with_snapshot = true
         payload.merge!(@snapshot)
+
+        # Add in process related that could have changed since
+        # snapshot was taken.
+        p = { :pid => @process[:report_pid] }
+        p[:name] = @process[:name]
+        p[:exec_args] = @process[:arguments]
+        payload.merge!(p)
       end
 
       req.body = payload.to_json
@@ -142,18 +172,18 @@ module Instana
       if response
         last_entity_response = response.code.to_i
 
+        #::Instana.logger.debug "entity http://#{@host}:#{@port}/#{path}: response=#{last_entity_response}: #{payload.to_json}"
+
         if last_entity_response == 200
           @entity_last_seen = Time.now
           @last_snapshot = Time.now if with_snapshot
 
-          #::Instana.logger.debug "entity response #{last_entity_response}: #{payload.to_json}"
           return true
         end
-        #::Instana.logger.debug "entity response #{last_entity_response}: #{payload.to_json}"
       end
       false
     rescue => e
-      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
     end
 
@@ -192,7 +222,7 @@ module Instana
       end
       false
     rescue => e
-      Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       Instana.logger.debug e.backtrace.join("\r\n")
       return false
     end
@@ -232,8 +262,8 @@ module Instana
     # of type Net::HTTP::Get|Put|Head
     #
     def make_host_agent_request(req)
-      req[:Accept] = MIME_JSON
-      req[:'Content-Type'] = MIME_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|
@@ -241,13 +271,36 @@ module Instana
       end
       response
     rescue Errno::ECONNREFUSED => e
-      Instana.logger.debug "Agent not responding. Connection refused."
       return nil
     rescue => e
-      Instana.logger.debug "Host agent request error: #{e.inspect}"
+      Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      Instana.logger.debug e.backtrace.join("\r\n")
       return nil
     end
 
+    ##
+    # pid_namespace?
+    #
+    # Indicates whether we are running in a pid namespace (such as
+    # Docker).
+    #
+    def pid_namespace?
+      return false unless @is_linux
+      Process.pid != get_real_pid
+    end
+
+    ##
+    # get_real_pid
+    #
+    # Attempts to determine the true process ID by querying the
+    # /proc/<pid>/sched file.  This works on linux currently.
+    #
+    def get_real_pid
+      raise RuntimeError.new("Unsupported platform: get_real_pid") unless @is_linux
+      v = File.open("/proc/#{Process.pid}/sched", &:readline)
+      v.match(/\d+/).to_s.to_i
+    end
+
     ##
     # take_snapshot
     #
@@ -258,14 +311,8 @@ module Instana
       data = {}
 
       data[:sensorVersion] = ::Instana::VERSION
-      data[:pid] = ::Process.pid
       data[:ruby_version] = RUBY_VERSION
 
-      process = ::ProcTable.ps(Process.pid)
-      arguments = process.cmdline.split(' ')
-      data[:name] = arguments.shift
-      data[:exec_args] = arguments
-
       # Since a snapshot is only taken on process boot,
       # this is ok here.
       data[:start_time] = Time.now.to_s
@@ -289,7 +336,7 @@ module Instana
 
       data
     rescue => e
-      ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+      ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
       ::Instana.logger.debug e.backtrace.join("\r\n")
       return data
     end

data/lib/instana/collectors/gc.rb

@@ -50,7 +50,7 @@ module Instana
           nil
         end
       rescue => e
-        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/collectors/memory.rb

@@ -28,7 +28,7 @@ module Instana
           nil
         end
       rescue => e
-        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/collectors/thread.rb

@@ -26,7 +26,7 @@ module Instana
           nil
         end
       rescue => e
-        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         ::Instana.logger.debug e.backtrace.join("\r\n")
       end
     end

data/lib/instana/version.rb

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

metadata

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