newrelic_rpm 2.13.5.beta4 → 2.13.6.beta1

data/lib/new_relic/agent/instrumentation/rails/active_record_instrumentation.rb

@@ -1,91 +1,100 @@
+module NewRelic
+  module Agent
+    module Instrumentation
+      module ActiveRecordInstrumentation
 
-# NewRelic instrumentation for ActiveRecord
-if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && !NewRelic::Control.instance['skip_ar_instrumentation']
-
-  module NewRelic
-    module Agent
-      module Instrumentation
-        module ActiveRecordInstrumentation
-
-          def self.included(instrumented_class)
-            instrumented_class.class_eval do
-              alias_method :log_without_newrelic_instrumentation, :log
-              alias_method :log, :log_with_newrelic_instrumentation
-              protected :log
-            end
+        def self.included(instrumented_class)
+          instrumented_class.class_eval do
+            alias_method :log_without_newrelic_instrumentation, :log
+            alias_method :log, :log_with_newrelic_instrumentation
+            protected :log
           end
+        end
 
-          def log_with_newrelic_instrumentation(sql, name, &block)
+        def log_with_newrelic_instrumentation(sql, name, &block)
 
-            return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
+          return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
 
-            # Capture db config if we are going to try to get the explain plans
-            if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-                (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
-              supported_config = @config
-            end
-            if name && (parts = name.split " ") && parts.size == 2
-              model = parts.first
-              operation = parts.last.downcase
-              metric_name = case operation
-                            when 'load' 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
+          # Capture db config if we are going to try to get the explain plans
+          if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
+              (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
+            supported_config = @config
+          end
+          if name && (parts = name.split " ") && parts.size == 2
+            model = parts.first
+            operation = parts.last.downcase
+            metric_name = case operation
+                          when 'load' 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
-              metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
-            end
+                          end
+            metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
+          end
 
+          if metric.nil?
+            metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
             if metric.nil?
-              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
+              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
+          end
 
-            if !metric
-              log_without_newrelic_instrumentation(sql, name, &block)
-            else
-              metrics = [metric, "ActiveRecord/all"]
-              metrics << "ActiveRecord/#{metric_name}" if metric_name
-              self.class.trace_execution_scoped(metrics) do
-                t0 = Time.now
-                begin
-                  log_without_newrelic_instrumentation(sql, name, &block)
-                ensure
-                  NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-                end
+          if !metric
+            log_without_newrelic_instrumentation(sql, name, &block)
+          else
+            metrics = [metric, "ActiveRecord/all"]
+            metrics << "ActiveRecord/#{metric_name}" if metric_name
+            self.class.trace_execution_scoped(metrics) do
+              t0 = Time.now
+              begin
+                log_without_newrelic_instrumentation(sql, name, &block)
+              ensure
+                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
               end
             end
           end
-
         end
 
-        # instrumentation to catch logged SQL statements in sampled transactions
-        ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-          include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
-        end
+      end
+    end
+  end
+end
 
-        # This instrumentation will add an extra scope to the transaction traces
-        # which will show the code surrounding the query, inside the model find_by_sql
-        # method.
-        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 unless NewRelic::Control.instance['disable_activerecord_instrumentation']
+DependencyDetection.defer do
+  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
+    ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
+      include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
+    end
+  end
+
+  executes do
+    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

data/lib/new_relic/agent/instrumentation/rails3/active_record_instrumentation.rb

@@ -1,92 +1,104 @@
+module NewRelic
+  module Agent
+    module Instrumentation
+      module ActiveRecordInstrumentation
 
-# NewRelic instrumentation for ActiveRecord
-if defined?(ActiveRecord) && defined?(ActiveRecord::Base) && !NewRelic::Control.instance['skip_ar_instrumentation']
-
-  module NewRelic
-    module Agent
-      module Instrumentation
-        module ActiveRecordInstrumentation
-
-          def self.included(instrumented_class)
-            instrumented_class.class_eval do
-              alias_method :log_without_newrelic_instrumentation, :log
-              alias_method :log, :log_with_newrelic_instrumentation
-              protected :log
-            end
+        def self.included(instrumented_class)
+          instrumented_class.class_eval do
+            alias_method :log_without_newrelic_instrumentation, :log
+            alias_method :log, :log_with_newrelic_instrumentation
+            protected :log
           end
+        end
 
-          def log_with_newrelic_instrumentation(sql, name, &block)
+        def log_with_newrelic_instrumentation(sql, name, &block)
 
-            return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
+          return log_without_newrelic_instrumentation(sql, name, &block) unless NewRelic::Agent.is_execution_traced?
 
-            # Capture db config if we are going to try to get the explain plans
-            if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
-                (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
-              supported_config = @config
-            end
-            if name && (parts = name.split " ") && parts.size == 2
-              model = parts.first
-              operation = parts.last.downcase
-              metric_name = case operation
-                            when 'load' 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
+          # Capture db config if we are going to try to get the explain plans
+          if (defined?(ActiveRecord::ConnectionAdapters::MysqlAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::MysqlAdapter)) ||
+              (defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) && self.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter))
+            supported_config = @config
+          end
+          if name && (parts = name.split " ") && parts.size == 2
+            model = parts.first
+            operation = parts.last.downcase
+            metric_name = case operation
+                          when 'load' 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
-              metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
-            end
+                          end
+            metric = "ActiveRecord/#{model}/#{metric_name}" if metric_name
+          end
 
+          if metric.nil?
+            metric = NewRelic::Agent::Instrumentation::MetricFrame.database_metric_name
             if metric.nil?
-              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
+              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
+          end
 
-            if !metric
-              log_without_newrelic_instrumentation(sql, name, &block)
-            else
-              metrics = [metric, "ActiveRecord/all"]
-              metrics << "ActiveRecord/#{metric_name}" if metric_name
-              self.class.trace_execution_scoped(metrics) do
-                t0 = Time.now
-                begin
-                  log_without_newrelic_instrumentation(sql, name, &block)
-                ensure
-                  NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
-                end
+          if !metric
+            log_without_newrelic_instrumentation(sql, name, &block)
+          else
+            metrics = [metric, "ActiveRecord/all"]
+            metrics << "ActiveRecord/#{metric_name}" if metric_name
+            self.class.trace_execution_scoped(metrics) do
+              t0 = Time.now
+              begin
+                log_without_newrelic_instrumentation(sql, name, &block)
+              ensure
+                NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
               end
             end
           end
-
         end
 
-        Rails.configuration.after_initialize do
-          ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
-            include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
-          end
-        end
+      end
+    end
+  end
+end
 
-        # This instrumentation will add an extra scope to the transaction traces
-        # which will show the code surrounding the query, inside the model find_by_sql
-        # method.
-        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 unless NewRelic::Control.instance['disable_activerecord_instrumentation']
+DependencyDetection.defer do
+  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
+    Rails.configuration.after_initialize do
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.module_eval do
+        include ::NewRelic::Agent::Instrumentation::ActiveRecordInstrumentation
+      end
+    end
+  end
+
+  executes do
+    Rails.configuration.after_initialize do
+      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

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

@@ -4,92 +4,106 @@
 # See data_mapper.rb for major differences compared to the ActiveRecord instrumentation.
 #
 
-if defined? ::Sequel
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Sequel)
+  end
 
-  # Sequel::Model class methods
-  ::Sequel::Model::ClassMethods.class_eval do
+  executes do
+    # Sequel::Model class methods
+    ::Sequel::Model::ClassMethods.class_eval do
 
-    add_method_tracer :[],              'ActiveRecord/#{self.name}/find'
+      add_method_tracer :[],              'ActiveRecord/#{self.name}/find'
 
-    add_method_tracer :all,             'ActiveRecord/#{self.name}/find'
-    add_method_tracer :each,            'ActiveRecord/#{self.name}/find'
-    add_method_tracer :create,          'ActiveRecord/#{self.name}/create'
-    add_method_tracer :insert,          'ActiveRecord/#{self.name}/create'
-    add_method_tracer :insert_multiple, 'ActiveRecord/#{self.name}/create'
-    add_method_tracer :import,          'ActiveRecord/#{self.name}/create'
-    add_method_tracer :update,          'ActiveRecord/#{self.name}/update'
-    add_method_tracer :delete,          'ActiveRecord/#{self.name}/delete'
+      add_method_tracer :all,             'ActiveRecord/#{self.name}/find'
+      add_method_tracer :each,            'ActiveRecord/#{self.name}/find'
+      add_method_tracer :create,          'ActiveRecord/#{self.name}/create'
+      add_method_tracer :insert,          'ActiveRecord/#{self.name}/create'
+      add_method_tracer :insert_multiple, 'ActiveRecord/#{self.name}/create'
+      add_method_tracer :import,          'ActiveRecord/#{self.name}/create'
+      add_method_tracer :update,          'ActiveRecord/#{self.name}/update'
+      add_method_tracer :delete,          'ActiveRecord/#{self.name}/delete'
 
-  end
+    end
 
-  # Sequel's Model instance methods
-  ::Sequel::Model::InstanceMethods.class_eval do
+    # Sequel's Model instance methods
+    ::Sequel::Model::InstanceMethods.class_eval do
 
-    add_method_tracer :_insert, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/create'
-    add_method_tracer :_update, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
-    add_method_tracer :_delete, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
+      add_method_tracer :_insert, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/create'
+      add_method_tracer :_update, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/update'
+      add_method_tracer :_delete, 'ActiveRecord/#{self.class.name[/[^:]*$/]}/destroy'
 
-  end
+    end
 
-  # Sequel's Dataset instance methods
-  ::Sequel::Dataset.class_eval do
+    # Sequel's Dataset instance methods
+    ::Sequel::Dataset.class_eval do
 
-    add_method_tracer :execute,        'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/find'
-    add_method_tracer :execute_insert, 'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/create'
-    add_method_tracer :execute_dui,    'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/update'
-    add_method_tracer :execute_ddl,    'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/all'
+      add_method_tracer :execute,        'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/find'
+      add_method_tracer :execute_insert, 'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/create'
+      add_method_tracer :execute_dui,    'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/update'
+      add_method_tracer :execute_ddl,    'ActiveRecord/#{model ? model.name : "Dataset#{first_source}"}/all'
 
-  end
+    end
 
-  # Sequel's Database methods
-  ::Sequel::Database.class_eval do
+    # Sequel's Database methods
+    ::Sequel::Database.class_eval do
 
-    add_method_tracer :execute,        'ActiveRecord/Database/find'
-    add_method_tracer :execute_insert, 'ActiveRecord/Database/create'
-    add_method_tracer :execute_dui,    'ActiveRecord/Database/update'
-    add_method_tracer :execute_ddl,    'ActiveRecord/Database/all'
+      add_method_tracer :execute,        'ActiveRecord/Database/find'
+      add_method_tracer :execute_insert, 'ActiveRecord/Database/create'
+      add_method_tracer :execute_dui,    'ActiveRecord/Database/update'
+      add_method_tracer :execute_ddl,    'ActiveRecord/Database/all'
 
+    end
   end
+end
 
-  module NewRelic
-    module Agent
-      module Instrumentation
-        module SequelInstrumentation
-          def self.included(klass)
-            klass.class_eval do
-              alias_method :log_duration_without_newrelic_instrumentation, :log_duration
-              alias_method :log_duration, :log_duration_with_newrelic_instrumentation
-            end
-          end
 
-          def log_duration_with_newrelic_instrumentation(duration, sql)
-            return unless NewRelic::Agent.is_execution_traced?
-            return unless operation = case sql
-              when /^\s*select/i          then 'find'
-              when /^\s*(update|insert)/i then 'save'
-              when /^\s*delete/i          then 'destroy'
-              else nil
-            end
-
-            # Attach SQL to current segment/scope.
-            NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, nil, duration)
-
-            # Record query duration associated with each of the desired metrics.
-            metrics = [ "ActiveRecord/#{operation}", 'ActiveRecord/all' ]
-            metrics.each do |metric|
-              NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric).trace_call(duration)
-            end
-          ensure
-            log_duration_without_newrelic_instrumentation(duration, sql)
+module NewRelic
+  module Agent
+    module Instrumentation
+      module SequelInstrumentation
+        def self.included(klass)
+          klass.class_eval do
+            alias_method :log_duration_without_newrelic_instrumentation, :log_duration
+            alias_method :log_duration, :log_duration_with_newrelic_instrumentation
           end
-
-        end # SequelInstrumentation
-      end # Instrumentation
-    end # Agent
-  end # NewRelic
-
-  ::Sequel::Database.class_eval do
-    include ::NewRelic::Agent::Instrumentation::SequelInstrumentation
+        end
+
+        def log_duration_with_newrelic_instrumentation(duration, sql)
+          return unless NewRelic::Agent.is_execution_traced?
+          return unless operation = case sql
+                                    when /^\s*select/i          then 'find'
+                                    when /^\s*(update|insert)/i then 'save'
+                                    when /^\s*delete/i          then 'destroy'
+                                    else nil
+                                    end
+
+          # Attach SQL to current segment/scope.
+          NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, nil, duration)
+
+          # Record query duration associated with each of the desired metrics.
+          metrics = [ "ActiveRecord/#{operation}", 'ActiveRecord/all' ]
+          metrics.each do |metric|
+            NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric).trace_call(duration)
+          end
+        ensure
+          log_duration_without_newrelic_instrumentation(duration, sql)
+        end
+
+      end # SequelInstrumentation
+    end # Instrumentation
+  end # Agent
+end # NewRelic
+
+DependencyDetection.defer do
+  depends_on do
+    defined?(::Sequel) && defined?(::Sequel::Database)
+  end
+  
+  executes do
+    ::Sequel::Database.class_eval do
+      include ::NewRelic::Agent::Instrumentation::SequelInstrumentation
+    end
   end
+end
 
-end # if defined? Sequel