sidekiq-worker_test.rb in instana-1.7.0

- old
+ new

@@ -10,10 +10,11 @@
   def test_successful_worker_starts_new_trace
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
 
+    disable_redis_instrumentation
     ::Sidekiq.redis_pool.with do |redis|
       redis.sadd('queues'.freeze, 'important')
       redis.lpush(
         'queue:important',
         <<-JSON
@@ -24,10 +25,11 @@
           "jid":"123456789"
         }
         JSON
       )
     end
+    enable_redis_instrumentation
     sleep 1
 
     assert_equal 1, ::Instana.processor.queue_count
     assert_successful_worker_trace(::Instana.processor.queued_traces.first)
 
@@ -37,10 +39,11 @@
   def test_failed_worker_starts_new_trace
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
 
+    disable_redis_instrumentation
     ::Sidekiq.redis_pool.with do |redis|
       redis.sadd('queues'.freeze, 'important')
       redis.lpush(
         'queue:important',
         <<-JSON
@@ -51,10 +54,12 @@
           "jid":"123456789"
         }
         JSON
       )
     end
+    enable_redis_instrumentation
+
     sleep 1
     assert_equal 1, ::Instana.processor.queue_count
     assert_failed_worker_trace(::Instana.processor.queued_traces.first)
 
     $sidekiq_mode = :client
@@ -64,15 +69,17 @@
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
 
     Instana.tracer.start_or_continue_trace(:sidekiqtests) do
+      disable_redis_instrumentation
       ::Sidekiq::Client.push(
         'queue' => 'important',
         'class' => ::SidekiqJobOne,
         'args' => [1, 2, 3]
       )
+      enable_redis_instrumentation
     end
     sleep 1
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, worker_trace = differentiate_trace(
       Instana.processor.queued_traces.to_a
@@ -90,14 +97,16 @@
     clear_all!
     $sidekiq_mode = :server
     inject_instrumentation
 
     Instana.tracer.start_or_continue_trace(:sidekiqtests) do
+      disable_redis_instrumentation
       ::Sidekiq::Client.push(
         'queue' => 'important',
         'class' => ::SidekiqJobTwo,
         'args' => [1, 2, 3]
       )
+      enable_redis_instrumentation
     end
     sleep 1
     assert_equal 2, ::Instana.processor.queue_count
     client_trace, worker_trace = differentiate_trace(
       Instana.processor.queued_traces.to_a