instana 1.10.8-java → 1.10.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bace4b861697b0193cc8dff1fad928ab75e27f68933192c6270dc7d07887f7c
-  data.tar.gz: 8e7cb89f0e1ba9cb11eb57564578d996b01323549928debe639c548a5917a455
+  metadata.gz: 2e0b041f1a4ee7018a3b441ba1c37f9ed292ea21a44699ce3a0ac6c45c1169a5
+  data.tar.gz: a03afa75870034fa4a9b028efafaf175e4583359af5be87ecaccd5577bd6c415
 SHA512:
-  metadata.gz: 0c95d0e8a34f10ee3daac3f7cb658ce3409fe34f98683350493a12aacc03abf983c718e389bfc9aaca1ac74f98272251675ab6a2581acb7d142a60f619606860
-  data.tar.gz: 3c52fc61d3d8b1d2616b3cb1e6ff29b99c00fbc7a2ead65144de12c60de50920abd19e2b429718f766c1b978619945bcae1a89e78e650a8aa48c93e6aeecdc96
+  metadata.gz: 28fd81fd665342354a1b4d8ada57c850c059a2eb2ddccac6b243ee73cc18affe0a23bdfb1e9df7f22c59bce10e60f14f7af752465bb2ba6d7a710beb262850f4
+  data.tar.gz: d7a2fccc5c2e2c45ae3fe580cb7361e8cf854a0c05e2c75f4deb59c8e586deffefbce94e6382030da7109fa4317cd77ca9afb722d29f6171aeb63e1c008846be

data/Rakefile

@@ -13,15 +13,15 @@ Rake::TestTask.new(:test) do |t|
   if ENV.key?('BUNDLE_GEMFILE')
     case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
     when /rails50/
-      t.test_files = %w(test/frameworks/rails/activerecord5_test.rb
+      t.test_files = %w(test/frameworks/rails/activerecord_test.rb
                         test/frameworks/rails/actioncontroller_test.rb
                         test/frameworks/rails/actionview5_test.rb)
     when /rails42/
-      t.test_files = %w(test/frameworks/rails/activerecord4_test.rb
+      t.test_files = %w(test/frameworks/rails/activerecord_test.rb
                         test/frameworks/rails/actioncontroller_test.rb
                         test/frameworks/rails/actionview4_test.rb)
     when /rails32/
-      t.test_files = %w(test/frameworks/rails/activerecord3_test.rb
+      t.test_files = %w(test/frameworks/rails/activerecord_test.rb
                         test/frameworks/rails/actioncontroller_test.rb
                         test/frameworks/rails/actionview3_test.rb)
     when /libraries/

data/gemfiles/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_BUILD__LIBV8: "--with-system-v8"
+BUNDLE_WITH: "development"

data/gemfiles/rails32.gemfile

@@ -31,15 +31,15 @@ group :development do
 end
 
 gem 'rails', '3.2.22.5'
-gem 'pg'
-gem 'mysql2', '~> 0.3.10'
+gem 'pg', '~> 0.21'
+gem 'mysql2', '~> 0.3.21'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
-  gem 'therubyracer', :platforms => :ruby
+  #gem 'therubyracer', :platforms => :ruby
   gem 'uglifier', '>= 1.0.3'
 end
 

data/gemfiles/rails42.gemfile

@@ -35,13 +35,13 @@ gem 'sqlite3'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
-gem 'therubyracer', platforms: :ruby
+#gem 'therubyracer', platforms: :ruby
 
 gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jbuilder', '~> 2.0'
 gem 'sdoc', '~> 0.4.0', group: :doc
-gem "pg"
+gem 'pg', '~> 0.21'
 gem "mysql2", '0.4.10'
 
 # Include the Instana Ruby gem's base set of gems

data/gemfiles/rails50.gemfile

@@ -34,14 +34,14 @@ gem 'rails', '~> 5.0.0', '>= 5.0.0.1'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.2'
-gem 'therubyracer', platforms: :ruby
+#gem 'therubyracer', platforms: :ruby
 
 gem 'jquery-rails'
 gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 
 gem 'pg'
-gem 'mysql2', '0.4.10'
+gem 'mysql2', '0.5.2'
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

data/lib/instana/config.rb

@@ -69,6 +69,8 @@ module Instana
         # appropriate children flags.
         @config[:metrics][:enabled] = value
         @config[:tracing][:enabled] = value
+
+        ::Instana.logger.warn "::Instana.config[:enabled] has been deprecated.  Set INSTANA_DISABLE environment variable to any value instead."
       end
     end
   end

data/lib/instana/frameworks/instrumentation/postgresql_adapter.rb

@@ -2,6 +2,7 @@ module Instana
   module Instrumentation
     module PostgreSQLAdapter
       IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE).freeze
+      IGNORED_SQL = %w(BEGIN COMMIT)
       EXPLAINED_SQLS = /\A\s*(with|select|update|delete|insert)\b/i
 
       # This module supports instrumenting ActiveRecord with the postgresql adapter.  Only
@@ -14,6 +15,8 @@ module Instana
           # ActiveRecord 3.1 and up
           Instana::Util.method_alias(klass, :exec_query)
           Instana::Util.method_alias(klass, :exec_delete)
+          Instana::Util.method_alias(klass, :execute)
+
 
           @@sanitize_regexp = Regexp.new('(\'[\s\S][^\']*\'|\d*\.\d+|\d+|NULL)', Regexp::IGNORECASE)
         end
@@ -42,7 +45,7 @@ module Instana
       # @return [Boolean]
       #
       def ignore_payload?(name, sql)
-        IGNORED_PAYLOADS.include?(name) || sql !~ EXPLAINED_SQLS
+        IGNORED_PAYLOADS.include?(name) || IGNORED_SQL.include?(sql)
       end
 
       def exec_query_with_instana(sql, name = 'SQL', binds = [], *args)
@@ -66,6 +69,17 @@ module Instana
           exec_delete_without_instana(sql, name, binds)
         end
       end
+
+      def execute_with_instana(sql, name = nil)
+        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
+          return execute_without_instana(sql, name)
+        end
+
+        kv_payload = collect(sql)
+        ::Instana.tracer.trace(:activerecord, kv_payload) do
+          execute_without_instana(sql, name)
+        end
+      end
     end
   end
 end

data/lib/instana/test.rb

@@ -12,13 +12,15 @@ module Instana
         ENV['TRAVIS_MYSQL_HOST']  ||= "127.0.0.1"
         ENV['TRAVIS_MYSQL_USER']  ||= "root"
 
-        if ENV['DB_FLAVOR'] == 'postgresql'
-          ENV['DATABASE_URL'] = "postgresql://#{ENV['TRAVIS_PSQL_USER']}:#{ENV['TRAVIS_PSQL_PASS']}@#{ENV['TRAVIS_PSQL_HOST']}:5432/travis_ci_test"
-        elsif ENV['DB_FLAVOR'] == 'mysql'
-          ENV['DATABASE_URL'] = "mysql://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
-        else
-          ENV['DB_FLAVOR'] ||= 'mysql2'
-          ENV['DATABASE_URL'] = "mysql2://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
+        if !ENV.key?('DATABASE_URL')
+          if ENV['DB_FLAVOR'] == 'postgresql'
+            ENV['DATABASE_URL'] = "postgresql://#{ENV['TRAVIS_PSQL_USER']}:#{ENV['TRAVIS_PSQL_PASS']}@#{ENV['TRAVIS_PSQL_HOST']}:5432/travis_ci_test"
+          elsif ENV['DB_FLAVOR'] == 'mysql'
+            ENV['DATABASE_URL'] = "mysql://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
+          else
+            ENV['DB_FLAVOR'] ||= 'mysql2'
+            ENV['DATABASE_URL'] = "mysql2://#{ENV['TRAVIS_MYSQL_USER']}:#{ENV['TRAVIS_MYSQL_PASS']}@#{ENV['TRAVIS_MYSQL_HOST']}:3306/travis_ci_test"
+          end
         end
 
         Instana.logger.warn "Database connect string configured to: #{ENV['DATABASE_URL']}"

data/lib/instana/tracing/span.rb

@@ -123,6 +123,8 @@ module Instana
 
         if HTTP_SPANS.include?(@data[:n])
           set_tags(:http => { :error => "#{e.class}: #{e.message}" })
+        elsif @data[:n] == :activerecord
+          @data[:data][:activerecord][:error] = e.message
         else
           log(:error, Time.now, { :message => e.message, :parameters => e.class.to_s })
         end

data/lib/instana/version.rb

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

data/test/frameworks/rails/actionview3_test.rb

@@ -12,12 +12,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -32,12 +28,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -53,12 +45,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -74,12 +62,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -95,12 +79,7 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -116,12 +95,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -137,12 +112,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -158,12 +129,8 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -179,12 +146,8 @@ 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
-
-    assert_equal 4, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 4, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -203,12 +166,8 @@ 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
-
-    assert_equal 4, trace.spans.length
-    spans = trace.spans.to_a
+    spans = Instana.processor.queued_spans
+    assert_equal 4, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]
@@ -231,12 +190,8 @@ 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
+    spans = Instana.processor.queued_spans
+    assert_equal 5, spans.length
     first_span = spans[0]
     second_span = spans[1]
     third_span = spans[2]

data/test/frameworks/rails/actionview4_test.rb

@@ -12,19 +12,15 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal :actionview, third_span.name
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    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, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_nothing
@@ -32,20 +28,16 @@ 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
+    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 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "Nothing", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "Nothing", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_file
@@ -53,20 +45,16 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    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 "/etc/issue", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "/etc/issue", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_json
@@ -74,20 +62,16 @@ 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
+    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 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    assert_equal :rack, first_span.name
-    assert_equal :actioncontroller, second_span.name
-    assert_equal "JSON", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "JSON", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_xml
@@ -95,20 +79,16 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    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 "XML", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "XML", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_body
@@ -116,20 +96,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
+    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 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
-
-    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 :rack, rack_span[:n]
+    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 +113,16 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    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 "Javascript", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "Javascript", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_alternate_layout
@@ -158,20 +130,16 @@ 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
-
-    assert_equal 3, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[1]
-    third_span = spans[2]
+    spans = Instana.processor.queued_spans
+    assert_equal 3, spans.length
+    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 "layouts/mobile", third_span[:data][:actionview][:name]
-    assert_equal :actionview, third_span.name
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal "layouts/mobile", av_span[:data][:actionview][:name]
+    assert_equal :actionview, av_span[:n]
   end
 
   def test_render_partial
@@ -179,23 +147,17 @@ 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
-
-    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]
-
-    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 :partial, fourth_span[:data][:render][:type]
-    assert_equal 'message', fourth_span[:data][:render][:name]
+    spans = Instana.processor.queued_spans
+    assert_equal 4, spans.length
+    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)
+    render_span = find_first_span_by_name(spans, :render)
+
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal :partial, render_span[:data][:render][:type]
+    assert_equal 'message', render_span[:data][:render][:name]
   end
 
   def test_render_partial_that_errors
@@ -203,27 +165,23 @@ 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
-
-    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]
-
-    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 :partial, fourth_span[:data][:render][:type]
-    assert_equal 'syntax_error', fourth_span[:data][:render][:name]
-    assert fourth_span[:data][:log].key?(:message)
-    assert_equal "SyntaxError", fourth_span[:data][:log][:parameters]
-    assert fourth_span[:error]
-    assert fourth_span[:stack]
+    spans = Instana.processor.queued_spans
+    assert_equal 4, spans.length
+    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)
+    render_span = find_first_span_by_name(spans, :render)
+
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal :actionview, av_span[:n]
+    assert_equal :render, render_span[:n]
+    assert_equal :partial, render_span[:data][:render][:type]
+    assert_equal 'syntax_error', render_span[:data][:render][:name]
+    assert render_span[:data][:log].key?(:message)
+    assert_equal "SyntaxError", render_span[:data][:log][:parameters]
+    assert render_span[:error]
+    assert render_span[:stack]
   end
 
   def test_render_collection
@@ -231,24 +189,20 @@ 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
-    assert_equal :actionview, third_span.name
-    assert_equal :activerecord, fourth_span.name
-    assert_equal :render, fifth_span.name
-    assert_equal :collection, fifth_span[:data][:render][:type]
-    assert_equal 'blocks/block', fifth_span[:data][:render][: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)
+    av_span = find_first_span_by_name(spans, :actionview)
+    ar_span = find_first_span_by_name(spans, :activerecord)
+    render_span = find_first_span_by_name(spans, :render)
+
+    assert_equal :rack, rack_span[:n]
+    assert_equal :actioncontroller, ac_span[:n]
+    assert_equal :actionview, av_span[:n]
+    assert_equal :activerecord, ar_span[:n]
+    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