traceview 3.6.0-java → 3.7.0-java

data/lib/traceview/frameworks/rails/inst/connection_adapters/utils5x.rb

@@ -0,0 +1,100 @@
+# Copyright (c) 2013 AppNeta, Inc.
+# All rights reserved.
+
+module TraceView
+  module Inst
+    module ConnectionAdapters
+      module Utils
+
+        def extract_trace_details(sql, name = nil, binds = [])
+          opts = {}
+
+          begin
+            if TraceView::Config[:sanitize_sql]
+              # Sanitize SQL and don't report binds
+              opts[:Query] = TraceView::Util.sanitize_sql(sql)
+            else
+              # Report raw SQL and any binds if they exist
+              opts[:Query] = sql.to_s
+              if binds && !binds.empty?
+                opts[:QueryArgs] = binds.map { |i| i.value  }
+              end
+            end
+
+            opts[:Name] = name.to_s if name
+            opts[:Backtrace] = TraceView::API.backtrace if TraceView::Config[:active_record][:collect_backtraces]
+
+            if ::Rails::VERSION::MAJOR == 2
+              config = ::Rails.configuration.database_configuration[::Rails.env]
+            else
+              config = ActiveRecord::Base.connection.instance_variable_get(:@config)
+            end
+
+            if config
+              opts[:Database]   = config['database'] if config.key?('database')
+              opts[:RemoteHost] = config['host']     if config.key?('host')
+              adapter_name = config[:adapter]
+
+              case adapter_name
+              when /mysql/i
+                opts[:Flavor] = 'mysql'
+              when /postgres/i
+                opts[:Flavor] = 'postgresql'
+              end
+            end
+          rescue StandardError => e
+            TraceView.logger.debug "Exception raised capturing ActiveRecord KVs: #{e.inspect}"
+            TraceView.logger.debug e.backtrace.join('\n')
+          end
+
+          return opts || {}
+        end
+
+        # We don't want to trace framework caches.  Only instrument SQL that
+        # directly hits the database.
+        def ignore_payload?(name)
+          %w(SCHEMA EXPLAIN CACHE).include?(name.to_s) ||
+            (name && name.to_sym == :skip_logging) ||
+              name == 'ActiveRecord::SchemaMigration Load'
+        end
+
+        def exec_query_with_traceview(sql, name = nil, binds = [], prepare: false)
+
+          if TraceView.tracing? && !ignore_payload?(name)
+
+            opts = extract_trace_details(sql, name, binds)
+            TraceView::API.trace('activerecord', opts || {}) do
+              exec_query_without_traceview(sql, name, binds)
+            end
+          else
+            exec_query_without_traceview(sql, name, binds)
+          end
+        end
+
+        def exec_insert_with_traceview(sql, name = nil, binds = [], *args)
+          if TraceView.tracing? && !ignore_payload?(name)
+
+            opts = extract_trace_details(sql, name, binds)
+            TraceView::API.trace('activerecord', opts || {}) do
+              exec_insert_without_traceview(sql, name, binds, *args)
+            end
+          else
+            exec_insert_without_traceview(sql, name, binds, *args)
+          end
+        end
+
+        def exec_delete_with_traceview(sql, name = nil, binds = [])
+          if TraceView.tracing? && !ignore_payload?(name)
+
+            opts = extract_trace_details(sql, name, binds)
+            TraceView::API.trace('activerecord', opts || {}) do
+              exec_delete_without_traceview(sql, name, binds)
+            end
+          else
+            exec_delete_without_traceview(sql, name, binds)
+          end
+        end
+      end # Utils
+    end
+  end
+end

data/lib/traceview/test.rb

@@ -44,6 +44,45 @@ module TraceView
       def gemfile
         File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
       end
+
+      ##
+      # set_postgresql_env
+      #
+      # Used to set the postgresql specific DATABASE_URL env based
+      # on various conditions
+      def set_postgresql_env
+        if ENV.key?('TRAVIS_PSQL_PASS')
+          ENV['DATABASE_URL'] = "postgresql://postgres:#{ENV['TRAVIS_PSQL_PASS']}@127.0.0.1:5432/travis_ci_test"
+        else
+          ENV['DATABASE_URL'] = 'postgresql://postgres@127.0.0.1:5432/travis_ci_test'
+        end
+      end
+
+      ##
+      # set_mysql_env
+      #
+      # Used to set the mysql specific DATABASE_URL env based
+      # on various conditions
+      def set_mysql_env
+        if ENV.key?('TRAVIS_MYSQL_PASS')
+          ENV['DATABASE_URL'] = "mysql://root:#{ENV['TRAVIS_MYSQL_PASS']}@127.0.0.1:3306/travis_ci_test"
+        else
+          ENV['DATABASE_URL'] = 'mysql://root@127.0.0.1:3306/travis_ci_test'
+        end
+      end
+
+      ##
+      # set_mysql2_env
+      #
+      # Used to set the mysql specific DATABASE_URL env based
+      # on various conditions
+      def set_mysql2_env
+        if ENV.key?('TRAVIS_MYSQL_PASS')
+          ENV['DATABASE_URL'] = "mysql2://root:#{ENV['TRAVIS_MYSQL_PASS']}@127.0.0.1:3306/travis_ci_test"
+        else
+          ENV['DATABASE_URL'] = 'mysql2://root@127.0.0.1:3306/travis_ci_test'
+        end
+      end
     end
   end
 end

data/lib/traceview/version.rb

@@ -7,7 +7,7 @@ module TraceView
   # traceview.gemspec during gem build process
   module Version
     MAJOR = 3
-    MINOR = 6
+    MINOR = 7
     PATCH = 0
     BUILD = nil
 

data/test/frameworks/rails3x_test.rb

@@ -98,25 +98,30 @@ if defined?(::Rails)
       r.header['X-Trace'].must_equal traces[4]['X-Trace']
     end
 
-    it "should trace rails db calls" do
+    it "should trace rails postgresql db calls" do
       # Skip for JRuby since the java instrumentation
       # handles DB instrumentation for JRuby
-      skip if defined?(JRUBY_VERSION)
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != "postgresql"
 
       uri = URI.parse('http://127.0.0.1:8140/hello/db')
       r = Net::HTTP.get_response(uri)
 
       traces = get_all_traces
 
-      traces.count.must_equal 12
+      traces.count.must_equal 14
       valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rack')
 
       traces[4]['Layer'].must_equal "activerecord"
       traces[4]['Label'].must_equal "entry"
       traces[4]['Flavor'].must_equal "postgresql"
-      traces[4]['Query'].must_equal "SELECT \"widgets\".* FROM \"widgets\" "
-      traces[4]['Name'].must_equal "Widget Load"
+
+      # Some versions of rails adds in another space before the ORDER keyword.
+      # Make 2 or more consecutive spaces just 1
+      sql = traces[4]['Query'].gsub(/\s{2,}/, ' ')
+      sql.must_equal "INSERT INTO \"widgets\" (\"created_at\", \"description\", \"name\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
+
+      traces[4]['Name'].must_equal "SQL"
       traces[4].key?('Backtrace').must_equal true
 
       traces[5]['Layer'].must_equal "activerecord"
@@ -125,7 +130,60 @@ if defined?(::Rails)
       traces[6]['Layer'].must_equal "activerecord"
       traces[6]['Label'].must_equal "entry"
       traces[6]['Flavor'].must_equal "postgresql"
-      traces[6]['Query'].must_equal "INSERT INTO \"widgets\" (\"created_at\", \"description\", \"name\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
+      traces[6]['Query'].must_equal "SELECT  \"widgets\".* FROM \"widgets\"  WHERE \"widgets\".\"name\" = 'blah' LIMIT 1"
+      traces[6]['Name'].must_equal "Widget Load"
+      traces[6].key?('Backtrace').must_equal true
+      traces[6].key?('QueryArgs').must_equal false
+
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "exit"
+
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "entry"
+      traces[8]['Flavor'].must_equal "postgresql"
+
+      # Remove the widget id so we can test everything else
+      sql = traces[8]['Query'].gsub(/\d+/, 'xxx')
+      sql.must_equal "DELETE FROM \"widgets\" WHERE \"widgets\".\"id\" = xxx"
+
+      traces[8]['Name'].must_equal "SQL"
+      traces[8].key?('Backtrace').must_equal true
+      traces[8].key?('QueryArgs').must_equal false
+
+      traces[9]['Layer'].must_equal "activerecord"
+      traces[9]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r['X-Trace'].must_equal traces[13]['X-Trace']
+    end
+
+    it "should trace rails mysql db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != "mysql"
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 18
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "entry"
+      traces[4]['Flavor'].must_equal "mysql"
+      traces[4]['Query'].must_equal "BEGIN"
+      traces[4].key?('Backtrace').must_equal true
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "exit"
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "entry"
+      traces[6]['Flavor'].must_equal "mysql"
+      traces[6]['Query'].must_equal "INSERT INTO `widgets` (`created_at`, `description`, `name`, `updated_at`) VALUES (?, ?, ?, ?)"
       traces[6]['Name'].must_equal "SQL"
       traces[6].key?('Backtrace').must_equal true
       traces[6].key?('QueryArgs').must_equal true
@@ -133,9 +191,107 @@ if defined?(::Rails)
       traces[7]['Layer'].must_equal "activerecord"
       traces[7]['Label'].must_equal "exit"
 
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "entry"
+      traces[8]['Flavor'].must_equal "mysql"
+      traces[8]['Query'].must_equal "COMMIT"
+      traces[8].key?('Backtrace').must_equal true
+
+      traces[9]['Layer'].must_equal "activerecord"
+      traces[9]['Label'].must_equal "exit"
+
+      traces[10]['Layer'].must_equal "activerecord"
+      traces[10]['Label'].must_equal "entry"
+      traces[10]['Flavor'].must_equal "mysql"
+      traces[10]['Name'].must_equal "Widget Load"
+      traces[10].key?('Backtrace').must_equal true
+
+      # Some versions of rails adds in another space before the ORDER keyword.
+      # Make 2 or more consecutive spaces just 1
+      sql = traces[10]['Query'].gsub(/\s{2,}/, ' ')
+      sql.must_equal "SELECT `widgets`.* FROM `widgets` WHERE `widgets`.`name` = 'blah' LIMIT 1"
+
+      traces[11]['Layer'].must_equal "activerecord"
+      traces[11]['Label'].must_equal "exit"
+
+      traces[12]['Layer'].must_equal "activerecord"
+      traces[12]['Label'].must_equal "entry"
+      traces[12]['Flavor'].must_equal "mysql"
+      traces[12]['Name'].must_equal "SQL"
+      traces[12].key?('Backtrace').must_equal true
+      traces[12].key?('QueryArgs').must_equal false
+
+      # Replace the datestamps with xxx to make testing easier
+      sql = traces[12]['Query'].gsub(/\d+/, 'xxx')
+      sql.must_equal "DELETE FROM `widgets` WHERE `widgets`.`id` = xxx"
+
+      traces[13]['Layer'].must_equal "activerecord"
+      traces[13]['Label'].must_equal "exit"
+
+      traces[14]['Layer'].must_equal "actionview"
+      traces[14]['Label'].must_equal "entry"
+
+      # Validate the existence of the response header
+      r['X-Trace'].must_equal traces[17]['X-Trace']
+    end
+
+    it "should trace rails mysql2 db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != 'mysql2'
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 14
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "entry"
+      traces[4]['Flavor'].must_equal "mysql"
+
+      # Replace the datestamps with xxx to make testing easier
+      sql = traces[4]['Query'].gsub(/\d\d\d\d-\d\d-\d\d\s\d\d:\d\d:\d\d/, 'xxx')
+      sql.must_equal "INSERT INTO `widgets` (`created_at`, `description`, `name`, `updated_at`) VALUES ('xxx', 'This is an amazing widget.', 'blah', 'xxx')"
+
+      traces[4]['Name'].must_equal "SQL"
+      traces[4].key?('Backtrace').must_equal true
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "exit"
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "entry"
+      traces[6]['Flavor'].must_equal "mysql"
+      traces[6]['Query'].must_equal "SELECT  `widgets`.* FROM `widgets`  WHERE `widgets`.`name` = 'blah' LIMIT 1"
+      traces[6]['Name'].must_equal "Widget Load"
+      traces[6].key?('Backtrace').must_equal true
+      traces[6].key?('QueryArgs').must_equal false
+
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "exit"
+
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "entry"
+      traces[8]['Flavor'].must_equal "mysql"
+
+      # Replace the datestamps with xxx to make testing easier
+      sql = traces[8]['Query'].gsub(/\d+/, 'xxx')
+      sql.must_equal "DELETE FROM `widgets` WHERE `widgets`.`id` = xxx"
+
+      traces[8]['Name'].must_equal "SQL"
+      traces[8].key?('Backtrace').must_equal true
+      traces[8].key?('QueryArgs').must_equal false
+
+      traces[9]['Layer'].must_equal "activerecord"
+      traces[9]['Label'].must_equal "exit"
+
       # Validate the existence of the response header
       r.header.key?('X-Trace').must_equal true
-      r.header['X-Trace'].must_equal traces[11]['X-Trace']
+      r.header['X-Trace'].must_equal traces[13]['X-Trace']
     end
   end
 end

data/test/frameworks/rails4x_test.rb

@@ -8,6 +8,7 @@ if defined?(::Rails)
   describe "Rails4x" do
     before do
       clear_all_traces
+      ENV['DBTYPE'] = "postgresql" unless ENV['DBTYPE']
     end
 
     it "should trace a request to a rails stack" do
@@ -51,52 +52,201 @@ if defined?(::Rails)
       traces[6]['Label'].must_equal "exit"
 
       # Validate the existence of the response header
-      r.header.key?('X-Trace').must_equal true
-      r.header['X-Trace'].must_equal traces[6]['X-Trace']
+      r['X-Trace'].must_equal traces[6]['X-Trace']
     end
 
-    it "should trace rails db calls" do
+    it "should trace rails postgres db calls" do
       # Skip for JRuby since the java instrumentation
       # handles DB instrumentation for JRuby
-      skip if defined?(JRUBY_VERSION)
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != 'postgresql'
 
       uri = URI.parse('http://127.0.0.1:8140/hello/db')
       r = Net::HTTP.get_response(uri)
 
       traces = get_all_traces
 
-      traces.count.must_equal 11
+      traces.count.must_equal 13
       valid_edges?(traces).must_equal true
       validate_outer_layers(traces, 'rack')
 
       traces[3]['Layer'].must_equal "activerecord"
       traces[3]['Label'].must_equal "entry"
       traces[3]['Flavor'].must_equal "postgresql"
-      traces[3]['Query'].must_equal "SELECT  \"widgets\".* FROM \"widgets\"  ORDER BY \"widgets\".\"id\" ASC LIMIT 1"
-      traces[3]['Name'].must_equal "Widget Load"
+      traces[3]['Name'].must_equal "SQL"
       traces[3].key?('Backtrace').must_equal true
 
+      # Use a regular expression to test the SQL string since field order varies between
+      # Rails versions
+      match_data = traces[3]['Query'].match(/INSERT\sINTO\s\"widgets\"\s\(.*\)\sVALUES\s\(\$1,\s\$2,\s\$3,\s\$4\)\sRETURNING\s\"id\"/)
+      match_data.wont_equal nil
+      match_data.class.must_equal MatchData
+
       traces[4]['Layer'].must_equal "activerecord"
       traces[4]['Label'].must_equal "exit"
 
       traces[5]['Layer'].must_equal "activerecord"
       traces[5]['Label'].must_equal "entry"
       traces[5]['Flavor'].must_equal "postgresql"
-      traces[5]['Query'].must_equal "INSERT INTO \"widgets\" (\"name\", \"description\", \"created_at\", \"updated_at\") VALUES ($1, $2, $3, $4) RETURNING \"id\""
-      traces[5]['Name'].must_equal "SQL"
+
+      # Some versions of rails adds in another space before the ORDER keyword.
+      # Make 2 or more consecutive spaces just 1
+      sql = traces[5]['Query'].gsub(/\s{2,}/, ' ')
+      sql.must_equal "SELECT \"widgets\".* FROM \"widgets\" WHERE \"widgets\".\"name\" = $1 ORDER BY \"widgets\".\"id\" ASC LIMIT 1"
+
+      traces[5]['Name'].must_equal "Widget Load"
       traces[5].key?('Backtrace').must_equal true
       traces[5].key?('QueryArgs').must_equal true
 
       traces[6]['Layer'].must_equal "activerecord"
       traces[6]['Label'].must_equal "exit"
 
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "entry"
+      traces[7]['Flavor'].must_equal "postgresql"
+      traces[7]['Query'].must_equal "DELETE FROM \"widgets\" WHERE \"widgets\".\"id\" = $1"
+      traces[7]['Name'].must_equal "SQL"
+      traces[7].key?('Backtrace').must_equal true
+      traces[7].key?('QueryArgs').must_equal true
+
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "exit"
+
       # Validate the existence of the response header
       r.header.key?('X-Trace').must_equal true
-      r.header['X-Trace'].must_equal traces[10]['X-Trace']
+      r.header['X-Trace'].must_equal traces[12]['X-Trace']
     end
 
-    it "should trace a request to a rails metal stack" do
+    it "should trace rails mysql db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != "mysql"
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 17
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[3]['Layer'].must_equal "activerecord"
+      traces[3]['Label'].must_equal "entry"
+      traces[3]['Flavor'].must_equal "mysql"
+      traces[3]['Query'].must_equal "BEGIN"
+      traces[3].key?('Backtrace').must_equal true
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "exit"
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "entry"
+      traces[5]['Flavor'].must_equal "mysql"
+      traces[5]['Query'].must_equal "INSERT INTO `widgets` (`name`, `description`, `created_at`, `updated_at`) VALUES (?, ?, ?, ?)"
+      traces[5]['Name'].must_equal "SQL"
+      traces[5].key?('Backtrace').must_equal true
+      traces[5].key?('QueryArgs').must_equal true
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "exit"
+
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "entry"
+      traces[7]['Flavor'].must_equal "mysql"
+      traces[7]['Query'].must_equal "COMMIT"
+      traces[7].key?('Backtrace').must_equal true
+
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "exit"
+
+      traces[9]['Layer'].must_equal "activerecord"
+      traces[9]['Label'].must_equal "entry"
+      traces[9]['Flavor'].must_equal "mysql"
+      traces[9]['Name'].must_equal "Widget Load"
+      traces[9].key?('Backtrace').must_equal true
+
+      # Some versions of rails adds in another space before the ORDER keyword.
+      # Make 2 or more consecutive spaces just 1
+      sql = traces[9]['Query'].gsub(/\s{2,}/, ' ')
+      sql.must_equal "SELECT `widgets`.* FROM `widgets` WHERE `widgets`.`name` = ? ORDER BY `widgets`.`id` ASC LIMIT 1"
+
+      traces[10]['Layer'].must_equal "activerecord"
+      traces[10]['Label'].must_equal "exit"
+
+      traces[11]['Layer'].must_equal "activerecord"
+      traces[11]['Label'].must_equal "entry"
+      traces[11]['Flavor'].must_equal "mysql"
+      traces[11]['Name'].must_equal "SQL"
+      traces[11].key?('Backtrace').must_equal true
+      traces[11].key?('QueryArgs').must_equal true
+      traces[11]['Query'].must_equal "DELETE FROM `widgets` WHERE `widgets`.`id` = ?"
 
+      traces[12]['Layer'].must_equal "activerecord"
+      traces[12]['Label'].must_equal "exit"
+
+      traces[13]['Layer'].must_equal "actionview"
+      traces[13]['Label'].must_equal "entry"
+
+      # Validate the existence of the response header
+      r['X-Trace'].must_equal traces[16]['X-Trace']
+    end
+
+    it "should trace rails mysql2 db calls" do
+      # Skip for JRuby since the java instrumentation
+      # handles DB instrumentation for JRuby
+      skip if defined?(JRUBY_VERSION) || ENV['DBTYPE'] != "mysql2"
+
+      uri = URI.parse('http://127.0.0.1:8140/hello/db')
+      r = Net::HTTP.get_response(uri)
+
+      traces = get_all_traces
+
+      traces.count.must_equal 13
+      valid_edges?(traces).must_equal true
+      validate_outer_layers(traces, 'rack')
+
+      traces[3]['Layer'].must_equal "activerecord"
+      traces[3]['Label'].must_equal "entry"
+      traces[3]['Flavor'].must_equal "mysql"
+
+      # Replace the datestamps with xxx to make testing easier
+      sql = traces[3]['Query'].gsub(/\d\d\d\d-\d\d-\d\d\s\d\d:\d\d:\d\d/, 'xxx')
+      sql.must_equal "INSERT INTO `widgets` (`name`, `description`, `created_at`, `updated_at`) VALUES ('blah', 'This is an amazing widget.', 'xxx', 'xxx')"
+
+      traces[3]['Name'].must_equal "SQL"
+      traces[3].key?('Backtrace').must_equal true
+      traces[3].key?('QueryArgs').must_equal true
+
+      traces[4]['Layer'].must_equal "activerecord"
+      traces[4]['Label'].must_equal "exit"
+
+      traces[5]['Layer'].must_equal "activerecord"
+      traces[5]['Label'].must_equal "entry"
+      traces[5]['Flavor'].must_equal "mysql"
+      traces[5]['Query'].must_equal "SELECT  `widgets`.* FROM `widgets` WHERE `widgets`.`name` = 'blah'  ORDER BY `widgets`.`id` ASC LIMIT 1"
+      traces[5]['Name'].must_equal "Widget Load"
+      traces[5].key?('Backtrace').must_equal true
+
+      traces[6]['Layer'].must_equal "activerecord"
+      traces[6]['Label'].must_equal "exit"
+
+      traces[7]['Layer'].must_equal "activerecord"
+      traces[7]['Label'].must_equal "entry"
+      traces[7]['Flavor'].must_equal "mysql"
+      traces[7]['Name'].must_equal "SQL"
+      traces[7].key?('Backtrace').must_equal true
+
+      sql = traces[7]['Query'].gsub(/\d+/, 'xxx')
+      sql.must_equal "DELETE FROM `widgets` WHERE `widgets`.`id` = xxx"
+
+      traces[8]['Layer'].must_equal "activerecord"
+      traces[8]['Label'].must_equal "exit"
+
+      # Validate the existence of the response header
+      r['X-Trace'].must_equal traces[12]['X-Trace']
+    end
+
+    it "should trace a request to a rails metal stack" do
       uri = URI.parse('http://127.0.0.1:8140/hello/metal')
       r = Net::HTTP.get_response(uri)
 
@@ -134,8 +284,7 @@ if defined?(::Rails)
       traces[4]['Label'].must_equal "exit"
 
       # Validate the existence of the response header
-      r.header.key?('X-Trace').must_equal true
-      r.header['X-Trace'].must_equal traces[4]['X-Trace']
+      r['X-Trace'].must_equal traces[4]['X-Trace']
     end
   end
 end