dolores_rpm 3.2.0.6 → 3.3.4.fork

data/CHANGELOG

@@ -1,11 +1,37 @@
-v3.2.0.6
-  * Experimenting with adding 'ActiveRecord/all' to all DataMapper metrics to get accurate database slice on App Server Overview page
+v3.3.4.fork
+  * Roll back to previous version of DataMapper instrumentation (current one does not work for our app)
 
-v3.2.0.5
-  * Add DataMapper instrumentation for find/save/destroy with :push_scope => false (gets find to show up on database instrumentation)
+v3.3.4
+  * Rails 3 view instrumentation
 
-v3.2.0.2
-  * Roll back to previous version of DataMapper instrumentation (current one does not work for our app)
+v3.3.3
+  * Improved Sinatra instrumentation
+  * Limit the number of nodes collected in long running transactions to prevent leaking memory
+
+v3.3.2.1
+  * [SECURITY] fix for cookie handling by End User Monitoring instrumentation
+
+v3.3.2
+  * deployments recipe change: truncate git SHAs to 7 characters
+  * Fixes for obfuscation of PostgreSQL and SQLite queries
+  * Fix for lost database connections when using a forking framework
+  * Workaround for RedHat kernel bug which prevented blocking reads of /proc fs
+  * Do not trap signals when handling exceptions
+  
+v3.3.1
+  * improved Ruby 1.8.6 support
+  * fix for issues with RAILS_ROOT deprecation warnings
+  * fixed incorrect 1.9 GC time reporting
+  * obfusction for Slow SQL queries respects transaction trace config
+  * fix for RUM instrumentation repoting bad timing info in some cases
+  * refactored ActiveRecord instrumentation, no longer requires Rails
+
+v3.3.0
+  * fix for GC instrumentation when using Ruby 1.9
+  * new feature to correlate browser and server transaction traces
+  * new feature to trace slow sql statements
+  * fix to help cope with malformed rack responses
+  * do not try to instrument versions of ActiveMerchant that are too old
 
 v3.2.0.1
   * Updated LICENSE

data/dolores_rpm.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "dolores_rpm"
-  s.version = "3.2.0.6"
+  s.version = "3.3.4.fork"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = "2012-05-10"
+  s.date = "2012-04-27"
   s.description = "New Relic is a performance management system, developed by New Relic,\nInc (http://www.newrelic.com). This is a fork that uses an older version\nof the DataMapper instrumentation. Newer versions did not work for us.\n"
   s.email = "support@newrelic.com"
-  s.executables = ["mongrel_rpm", "newrelic_cmd", "newrelic"]
+  s.executables = ["mongrel_rpm", "newrelic", "newrelic_cmd"]
   s.extra_rdoc_files = [
     "CHANGELOG",
     "LICENSE",
@@ -29,10 +29,6 @@ Gem::Specification.new do |s|
     "cert/cacert.pem",
     "cert/oldsite.pem",
     "cert/site.pem",
-    "dolores_rpm-3.2.0.2.gem",
-    "dolores_rpm-3.2.0.5.gem",
-    "dolores_rpm-3.3.4.fork.gem",
-    "dolores_rpm.gemspec",
     "install.rb",
     "lib/conditional_vendored_dependency_detection.rb",
     "lib/conditional_vendored_metric_parser.rb",
@@ -46,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/new_relic/agent/error_collector.rb",
     "lib/new_relic/agent/instrumentation.rb",
     "lib/new_relic/agent/instrumentation/active_merchant.rb",
+    "lib/new_relic/agent/instrumentation/active_record.rb",
     "lib/new_relic/agent/instrumentation/acts_as_solr.rb",
     "lib/new_relic/agent/instrumentation/authlogic.rb",
     "lib/new_relic/agent/instrumentation/controller_instrumentation.rb",
@@ -62,10 +59,8 @@ Gem::Specification.new do |s|
     "lib/new_relic/agent/instrumentation/rack.rb",
     "lib/new_relic/agent/instrumentation/rails/action_controller.rb",
     "lib/new_relic/agent/instrumentation/rails/action_web_service.rb",
-    "lib/new_relic/agent/instrumentation/rails/active_record_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/rails/errors.rb",
     "lib/new_relic/agent/instrumentation/rails3/action_controller.rb",
-    "lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb",
     "lib/new_relic/agent/instrumentation/rails3/errors.rb",
     "lib/new_relic/agent/instrumentation/sinatra.rb",
     "lib/new_relic/agent/instrumentation/sunspot.rb",
@@ -79,9 +74,11 @@ Gem::Specification.new do |s|
     "lib/new_relic/agent/shim_agent.rb",
     "lib/new_relic/agent/sql_sampler.rb",
     "lib/new_relic/agent/stats_engine.rb",
+    "lib/new_relic/agent/stats_engine/gc_profiler.rb",
     "lib/new_relic/agent/stats_engine/metric_stats.rb",
     "lib/new_relic/agent/stats_engine/samplers.rb",
     "lib/new_relic/agent/stats_engine/transactions.rb",
+    "lib/new_relic/agent/transaction_info.rb",
     "lib/new_relic/agent/transaction_sample_builder.rb",
     "lib/new_relic/agent/transaction_sampler.rb",
     "lib/new_relic/agent/worker_loop.rb",
@@ -132,10 +129,12 @@ Gem::Specification.new do |s|
     "lib/tasks/install.rake",
     "lib/tasks/tests.rake",
     "newrelic.yml",
+    "dolores_rpm.gemspec",
     "recipes/newrelic.rb",
     "test/active_record_fixtures.rb",
     "test/config/newrelic.yml",
     "test/config/test_control.rb",
+    "test/fixtures/proc_cpuinfo.txt",
     "test/new_relic/agent/agent/connect_test.rb",
     "test/new_relic/agent/agent/start_test.rb",
     "test/new_relic/agent/agent/start_worker_thread_test.rb",
@@ -171,6 +170,7 @@ Gem::Specification.new do |s|
     "test/new_relic/agent/stats_engine/metric_stats_test.rb",
     "test/new_relic/agent/stats_engine/samplers_test.rb",
     "test/new_relic/agent/stats_engine_test.rb",
+    "test/new_relic/agent/transaction_info_test.rb",
     "test/new_relic/agent/transaction_sample_builder_test.rb",
     "test/new_relic/agent/transaction_sampler_test.rb",
     "test/new_relic/agent/worker_loop_test.rb",
@@ -185,6 +185,7 @@ Gem::Specification.new do |s|
     "test/new_relic/delayed_job_injection_test.rb",
     "test/new_relic/local_environment_test.rb",
     "test/new_relic/metric_data_test.rb",
+    "test/new_relic/metric_parser/metric_parser_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/all_test.rb",
     "test/new_relic/rack/browser_monitoring_test.rb",
@@ -200,6 +201,9 @@ Gem::Specification.new do |s|
     "test/new_relic/transaction_sample_subtest_test.rb",
     "test/new_relic/transaction_sample_test.rb",
     "test/new_relic/version_number_test.rb",
+    "test/script/build_test_gem.sh",
+    "test/script/ci.sh",
+    "test/script/ci_bench.sh",
     "test/test_contexts.rb",
     "test/test_helper.rb",
     "ui/helpers/developer_mode_helper.rb",
@@ -281,7 +285,7 @@ Gem::Specification.new do |s|
     "vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/web_transaction.rb"
   ]
   s.homepage = "http://www.github.com/newrelic/rpm"
-  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.2 of the Ruby Agent.\n  \n"
+  s.post_install_message = "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middleware.\n\nDeveloper Mode is no longer available in Rails 2.1 and earlier.\nHowever, starting in version 2.12 you can use Developer Mode in any\nRack based framework, in addition to Rails.  To install developer mode\nin a non-Rails application, just add NewRelic::Rack::DeveloperMode to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least version 1.4 or \nlater because of issues with the implementation of the timeout library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor a complete description of the features and enhancements available\nin version 3.3 of the Ruby Agent.\n  \n"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "New Relic Ruby Agent"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.23"

data/lib/new_relic/agent/agent.rb

@@ -37,7 +37,6 @@ module NewRelic
         @transaction_sampler = NewRelic::Agent::TransactionSampler.new
         @sql_sampler = NewRelic::Agent::SqlSampler.new
         @stats_engine.transaction_sampler = @transaction_sampler
-        @stats_engine.sql_sampler = @sql_sampler
         @error_collector = NewRelic::Agent::ErrorCollector.new
         @connect_attempts = 0
 
@@ -130,9 +129,9 @@ module NewRelic
             if options['exception']
               e = options['exception']
             elsif options['error_message']
-              e = Exception.new options['error_message']
+              e = StandardError.new options['error_message']
             else
-              e = Exception.new 'Unknown Error'
+              e = StandardError.new 'Unknown Error'
             end
             error_collector.notice_error e, :uri => options['uri'], :metric => metric
           end
@@ -539,7 +538,7 @@ module NewRelic
             handle_force_disconnect(e)
           rescue NewRelic::Agent::ServerConnectionException => e
             handle_server_connection_problem(e)
-          rescue Exception => e
+          rescue => e
             handle_other_error(e)
           end
 
@@ -775,13 +774,15 @@ module NewRelic
             # Ask the server for permission to send transaction samples.
             # determined by subscription license.
             @transaction_sampler.config['enabled'] = server_enabled
-            @sql_sampler.disable unless @transaction_sampler.config['enabled']
-            
+            @sql_sampler.configure!
             @should_send_samples = @config_should_send_samples && server_enabled
-
+            
             if @should_send_samples
               # I don't think this is ever true, but...
               enable_random_samples!(sample_rate) if @should_send_random_samples
+              
+              @transaction_sampler.slow_capture_threshold = @slowest_transaction_threshold
+              
               log.debug "Transaction tracing threshold is #{@slowest_transaction_threshold} seconds."
             else
               log.debug "Transaction traces will not be sent to the New Relic service."
@@ -862,6 +863,11 @@ module NewRelic
             @beacon_configuration = BeaconConfiguration.new(config_data)
             @server_side_config_enabled = config_data['listen_to_server_config']
 
+            if @server_side_config_enabled
+              log.info "Using config from server"
+              log.debug "Server provided config: #{config_data.inspect}"
+            end
+
             control.merge_server_side_config(config_data) if @server_side_config_enabled
             config_transaction_tracer
             log_connection!(config_data)
@@ -1042,7 +1048,7 @@ module NewRelic
           # FIXME add the code to try to resend if our connection is down
           sql_traces = @sql_sampler.harvest
           unless sql_traces.empty?
-            log.debug "Sending (#{sql_traces.count}) sql traces"
+            log.debug "Sending (#{sql_traces.size}) sql traces"
             begin
               response = invoke_remote :sql_trace_data, sql_traces
 #              log.debug "Sql trace response: #{response}"
@@ -1063,6 +1069,7 @@ module NewRelic
           unless @traces.empty?
             now = Time.now
             log.debug "Sending (#{@traces.length}) transaction traces"
+            
             begin
               options = { :keep_backtraces => true }
               options[:record_sql] = @record_sql unless @record_sql == :off
@@ -1134,16 +1141,16 @@ module NewRelic
         def compress_data(object)
           dump = Marshal.dump(object)
 
-          # this checks to make sure mongrel won't choke on big uploads
-          check_post_size(dump)
-
           dump_size = dump.size
 
           return [dump, 'identity'] if dump_size < (64*1024)
 
-          compression = dump_size < 2000000 ? Zlib::BEST_SPEED : Zlib::BEST_COMPRESSION
+          compressed_dump = Zlib::Deflate.deflate(dump, Zlib::DEFAULT_COMPRESSION)
+
+          # this checks to make sure mongrel won't choke on big uploads
+          check_post_size(compressed_dump)
 
-          [Zlib::Deflate.deflate(dump, compression), 'deflate']
+          [compressed_dump, 'deflate']
         end
 
         # Raises a PostTooBigException if the post_string is longer
@@ -1265,7 +1272,7 @@ module NewRelic
         def save_or_transmit_data
           if NewRelic::DataSerialization.should_send_data?
             log.debug "Sending data to New Relic Service"
-            NewRelic::Agent.load_data
+            NewRelic::Agent.load_data unless NewRelic::Control.instance.disable_serialization?
             harvest_and_send_errors
             harvest_and_send_slowest_sample
             harvest_and_send_slowest_sql
@@ -1274,6 +1281,13 @@ module NewRelic
             log.debug "Serializing agent data to disk"
             NewRelic::Agent.save_data
           end
+        rescue => e
+          NewRelic::Control.instance.disable_serialization = true
+          NewRelic::Control.instance.log.warn("Disabling serialization: #{e.message}")
+          retry_count ||= 0
+          retry_count += 1
+          retry unless retry_count > 1
+          raise e
         end
 
         # This method contacts the server to send remaining data and

data/lib/new_relic/agent/beacon_configuration.rb

@@ -28,6 +28,13 @@ module NewRelic
       # local config
       attr_reader :rum_enabled
       
+      # whether JSONP is used to communicate with the Beacon or not
+      attr_reader :rum_jsonp
+      
+      # RUM footer command used for 'finish' - based on whether JSONP is
+      # being used. 'nrfj' for JSONP, otherwise 'nrf2'
+      attr_reader :finish_command
+      
       # A static javascript header that is identical for every account
       # and application
       JS_HEADER = "<script type=\"text/javascript\">var NREUMQ=NREUMQ||[];NREUMQ.push([\"mark\",\"firstbyte\",new Date().getTime()]);</script>"
@@ -45,6 +52,10 @@ module NewRelic
         NewRelic::Control.instance.log.debug("Browser timing header: #{@browser_timing_header.inspect}")
         @browser_timing_static_footer = build_load_file_js(connect_data)
         NewRelic::Control.instance.log.debug("Browser timing static footer: #{@browser_timing_static_footer.inspect}")
+        @rum_jsonp = connect_data['rum.jsonp']
+        @rum_jsonp = true if @rum_jsonp.nil?
+        NewRelic::Control.instance.log.debug("Real User Monitoring is using JSONP protocol") if @rum_jsonp
+        @finish_command = @rum_jsonp ?  'nrfj' : 'nrf2'
       end
       
       # returns a memoized version of the bytes in the license key for

data/lib/new_relic/agent/browser_monitoring.rb

@@ -6,6 +6,24 @@ module NewRelic
     # javascript generation and configuration
     module BrowserMonitoring
       
+     
+      class DummyMetricFrame
+        def initialize
+          @attributes = {}
+        end
+        
+        def user_attributes
+          @attributes
+        end
+        
+        def queue_time
+          0.0
+        end
+      end
+            
+      @@dummy_metric_frame = DummyMetricFrame.new
+      
+      
       # This method returns a string suitable for inclusion in a page
       # - known as 'manual instrumentation' for Real User
       # Monitoring. Can return either a script tag with associated
@@ -34,32 +52,49 @@ module NewRelic
         config = NewRelic::Agent.instance.beacon_configuration
         return "" if config.nil? || !config.rum_enabled || config.browser_monitoring_key.nil?
         return "" if !NewRelic::Agent.is_transaction_traced? || !NewRelic::Agent.is_execution_traced?
-        generate_footer_js
+        generate_footer_js(config)
       end
 
       private
 
-      def generate_footer_js
+      def generate_footer_js(config)
         if browser_monitoring_start_time
-          config = NewRelic::Agent.instance.beacon_configuration
           application_id = config.application_id
           beacon = config.beacon
           license_key = config.browser_monitoring_key
 
-          footer_js_string(beacon, license_key, application_id)
+          footer_js_string(config, beacon, license_key, application_id)
         else
           ''
         end
       end
 
       def browser_monitoring_transaction_name
-        Thread.current[:newrelic_most_recent_transaction] || "<unknown>"
+        NewRelic::Agent::TransactionInfo.get.transaction_name
       end
 
       def browser_monitoring_start_time
-        Thread.current[:newrelic_start_time]
+        NewRelic::Agent::TransactionInfo.get.start_time
       end
-
+            
+      def metric_frame_attribute(key)
+        current_metric_frame.user_attributes[key] || ""
+      end
+      
+      def current_metric_frame
+        Thread.current[:last_metric_frame] || @@dummy_metric_frame      
+      end
+      
+      def tt_guid
+        txn = NewRelic::Agent::TransactionInfo.get
+        return txn.guid if txn.include_guid?
+        ""
+      end
+      
+      def tt_token
+        return NewRelic::Agent::TransactionInfo.get.token
+      end
+      
       def clamp_to_positive(value)
         return 0.0 if value < 0
         value
@@ -70,12 +105,17 @@ module NewRelic
       end
 
       def browser_monitoring_queue_time
-        clamp_to_positive((Thread.current[:newrelic_queue_time].to_f * 1000.0).round)
+        clamp_to_positive((current_metric_frame.queue_time.to_f * 1000.0).round)
       end
 
-      def footer_js_string(beacon, license_key, application_id)
-        obfuscated_transaction_name = obfuscate(browser_monitoring_transaction_name)
-        html_safe_if_needed("<script type=\"text/javascript\">#{NewRelic::Agent.instance.beacon_configuration.browser_timing_static_footer}NREUMQ.push([\"nrf2\",\"#{beacon}\",\"#{license_key}\",#{application_id},\"#{obfuscated_transaction_name}\",#{browser_monitoring_queue_time},#{browser_monitoring_app_time},new Date().getTime()])</script>")
+      def footer_js_string(config, beacon, license_key, application_id)
+        obfuscated_transaction_name = obfuscate(config, browser_monitoring_transaction_name)
+        
+        user = obfuscate(config, metric_frame_attribute(:user))
+        account = obfuscate(config, metric_frame_attribute(:account))
+        product = obfuscate(config, metric_frame_attribute(:product))
+        
+        html_safe_if_needed("<script type=\"text/javascript\">#{config.browser_timing_static_footer}NREUMQ.push([\"#{config.finish_command}\",\"#{beacon}\",\"#{license_key}\",#{application_id},\"#{obfuscated_transaction_name}\",#{browser_monitoring_queue_time},#{browser_monitoring_app_time},new Date().getTime(),\"#{tt_guid}\",\"#{tt_token}\",\"#{user}\",\"#{account}\",\"#{product}\"])</script>")
       end
 
       def html_safe_if_needed(string)
@@ -86,9 +126,9 @@ module NewRelic
         end
       end
 
-      def obfuscate(text)
+      def obfuscate(config, text)
         obfuscated = ""
-        key_bytes = NewRelic::Agent.instance.beacon_configuration.license_bytes
+        key_bytes = config.license_bytes
         index = 0
         text.each_byte{|byte|
           obfuscated.concat((byte ^ key_bytes[index % 13].to_i))

data/lib/new_relic/agent/database.rb

@@ -30,7 +30,7 @@ module NewRelic
       def get_connection(config)
         ConnectionManager.instance.get_connection(config)
       end
-
+      
       def close_connections
         ConnectionManager.instance.close_connections
       end
@@ -95,12 +95,12 @@ module NewRelic
 
       def handle_exception_in_explain
         yield
-      rescue Exception => e
+      rescue => e
         begin
           # guarantees no throw from explain_sql
           NewRelic::Control.instance.log.error("Error getting query plan: #{e.message}")
           NewRelic::Control.instance.log.debug(e.backtrace.join("\n"))
-        rescue Exception
+        rescue
           # double exception. throw up your hands
         end
       end
@@ -111,10 +111,10 @@ module NewRelic
         first_word, rest_of_statement = statement.split($;, 2)
         (first_word.upcase == 'SELECT')
       end
-
+      
       class ConnectionManager
         include Singleton
-        
+
         # Returns a cached connection for a given ActiveRecord
         # configuration - these are stored or reopened as needed, and if
         # we cannot get one, we ignore it and move on without explaining
@@ -187,16 +187,36 @@ module NewRelic
         end
         
         def default_sql_obfuscator(sql)
-          sql = sql.dup
-          # This is hardly readable.  Use the unit tests.
-          # remove single quoted strings:
-          sql.gsub!(/'(.*?[^\\'])??'(?!')/, '?')
-          # remove double quoted strings:
-          sql.gsub!(/"(.*?[^\\"])??"(?!")/, '?')
-          # replace all number literals
-          sql.gsub!(/\d+/, "?")
-          sql
+          stmt = sql.kind_of?(Statement) ? sql : Statement.new(sql)
+          adapter = stmt.adapter
+          obfuscated = remove_escaped_quotes(stmt)
+          obfuscated = obfuscate_single_quote_literals(obfuscated)
+          if !(adapter.to_s =~ /postgres/ || adapter.to_s =~ /sqlite/)
+            obfuscated = obfuscate_double_quote_literals(obfuscated)
+          end
+          obfuscated = obfuscate_numeric_literals(obfuscated)
+          obfuscated.to_s # return back to a regular String
+        end
+
+        def remove_escaped_quotes(sql)
+          sql.gsub(/\\"/, '').gsub(/\\'/, '')
         end
+
+        def obfuscate_single_quote_literals(sql)
+          sql.gsub(/'(?:[^']|'')*'/, '?')
+        end
+
+        def obfuscate_double_quote_literals(sql)
+          sql.gsub(/"(?:[^"]|"")*"/, '?')
+        end
+
+        def obfuscate_numeric_literals(sql)
+          sql.gsub(/\b\d+\b/, "?")
+        end
+      end
+
+      class Statement < String        
+        attr_accessor :adapter
       end
     end
   end

data/lib/new_relic/agent/error_collector.rb

@@ -223,7 +223,7 @@ module NewRelic
         exception_options = error_params_from_options(options).merge(exception_info(exception))
         add_to_error_queue(NewRelic::NoticedError.new(action_path, exception_options, exception))
         exception
-      rescue Exception => e
+      rescue => e
         log.error("Error capturing an error, yodawg. #{e}")
       end
 

data/lib/new_relic/agent/instrumentation/active_merchant.rb

@@ -2,7 +2,9 @@ DependencyDetection.defer do
   @name = :active_merchant
   
   depends_on do
-    defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing)
+    defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing) &&
+      defined?(ActiveMerchant::Billing::Gateway) &&
+      ActiveMerchant::Billing::Gateway.respond_to?(:implementations)
   end
   
   executes do

data/lib/new_relic/agent/instrumentation/active_record.rb

@@ -0,0 +1,137 @@
+module NewRelic
+  module Agent
+    module Instrumentation
+      module ActiveRecord
+        def self.included(instrumented_class)
+          instrumented_class.class_eval do
+            unless instrumented_class.method_defined?(:log_without_newrelic_instrumentation)
+              alias_method :log_without_newrelic_instrumentation, :log
+              alias_method :log, :log_with_newrelic_instrumentation
+              protected :log
+            end
+          end
+        end
+                
+        def log_with_newrelic_instrumentation(*args, &block)
+          if !NewRelic::Agent.is_execution_traced?
+            return log_without_newrelic_instrumentation(*args, &block)
+          end
+          
+          sql, name, binds = args
+          metric = metric_for_name(name) || metric_for_sql(sql)
+          
+          if !metric
+            log_without_newrelic_instrumentation(*args, &block)
+          else
+            metrics = [metric, remote_service_metric].compact
+            metrics += rollup_metrics_for(metric)
+            self.class.trace_execution_scoped(metrics) do
+              t0 = Time.now
+              begin
+                log_without_newrelic_instrumentation(*args, &block)
+              ensure
+                elapsed_time = (Time.now - t0).to_f
+                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql,
+                                                         @config, elapsed_time)
+                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric,
+                                                         @config, elapsed_time)
+              end
+            end
+          end
+        end
+        
+        def remote_service_metric
+          if @config && @config[:adapter]
+            type = @config[:adapter].sub(/\d*/, '')
+            host = @config[:host] || 'localhost'
+            "RemoteService/sql/#{type}/#{host}"
+          end                      
+        end
+        
+        def metric_for_name(name)
+          if name && (parts = name.split " ") && parts.size == 2
+            model = parts.first
+            operation = parts.last.downcase
+            op_name = case operation
+                          when 'load', 'count', 'exists' then 'find'
+                          when 'indexes', 'columns' then nil # fall back to DirectSQL
+                          when 'destroy', 'find', 'save', 'create' then operation
+                          when 'update' then 'save'
+                          else
+                            if model == 'Join'
+                              operation
+                            end
+                          end
+            "ActiveRecord/#{model}/#{op_name}" if op_name
+          end
+        end
+
+        def metric_for_sql(sql)
+          metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
+          if metric.nil?
+            if sql =~ /^(select|update|insert|delete|show)/i
+              # Could not determine the model/operation so let's find a better
+              # metric.  If it doesn't match the regex, it's probably a show
+              # command or some DDL which we'll ignore.
+              metric = "Database/SQL/#{$1.downcase}"
+            else
+              metric = "Database/SQL/other"
+            end
+          end
+          metric
+        end
+        
+        def rollup_metrics_for(metric)
+          metrics = ["ActiveRecord/all"]
+          metrics << "ActiveRecord/#{$1}" if metric =~ /ActiveRecord\/\w+\/(\w+)/
+          metrics
+        end
+      end
+    end
+  end
+end
+
+DependencyDetection.defer do
+  @name = :active_record
+  
+  depends_on do
+    defined?(ActiveRecord) && defined?(ActiveRecord::Base)
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['skip_ar_instrumentation']
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['disable_activerecord_instrumentation']
+  end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing ActiveRecord instrumentation'
+  end
+  
+  executes do
+    if defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
+      Rails.configuration.after_initialize do
+        insert_instrumentation
+      end
+    else
+      insert_instrumentation
+    end
+  end
+
+  def insert_instrumentation
+    ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
+      include ::NewRelic::Agent::Instrumentation::ActiveRecord
+    end
+    
+    ActiveRecord::Base.class_eval do
+      class << self
+        add_method_tracer(:find_by_sql, 'ActiveRecord/#{self.name}/find_by_sql',
+                          :metric => false)
+        add_method_tracer(:transaction, 'ActiveRecord/#{self.name}/transaction',
+                          :metric => false)
+      end
+    end          
+  end
+end