instana 1.10.0.slimfast → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 636d84b9e35dfd6f03f1186ecda22b22b96105725007ca2f48dccc41198782f7
-  data.tar.gz: 16842c4bacc3cac2c347babee2653fbfd3462fb0ee466b5317d22167465088ab
+  metadata.gz: adc4cb8ce42b827dfc8b08f0e52de9950ca1c57f9ede6ec86259ac9a81ff3ce0
+  data.tar.gz: 5b0c1b1afbb4f5d76db69aa88dc8e610e23e1e11babe04f6f0c0242e8a5ae05a
 SHA512:
-  metadata.gz: e30db43f11f5b3574405ef02ce18c1bb755bad5b0b5e28bd3f8d5a74846b9feeb08e0541f66a74bb174cb4c01be889ab896a34b988d26ab93577f4de2561c34a
-  data.tar.gz: 2cc0b8257cdb95df46fa3955c081a12188d7abf4f0a639929f50264b94961fa61bb9de4f092cf04d0144c985d4a871084114aaad14ad1b7671dea908b4a3bd43
+  metadata.gz: 8c11d0557caf968f3a238821825d08fa8a3a555d4e38cedaefb2f2db958e0300dede11da2d526bdfee03ec87fa3ff5400b5b93adab190e72bb9bd70f3f6230e3
+  data.tar.gz: 44708267befb20198a8bef872d09977ee033a7789c63c042f0b78d87549d4df47fa589501158d5e71d6c32b3fcf025f1706771513f43b366087d0ac43808cf8a

data/benchmarks/Gemfile

@@ -3,5 +3,9 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/instana/#{repo_name}" }
 
+gem "puma"
+gem "rack"
+gem "ruby-prof"
+
 gem "instana", :path => "~/Projects/instana/ruby-sensor"
 

data/lib/instana/agent.rb

@@ -176,7 +176,7 @@ module Instana
         @collect_timer.pause
         @announce_timer.pause
 
-        ::Instana.logger.debug { "#{Thread.current}: Agent exiting. Reporting final #{::Instana.processor.queue_count} trace(s)." }
+        ::Instana.logger.debug { "#{Thread.current}: Agent exiting. Reporting final spans (if any)." }
         ::Instana.processor.send
       end
     end

data/lib/instana/agent/helpers.rb

@@ -44,9 +44,12 @@ module AgentHelpers
     # In test, we're always ready :-)
     return true if ENV.key?('INSTANA_TEST')
 
-    if !@is_resque_worker && forked?
-      ::Instana.logger.debug "Instana: detected fork. (this pid: #{Process.pid}/#{Process.ppid})  Calling after_fork"
-      after_fork
+    # Occasionally Run Fork detection
+    if rand(10) > 8
+      if !@is_resque_worker && (@process[:pid] != Process.pid)
+        ::Instana.logger.debug "Instana: detected fork. (this pid: #{Process.pid}/#{Process.ppid})  Calling after_fork"
+        after_fork
+      end
     end
 
     @state == :announced

data/lib/instana/frameworks/instrumentation/action_controller.rb

@@ -42,14 +42,26 @@ module Instana
             name = "Default"
           end
         end
-        name ||= opts[:template]
-        name ||= opts[:file]
-        name = "Nothing" if opts[:nothing]
-        name = "Plaintext" if opts[:plain]
-        name = "JSON" if opts[:json]
-        name = "XML" if opts[:xml]
-        name = "Raw" if opts[:body]
-        name = "Javascript" if opts[:js]
+
+        return name if name
+
+        if opts.key?(:template)
+          name ||= opts[:template]
+        elsif opts.key?(:file)
+          name ||= opts[:file]
+        elsif opts.key?(:nothing)
+          name = "Nothing"
+        elsif opts.key?(:plain)
+          name = "Plaintext"
+        elsif opts.key?(:json)
+          name = "JSON"
+        elsif opts.key?(:xml)
+          name = "XML"
+        elsif opts.key?(:body)
+          name = "Raw"
+        elsif opts.key?(:js)
+          name = "Javascript"
+        end
         name
       end
     end

data/lib/instana/tracer.rb

@@ -82,13 +82,13 @@ module Instana
     #
     def log_start_or_continue(name, kvs = {}, incoming_context = nil)
       return if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
-      ::Instana.logger.debug "#{__method__} passed a block.  Use `start_or_continue` instead!" if block_given?
+      ::Instana.logger.debug { "#{__method__} passed a block.  Use `start_or_continue` instead!" } if block_given?
 
       # Handle the potential variations on `incoming_context`
       if incoming_context
         if incoming_context.is_a?(Hash)
           if !incoming_context.empty?
-            parent_context = SpanContext.new(incoming_context[:trace_id], incoming_context[:span_id])
+            parent_context = SpanContext.new(incoming_context[:trace_id], incoming_context[:span_id], incoming_context[:level])
           end
         else
           parent_context = incoming_context

data/lib/instana/tracing/processor.rb

@@ -17,10 +17,6 @@ module Instana
     #
     # @param [spans] - the trace to be added to the queue
     def add_spans(spans)
-      # Do a quick checkup on our background thread.
-      if ::Instana.agent.collect_thread.nil? || !::Instana.agent.collect_thread.alive?
-        ::Instana.agent.spawn_background_thread
-      end
       spans.each { |span| @queue.push(span)}
     end
 
@@ -28,9 +24,11 @@ module Instana
     #
     # @param [Trace] - the trace to be added to the queue
     def add_span(span)
-      # Do a quick checkup on our background thread.
-      if ::Instana.agent.collect_thread.nil? || !::Instana.agent.collect_thread.alive?
-        ::Instana.agent.spawn_background_thread
+      # Occasionally, do a checkup on our background thread.
+      if rand(10) > 8
+        if ::Instana.agent.collect_thread.nil? || !::Instana.agent.collect_thread.alive?
+          ::Instana.agent.spawn_background_thread
+        end
       end
       @queue.push(span)
     end

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.10.0.slimfast"
+  VERSION = "1.10.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.0.slimfast
+  version: 1.10.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -310,9 +310,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: