instana 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79acb521d7fb12370fa1b4b69b4d48512214138ad76c60539b2f16863e955481
-  data.tar.gz: 374d235f20bb9c82d9e5e9d3b0d735c76e8c59e121d2f515b811fbe8a0c11b0c
+  metadata.gz: 66eea5baa9086f0be88ec5bb7f8502e3cdaafaf7b3b8648571584293fe9b674d
+  data.tar.gz: 3302565c8feac78f09954dedc1df328c62baa0f5f3a0992a5e456124f96920bf
 SHA512:
-  metadata.gz: 40422237e109b69128283e16053b5a6953897a7b108fedbc70c072a025a645a6c10b466b723fe028aba332960da2809ce3b65a2ffed9bcbbb7728a466b6877a4
-  data.tar.gz: cb5d9ec34fff06c9886a95e0191cf72527ed004984001cad4f993840ba1a856d719d6f29e991ace9eca23f07530197b0c0d53b2e035ebf6b95e378fe80d6cec7
+  metadata.gz: f89823c2bbf24e4d41ea2756b639910d58ee991ed7144b4c47263f563e2fbd00f08cf4660c629953b9615f2696fa52d74e0f6cf26d95fd63b3b4eed8d8ef1a38
+  data.tar.gz: 8ff69135b822c9027819cbd8bcf3757aba741455587519afc7ecbca4a24a11d4549b103a542de153374ebfe35373cd4ae94b15c73e0bb29f22d8f3049e55caf7

data/lib/instana/agent.rb

@@ -114,6 +114,10 @@ module Instana
 
     # Sets up periodic timers and starts the agent in a background thread.
     #
+    # There are three possible states for the agent:
+    #   - :unannounced
+    #   - :announced
+    #   - :ready
     def setup
       # The announce timer
       # We attempt to announce this ruby sensor to the host agent.
@@ -199,8 +203,7 @@ module Instana
       ::Instana.logger.debug { e.backtrace.join("\r\n") }
     ensure
       if @state == :ready
-        # Pause the timers so they don't fire while we are
-        # reporting traces
+        # Pause the timers so they don't fire while we are reporting traces
         @announce_timer.pause
         @pending_timer.pause
         @collect_timer.pause
@@ -457,8 +460,7 @@ module Instana
     rescue Errno::ECONNREFUSED
       return nil
     rescue => e
-      Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
-      Instana.logger.debug { e.backtrace.join("\r\n") } unless @testmode
+      Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message} (to #{req.uri})" }
       return nil
     end
   end

data/lib/instana/agent/hooks.rb

@@ -5,6 +5,8 @@ module AgentHooks
   def after_fork
     ::Instana.logger.debug "after_fork hook called. Falling back to unannounced state and spawning a new background agent thread."
 
+    @timers.cancel
+
     # Reseed the random number generator for this
     # new thread.
     srand
@@ -23,6 +25,8 @@ module AgentHooks
   def after_resque_fork
     ::Instana.logger.debug "after_resque_fork hook called. pid/ppid: #{Process.pid}/#{Process.ppid}"
 
+    @timers.cancel
+
     # Reseed the random number generator for this
     # new thread.
     srand

data/lib/instana/config.rb

@@ -4,11 +4,13 @@ module Instana
     def initialize
       @config = {}
       if ENV.key?('INSTANA_AGENT_HOST')
+        ::Instana.logger.debug "Using custom agent host location specified in INSTANA_AGENT_HOST (#{ENV['INSTANA_AGENT_HOST']})"
         @config[:agent_host] = ENV['INSTANA_AGENT_HOST']
       else
         @config[:agent_host] = '127.0.0.1'
       end
       if ENV.key?('INSTANA_AGENT_PORT')
+        ::Instana.logger.debug "Using custom agent port specified in INSTANA_AGENT_PORT (#{ENV['INSTANA_AGENT_PORT']})"
         @config[:agent_port] = ENV['INSTANA_AGENT_PORT']
       else
         @config[:agent_port] = 42699

data/lib/instana/instrumentation/net-http.rb

@@ -36,13 +36,6 @@ if defined?(::Net::HTTP) && ::Instana.config[:nethttp][:enabled]
       # The core call
       response = request_without_instana(*args, &block)
 
-      # Debug only check: Pickup response headers; convert back to base 10 integer and validate
-      if ENV.key?('INSTANA_DEBUG') && response.key?('X-Instana-T')
-        if ::Instana.tracer.trace_id != ::Instana::Util.header_to_id(response.header['X-Instana-T'])
-          ::Instana.logger.debug "#{Thread.current}: Trace ID mismatch on net/http response! ours: #{::Instana.tracer.trace_id} theirs: #{their_trace_id}"
-        end
-      end
-
       kv_payload[:http][:status] = response.code
       if response.code.to_i.between?(500, 511)
         # Because of the 5xx response, we flag this span as errored but

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.10.3"
+  VERSION = "1.10.4"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler