instana 1.203.0 → 1.204.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4a3e85003438c1690ddc13b6e475bcb1765155bf71b90c2799b8037033a9ce3
-  data.tar.gz: d6fcc234fa717a23048e674ba76a4b7ad78cf81bf1c105ff5dce226d95cc7b82
+  metadata.gz: d6c2235234526a14bbb8818b104e9417f4683179b2166cb222fe136af32794d4
+  data.tar.gz: 16a190359fa7208ceeaf7170db5cfc732bcb464837f6acde9eb1c5be08b09eba
 SHA512:
-  metadata.gz: a2d908c112040f6e833c23e6462e0b7c0696d72520767693b911aa6ddb0f8547a5c51518dd46826efddbb0747820014085ca9c3103dae61315821c99f5b49b34
-  data.tar.gz: 47871736c4c8b3f2427e9647e2769209b952bec8534a78c0c9875d642549b44545d93d4ae213bde3c00566f7428a33955481473b489c7894fd7a47a87d6d9e42
+  metadata.gz: d1465d42aeee46d0db43c2563b6bea541efddb553bb30fec875cc1cc2b5de30303476258ad889ccc9c6b10c4e1164f12001c743c16de0dafebce8e0020fd850b
+  data.tar.gz: b87b819750e3901f524609b89c2c8a96ac54965d8c6db2f4100a9cc2586cfafd55be20b30516364fdbec1199da7db8c987b6fb8f4edfc82761624caf5ea5d94b

data/lib/instana/activators/action_mailer.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class ActionMailer < Activator
       def can_instrument?
-        defined?(::ActionMailer::Base)
+        defined?(::ActionMailer::Base) && defined?(ActiveSupport::Executor)
       end
 
       def instrument

data/lib/instana/config.rb

@@ -67,7 +67,7 @@ module Instana
       @config[:graphql]            = { :enabled => true }
       @config[:nethttp]            = { :enabled => true }
       @config[:redis]              = { :enabled => true }
-      @config[:'resque-client']    = { :enabled => true }
+      @config[:'resque-client']    = { :enabled => true, :propagate => true }
       @config[:'resque-worker']    = { :enabled => true, :'setup-fork' => true }
       @config[:'rest-client']      = { :enabled => true }
       @config[:'sidekiq-client']   = { :enabled => true }

data/lib/instana/instrumentation/resque.rb

@@ -28,7 +28,7 @@ module Instana
           kvs = collect_kvs(:enqueue, klass, args)
 
           Instana.tracer.trace(:'resque-client', kvs) do
-            args.push(::Instana.tracer.context.to_hash)
+            args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(klass, *args)
           end
         else
@@ -42,7 +42,7 @@ module Instana
           kvs[:Queue] = queue.to_s if queue
 
           Instana.tracer.trace(:'resque-client', kvs) do
-            args.push(::Instana.tracer.context.to_hash)
+            args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(queue, klass, *args)
           end
         else
@@ -78,7 +78,7 @@ module Instana
           ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" } if Instana::Config[:verbose]
         end
 
-        trace_context = if job.payload['args'][-1].is_a?(Hash) && job.payload['args'][-1].keys.include?('trace_id')
+        trace_context = if ::Instana.config[:'resque-client'][:propagate] && job.payload['args'][-1].is_a?(Hash) && job.payload['args'][-1].keys.include?('trace_id')
                           context_from_wire = job.payload['args'].pop
                           ::Instana::SpanContext.new(
                             context_from_wire['trace_id'],

data/lib/instana/secrets.rb

@@ -11,7 +11,7 @@ module Instana
     end
 
     def remove_from_query(str, secret_values = Instana.agent.secret_values)
-      return str unless secret_values
+      return str unless secret_values && str
 
       begin
         url = URI(str)

data/lib/instana/tracing/processor.rb

@@ -2,6 +2,7 @@
 # (c) Copyright Instana Inc. 2016
 
 require 'thread'
+require 'forwardable'
 
 module Instana
   class Processor

data/lib/instana/tracing/span.rb

@@ -80,34 +80,16 @@ module Instana
     # @param limit [Integer] Limit the backtrace to the top <limit> frames
     #
     def add_stack(limit: 30, stack: Kernel.caller)
-      frame_count = 0
-      sanitized_stack = []
-      @data[:stack] = []
-      limit = 40 if limit > 40
-
-      stack.each do |i|
-        # If the stack has the full instana gem version in it's path
-        # then don't include that frame. Also don't exclude the Rack module.
-        if !i.match(/instana\/instrumentation\/rack.rb/).nil? ||
-          (i.match(::Instana::VERSION_FULL).nil? && i.match('lib/instana/').nil?)
-
-          x = i.split(':')
-
-          sanitized_stack << {
-            :c => x[0],
-            :n => x[1],
-            :m => x[2]
-          }
-        end
-      end
-
-      if sanitized_stack.length > limit
-        # (limit * -1) gives us negative form of <limit> used for
-        # slicing from the end of the list. e.g. stack[-30, 30]
-        @data[:stack] = sanitized_stack[limit*-1, limit]
-      else
-        @data[:stack] = sanitized_stack
-      end
+      @data[:stack] = stack
+                      .map do |call|
+        file, line, *method = call.split(':')
+
+        {
+          c: file,
+          n: line,
+          m: method.join(' ')
+        }
+      end.take(limit > 40 ? 40 : limit)
     end
 
     # Log an error into the span

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.203.0"
+  VERSION = "1.204.0.pre3"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/net_http_test.rb

@@ -29,6 +29,24 @@ class NetHTTPTest < Minitest::Test
     WebMock.disable_net_connect!
   end
 
+  def test_get_without_query
+    clear_all!
+    WebMock.allow_net_connect!
+
+    Instana.tracer.start_or_continue_trace(:"net-http-test") do
+      Net::HTTP.get(URI('http://127.0.0.1:6511/'))
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
+
+    http_span = find_first_span_by_name(spans, :'net-http')
+    assert_equal "http://127.0.0.1:6511/", http_span[:data][:http][:url]
+    assert_equal "200", http_span[:data][:http][:status]
+
+    WebMock.disable_net_connect!
+  end
+
   def test_block_request
     clear_all!
     WebMock.allow_net_connect!

data/test/instrumentation/resque_test.rb

@@ -112,6 +112,41 @@ class ResqueClientTest < Minitest::Test
     assert_equal "SET", redis2_span[:data][:redis][:command]
   end
 
+  def test_worker_job_no_propagate
+    ::Instana.config[:'resque-client'][:propagate] = false
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
+      ::Resque.enqueue_to(:critical, FastJob)
+    end
+
+    resque_job = Resque.reserve('critical')
+    @worker.work_one_job(resque_job)
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 5, spans.length
+
+    client_span = spans[0]
+    resque_span = spans[4]
+    redis1_span = spans[3]
+    redis2_span = spans[2]
+
+    assert_equal :'resque-client', client_span[:n]
+
+    assert_equal :'resque-worker', resque_span[:n]
+    refute_equal client_span[:s], resque_span[:p]
+    assert_equal false, resque_span.key?(:error)
+    assert_equal false, resque_span.key?(:ec)
+    assert_equal "FastJob", resque_span[:data][:'resque-worker'][:job]
+    assert_equal "critical", resque_span[:data][:'resque-worker'][:queue]
+    assert_equal false, resque_span[:data][:'resque-worker'].key?(:error)
+
+    assert_equal :redis, redis1_span[:n]
+    assert_equal "SET", redis1_span[:data][:redis][:command]
+    assert_equal :redis, redis2_span[:n]
+    assert_equal "SET", redis2_span[:data][:redis][:command]
+  ensure
+    ::Instana.config[:'resque-client'][:propagate] = true
+  end
+
   def test_worker_error_job
     Resque::Job.create(:critical, ErrorJob)
     @worker.work(0)

data/test/secrets_test.rb

@@ -88,6 +88,15 @@ class SecretsTest < Minitest::Test
     assert_redacted @subject.remove_from_query(url, sample_config), %w(filter[instantiate]), raw_str: true
   end
 
+  def test_with_nil
+    sample_config = {
+      "matcher"=>"contains",
+      "list"=>["stan"]
+    }
+
+    assert_equal @subject.remove_from_query(nil, sample_config), nil
+  end
+
   private
 
   def url_for(keys)

data/test/support/apps/resque/jobs/resque_fast_job.rb

@@ -7,7 +7,9 @@ require "net/http"
 class FastJob
   @queue = :critical
 
-  def self.perform
+  def self.perform(*args)
+    raise 'Invalid Args' unless args.empty?
+
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
     elsif ENV.key?('REDIS_URL')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.203.0
+  version: 1.204.0.pre3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-29 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -370,9 +370,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: