test/instrumentation/sidekiq-client_test.rb in instana-1.9.7 vs test/instrumentation/sidekiq-client_test.rb in instana-1.10.0.slimfast

@@ -63,42 +63,34 @@
     assert_equal false, job_message['X-Instana-T'].nil?
     assert_equal false, job_message['X-Instana-S'].nil?
   end
 
   def assert_normal_trace_recorded(job)
-    assert_equal 1, ::Instana.processor.queue_count
-    client_trace = Instana.processor.queued_traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
 
-    assert_equal 2, client_trace.spans.length
-    spans = client_trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
+    first_span = spans[1]
+    second_span = spans[0]
 
-    assert_equal :sdk, first_span[:n]
-    assert_equal :sidekiqtests, first_span[:data][:sdk][:name]
+    assert_equal first_span[:s], second_span[:p]
+    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :intermediate})
 
-    assert_equal first_span.id, second_span[:p]
-
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobOne', second_span[:data][:'sidekiq-client'][:job]
     assert_equal "false", second_span[:data][:'sidekiq-client'][:retry]
     assert_equal job['jid'], second_span[:data][:'sidekiq-client'][:job_id]
   end
 
   def assert_failure_trace_recorded
-    assert_equal 1, ::Instana.processor.queue_count
-    client_trace = Instana.processor.queued_traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
 
-    assert_equal 2, client_trace.spans.length
-    spans = client_trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
+    first_span = spans[1]
+    second_span = spans[0]
 
-    assert_equal :sdk, first_span[:n]
-    assert_equal :sidekiqtests, first_span[:data][:sdk][:name]
-
-    assert_equal first_span.id, second_span[:p]
+    assert_equal first_span[:s], second_span[:p]
+    validate_sdk_span(first_span, {:name => :sidekiqtests, :type => :intermediate})
 
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal true, second_span[:error]
     assert_equal false, second_span[:stack].nil?