instana 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3a3d50ffdbca640b2c32a3f51243387eb7a15a3fe5e2810c3d93c2ea98f92be
-  data.tar.gz: f0c0665f06c3e2faa8aa0687e1f3d03e905e18cb4006dac17f50a2868f18ef53
+  metadata.gz: 9d171f2b3b043b7b18a534a9609b47098521a9de99755d347e3c338fb0d1adfa
+  data.tar.gz: 12d93179facc0038eb94b8233386cb7b8a0849d9cdf0f9a9f2ef66cbb9ed029d
 SHA512:
-  metadata.gz: 863436a63b5014db4137887f4f223ca8a7ed6759238e009258d2912b0f86328b705d388a61670486a5f194209d83ac23f27825fb0672f59adc0492dd6cf7ee83
-  data.tar.gz: 0e2e0ba614455fcbbddbe376a76e006686a8ef3456c020d5c545ae0d247fad033d99d31815f3ceb7b2a881d4b35388e955d255bc4770e940072c38eb66ae0925
+  metadata.gz: 05a5f54ed77c162a58ed331632398abe0777821ad0360978d88caf39cb8748dc91203696ac25120b048c0771e336bcb841e01e1539aa45de761efe8c99ec1847
+  data.tar.gz: 2b966772f1435202a9077a451e85ddcc3a598b2835cfdd1fd7b395685863b5d0bf11920ad1302f845663a6efce62e87b13574b8a3fa3f8673de0122414ef3790

data/lib/instana/instrumentation/redis.rb

@@ -2,28 +2,31 @@ if defined?(::Redis) && ::Instana.config[:redis][:enabled]
   ::Redis::Client.class_eval do
     def call_with_instana(*args, &block)
       kv_payload = { redis: {} }
+      dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
 
-      if !Instana.tracer.tracing? || ::Instana.tracer.tracing_span?(:redis)
+      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name)
         return call_without_instana(*args, &block)
       end
 
-      ::Instana.tracer.log_entry(:redis)
-
       begin
-        kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
-        kv_payload[:redis][:db] = db.to_s
-        kv_payload[:redis][:command] = args[0][0].to_s.upcase
-      rescue
-        nil
-      end
+        ::Instana.tracer.log_entry(:redis)
 
-      call_without_instana(*args, &block)
-    rescue => e
-      ::Instana.tracer.log_info({ redis: {error: true} })
-      ::Instana.tracer.log_error(e)
-      raise
-    ensure
-      ::Instana.tracer.log_exit(:redis, kv_payload)
+        begin
+          kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
+          kv_payload[:redis][:db] = db.to_s
+          kv_payload[:redis][:command] = args[0][0].to_s.upcase
+        rescue
+          nil
+        end
+
+        call_without_instana(*args, &block)
+      rescue => e
+        ::Instana.tracer.log_info({ redis: {error: true} })
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:redis, kv_payload)
+      end
     end
 
     ::Instana.logger.debug "Instrumenting Redis"
@@ -33,29 +36,32 @@ if defined?(::Redis) && ::Instana.config[:redis][:enabled]
 
     def call_pipeline_with_instana(*args, &block)
       kv_payload = { redis: {} }
+      dnt_spans = [:redis, :'resque-client', :'sidekiq-client']
 
-      if !Instana.tracer.tracing? || ::Instana.tracer.tracing_span?(:redis)
+      if !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name)
         return call_pipeline_without_instana(*args, &block)
       end
 
-      ::Instana.tracer.log_entry(:redis)
-
-      pipeline = args.first
       begin
-        kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
-        kv_payload[:redis][:db] = db.to_s
-        kv_payload[:redis][:command] = pipeline.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE'
-      rescue
-        nil
-      end
+        ::Instana.tracer.log_entry(:redis)
 
-      call_pipeline_without_instana(*args, &block)
-    rescue => e
-      ::Instana.tracer.log_info({ redis: {error: true} })
-      ::Instana.tracer.log_error(e)
-      raise
-    ensure
-      ::Instana.tracer.log_exit(:redis, kv_payload)
+        pipeline = args.first
+        begin
+          kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"
+          kv_payload[:redis][:db] = db.to_s
+          kv_payload[:redis][:command] = pipeline.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE'
+        rescue
+          nil
+        end
+
+        call_pipeline_without_instana(*args, &block)
+      rescue => e
+        ::Instana.tracer.log_info({ redis: {error: true} })
+        ::Instana.tracer.log_error(e)
+        raise
+      ensure
+        ::Instana.tracer.log_exit(:redis, kv_payload)
+      end
     end
 
     alias call_pipeline_without_instana call_pipeline

data/lib/instana/version.rb

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

data/test/instrumentation/resque_test.rb

@@ -5,8 +5,8 @@ require 'resque'
 
 if ENV.key?('REDIS_URL')
   ::Resque.redis = ENV['REDIS_URL']
-elsif ENV.key?('I_REDIS_URL')
-  ::Resque.redis = ENV['I_REDIS_URL']
+elsif ENV.key?('REDIS_URL')
+  ::Resque.redis = ENV['REDIS_URL']
 else
   ::Resque.redis = 'localhost:6379'
 end
@@ -23,16 +23,15 @@ class ResqueClientTest < Minitest::Test
   end
 
   def test_enqueue
-    ::Instana.tracer.start_or_continue_trace('resque-client_test') do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
       ::Resque.enqueue(FastJob)
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
 
@@ -40,48 +39,42 @@ class ResqueClientTest < Minitest::Test
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_enqueue_to
-    ::Instana.tracer.start_or_continue_trace('resque-client_test') do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test') do
       ::Resque.enqueue_to(:critical, FastJob)
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
     assert_equal :"resque-client", resque_span[:n]
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_dequeue
-    ::Instana.tracer.start_or_continue_trace('resque-client_test', '', {}) do
+    ::Instana.tracer.start_or_continue_trace(:'resque-client_test', '', {}) do
       ::Resque.dequeue(FastJob, { :generate => :farfalla })
     end
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    assert_equal 2, spans.length
 
     sdk_span = find_first_span_by_name(spans, :'resque-client_test')
     resque_span = find_first_span_by_name(spans, :'resque-client')
-    redis_span = find_first_span_by_name(spans, :redis)
 
     assert_equal :'resque-client_test', sdk_span[:data][:sdk][:name]
-    assert_equal :"resque-client", spans[1][:n]
+    assert_equal :"resque-client", resque_span[:n]
     assert_equal "FastJob", resque_span[:data][:'resque-client'][:job]
     assert_equal :critical, resque_span[:data][:'resque-client'][:queue]
     assert_equal false, resque_span[:data][:'resque-client'].key?(:error)
-    assert_equal :redis, redis_span[:n]
   end
 
   def test_worker_job

data/test/jobs/resque_error_job.rb

@@ -7,8 +7,8 @@ class ErrorJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('I_REDIS_URL')
-      redis = Redis.new(:url => ENV['I_REDIS_URL'])
+    elsif ENV.key?('REDIS_URL')
+      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'localhost:6379')
     end

data/test/jobs/resque_fast_job.rb

@@ -7,8 +7,8 @@ class FastJob
   def self.perform
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
-    elsif ENV.key?('I_REDIS_URL')
-      redis = Redis.new(:url => ENV['I_REDIS_URL'])
+    elsif ENV.key?('REDIS_URL')
+      redis = Redis.new(:url => ENV['REDIS_URL'])
     else
       redis = Redis.new(:url => 'redis://localhost:6379')
     end

data/test/test_helper.rb

@@ -39,17 +39,17 @@ when /libraries/
     end
   end
 
-  ENV['I_REDIS_URL'] ||= 'redis://127.0.0.1:6379'
+  ENV['REDIS_URL'] ||= 'redis://127.0.0.1:6379'
 
   # Configure redis for sidekiq client
   Sidekiq.configure_client do |config|
-    config.redis = { url: ENV['I_REDIS_URL'] }
+    config.redis = { url: ENV['REDIS_URL'] }
   end
 
   # Configure redis for sidekiq worker
   $sidekiq_mode = :server
   ::Sidekiq.configure_server do |config|
-    config.redis = { url: ENV['I_REDIS_URL'] }
+    config.redis = { url: ENV['REDIS_URL'] }
   end
   $sidekiq_mode = :client
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.11.5
+  version: 1.11.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana