instana 1.9.7 → 1.10.0.slimfast

data/test/frameworks/rails/actioncontroller_test.rb

@@ -12,20 +12,13 @@ class ActionControllerTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/world'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-
-    assert_equal :rack, first_span.name
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "TestController", second_span[:data][:actioncontroller][:controller]
-    assert_equal "world", second_span[:data][:actioncontroller][:action]
+    assert_equal "TestController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "world", ac_span[:data][:actioncontroller][:action]
   end
 
   def test_controller_error
@@ -33,24 +26,17 @@ class ActionControllerTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/error'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 2, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
 
-    assert_equal :rack, first_span.name
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "TestController", second_span[:data][:actioncontroller][:controller]
-    assert_equal "error", second_span[:data][:actioncontroller][:action]
-    assert second_span.key?(:error)
-    assert second_span.key?(:stack)
-    assert_equal "Warning: This is a simulated Error", second_span[:data][:log][:message]
-    assert_equal "Exception", second_span[:data][:log][:parameters]
+    assert_equal "TestController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "error", ac_span[:data][:actioncontroller][:action]
+    assert ac_span.key?(:error)
+    assert ac_span.key?(:stack)
+    assert_equal "Warning: This is a simulated Error", ac_span[:data][:log][:message]
+    assert_equal "Exception", ac_span[:data][:log][:parameters]
   end
 
   def test_api_controller_reporting
@@ -61,20 +47,14 @@ class ActionControllerTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/api/world'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-
-    assert_equal :rack, first_span.name
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "SocketController", second_span[:data][:actioncontroller][:controller]
-    assert_equal "world", second_span[:data][:actioncontroller][:action]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "SocketController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "world", ac_span[:data][:actioncontroller][:action]
   end
 
   def test_api_controller_error
@@ -85,24 +65,17 @@ class ActionControllerTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/api/error'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 2, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
 
-    assert_equal :rack, first_span.name
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
 
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "SocketController", second_span[:data][:actioncontroller][:controller]
-    assert_equal "error", second_span[:data][:actioncontroller][:action]
-    assert second_span.key?(:error)
-    assert second_span.key?(:stack)
-    assert_equal "Warning: This is a simulated Socket API Error", second_span[:data][:log][:message]
-    assert_equal "Exception", second_span[:data][:log][:parameters]
+    assert_equal "SocketController", ac_span[:data][:actioncontroller][:controller]
+    assert_equal "error", ac_span[:data][:actioncontroller][:action]
+    assert ac_span.key?(:error)
+    assert ac_span.key?(:stack)
+    assert_equal "Warning: This is a simulated Socket API Error", ac_span[:data][:log][:message]
+    assert_equal "Exception", ac_span[:data][:log][:parameters]
   end
 
   def test_404
@@ -110,14 +83,11 @@ class ActionControllerTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/404'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.length
 
-    assert_equal 1, trace.spans.length
-    spans = trace.spans.to_a
     first_span = spans[0]
 
-    assert_equal :rack, first_span.name
+    assert_equal :rack, first_span[:n]
   end
 end

data/test/frameworks/rails/actionview5_test.rb

@@ -12,19 +12,16 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_view'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_nothing
@@ -32,20 +29,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_nothing'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "Nothing", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_file
@@ -53,20 +47,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_file'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "/etc/issue", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_json
@@ -74,20 +65,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_json'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "JSON", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_xml
@@ -95,20 +83,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_xml'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "XML", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_body
@@ -116,20 +101,16 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_rawbody'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+    av_span = find_first_span_by_name(spans, :actionview)
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "Raw", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "Raw", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_js
@@ -137,20 +118,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_js'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "Javascript", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_alternate_layout
@@ -158,20 +136,17 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_alternate_layout'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 3, spans.length
 
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
+    first_span = spans[2]
     second_span = spans[1]
-    third_span = spans[2]
+    third_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
     assert_equal "layouts/mobile", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :actionview, third_span[:n]
   end
 
   def test_render_partial
@@ -179,21 +154,18 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 4, spans.length
 
-    assert_equal 4, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
+    first_span = spans[3]
+    second_span = spans[2]
+    third_span = spans[1]
+    fourth_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
-    assert_equal :render, fourth_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
+    assert_equal :actionview, third_span[:n]
+    assert_equal :render, fourth_span[:n]
     assert_equal :partial, fourth_span[:data][:render][:type]
     assert_equal 'message', fourth_span[:data][:render][:name]
   end
@@ -203,21 +175,18 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_partial_that_errors'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
+    spans = ::Instana.processor.queued_spans
+    assert_equal 4, spans.length
 
-    assert_equal 4, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
+    first_span = spans[3]
+    second_span = spans[2]
+    third_span = spans[1]
+    fourth_span = spans[0]
 
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
-    assert_equal :render, fourth_span.name
+    assert_equal :rack, first_span[:n]
+    assert_equal :actioncontroller, second_span[:n]
+    assert_equal :actionview, third_span[:n]
+    assert_equal :render, fourth_span[:n]
     assert_equal :partial, fourth_span[:data][:render][:type]
     assert_equal 'syntax_error', fourth_span[:data][:render][:name]
     assert fourth_span[:data][:log].key?(:message)
@@ -231,32 +200,22 @@ class ActionViewTest < Minitest::Test
 
     Net::HTTP.get(URI.parse('http://localhost:3205/test/render_collection'))
 
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 5, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-    fourth_span = spans[3]
-    fifth_span = spans[4]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
+    spans = ::Instana.processor.queued_spans
+    assert_equal 5, spans.length
 
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+    ar_span = find_first_span_by_name(spans, :activerecord)
+    av_span = find_first_span_by_name(spans, :actionview)
+    render_span = find_first_span_by_name(spans, :render)
 
-    if Rails::VERSION::STRING < '4.0'
-      assert_equal :activerecord, third_span.name
-      assert_equal :actionview, fourth_span.name
-    else
-      assert_equal :actionview, third_span.name
-      assert_equal :activerecord, fourth_span.name
-    end
+    assert_equal render_span[:p], av_span[:s]
+    assert_equal av_span[:p], ac_span[:s]
+    assert_equal ar_span[:p], av_span[:s]
+    assert_equal ac_span[:p], rack_span[:s]
 
-    assert_equal :render, fifth_span.name
-    assert_equal :collection, fifth_span[:data][:render][:type]
-    assert_equal 'blocks/block', fifth_span[:data][:render][:name]
+    assert_equal :render, render_span[:n]
+    assert_equal :collection, render_span[:data][:render][:type]
+    assert_equal 'blocks/block', render_span[:data][:render][:name]
   end
 end