instana 1.10.3-java → 1.10.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dba3779f4bc86e26583716484fd49063e9e56ad27d19fb78c5a255544d44fac
-  data.tar.gz: 24f0f1fb3fe6d12d58b531a2e11f7e36f81a210758a51a794b464bb0fc554ba0
+  metadata.gz: 346cd335b9d396c17a51bae447c174e8fc7a51b7b50d8ca9cf529edf8f8f79af
+  data.tar.gz: bd715a791082dc0cf60d4de992be8aea223dfe4a4cf91e4f91693020754939c8
 SHA512:
-  metadata.gz: 6e5a55cd765dbaac1af1544b40a026be3f37aa73f9c2cf97b928b784b31e48cb30b021c5891b711ec4c96094fd3ae8c731229de13366865c71912e05716adbcd
-  data.tar.gz: 82a5504c73b5c04e7ae76f52c712920b06d5be10e0ccd36253d16576ccbe6e7d28a27a885e3ff845dd8b711177fd00a66588fa5c877f01be70151c20505d948c
+  metadata.gz: 7fbd3d312c7d3761633d8f2895b68052495775a166a823fcc3b524be2246f3d10316aedcb0e70b87e39e8a1490cdb58fc51b58e78da09bf2c667c468ad1fadaf
+  data.tar.gz: 8b78f6772d7325baadb37c34f02e1ec4d35909d07f16674fc1e58c1a1f6f933abac8a9ddb16cfcef8fe7fdaff439c79e031e253b38d888ecde1f1864c70cb84b

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: java
 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
   requirement: !ruby/object:Gem::Requirement