newrelic_rpm 3.1.2 → 3.2.0.beta1

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :active_merchant
+  
   depends_on do
     defined?(ActiveMerchant) && defined?(ActiveMerchant::Billing)
   end

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

@@ -18,6 +18,8 @@ module NewRelic
 end
 
 DependencyDetection.defer do
+  @name = :acts_as_solr
+  
   depends_on do
     defined?(ActsAsSolr)
   end

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :authlogic
+  
   depends_on do
     defined?(AuthLogic) &&
       defined?(AuthLogic::Session) &&

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

@@ -38,6 +38,8 @@
 #     towards scope) so they don't show up ine normal call graph/trace.
 
 DependencyDetection.defer do
+  @name = :data_mapper
+  
   depends_on do
     defined?(::DataMapper)
   end

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

@@ -1,6 +1,8 @@
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
 DependencyDetection.defer do
+  @name = :delayed_job
+  
   depends_on do
     !NewRelic::Control.instance['disable_dj']
   end

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

@@ -15,8 +15,8 @@ module NewRelic
             next unless the_class.method_defined? method_name.to_sym
             the_class.class_eval <<-EOD
               def #{method_name}_with_newrelic_trace(*args, &block)
-                metrics = ["MemCache/#{method_name}",
-                           (NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction? ? 'MemCache/allWeb' : 'MemCache/allOther')]
+                metrics = ["Memcache/#{method_name}",
+                           (NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction? ? 'Memcache/allWeb' : 'Memcache/allOther')]
                 self.class.trace_execution_scoped(metrics) do
                   t0 = Time.now
                   begin
@@ -41,30 +41,40 @@ module NewRelic
 end
 
 DependencyDetection.defer do
+  @name = :memcache
+  
   depends_on do
     !NewRelic::Control.instance['disable_memcache_instrumentation']
   end
-  
-  executes do
-    NewRelic::Agent.logger.debug 'Installing Memcached instrumentation'
+
+  depends_on do
+    defined?(::MemCache) || defined?(::Memcached) ||
+      defined?(::Dalli::Client) || defined?(::Spymemcached)
   end
-  
+    
   executes do
     commands = %w[get get_multi set add incr decr delete replace append prepend]
     if defined? ::MemCache
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::MemCache,
-                                                                   commands)
-    elsif defined? ::Memcached
+                                                                    commands)
+      NewRelic::Agent.logger.debug 'Installing MemCache instrumentation'
+    end
+    if defined? ::Memcached
       commands << 'cas'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Memcached,
-                                                                   commands)
-    elsif defined? ::Dalli::Client
+                                                                    commands)
+      NewRelic::Agent.logger.debug 'Installing Memcached instrumentation'
+    end
+    if defined? ::Dalli::Client
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client,
-                                                                   commands)
-    elsif defined? ::Spymemcached
+                                                                    commands)
+      NewRelic::Agent.logger.debug 'Installing Dalli Memcache instrumentation'
+    end
+    if defined? ::Spymemcached
       commands << 'multiget'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Spymemcached,
-                                                                   commands)
+                                                                    commands)
+      NewRelic::Agent.logger.debug 'Installing Spymemcached instrumentation'
     end
   end
 end

data/lib/new_relic/agent/instrumentation/merb/controller.rb

@@ -1,7 +1,8 @@
 require 'set'
 
 DependencyDetection.defer do
-
+  @name = :merb_controller
+  
   depends_on do
     defined?(Merb) && defined?(Merb::Controller)
   end

data/lib/new_relic/agent/instrumentation/merb/errors.rb

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :merb_error
+
   depends_on do
     defined?(Merb) && defined?(Merb::Dispatcher) && defined?(Merb::Dispatcher::DefaultException)
   end

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

@@ -87,15 +87,20 @@ module NewRelic
         def transaction_sampler
           agent.transaction_sampler
         end
+        
+        def sql_sampler
+          agent.sql_sampler
+        end
 
         private :agent
         private :transaction_sampler
-
+        private :sql_sampler        
 
         # Indicate that we are entering a measured controller action or task.
         # Make sure you unwind every push with a pop call.
         def push(m)
           transaction_sampler.notice_first_scope_push(start)
+          sql_sampler.notice_first_scope_push(start)
           @path_stack.push NewRelic::MetricParser::MetricParser.for_metric_named(m)
         end
 
@@ -127,6 +132,7 @@ module NewRelic
           # Only push the transaction context info once, on entry:
           if @path_stack.size == 1
             transaction_sampler.notice_transaction(metric_name, uri, filtered_params)
+            sql_sampler.notice_transaction(metric_name, uri, filtered_params)
           end
         end
 

data/lib/new_relic/agent/instrumentation/metric_frame/pop.rb

@@ -19,6 +19,7 @@ module NewRelic
 
           def notice_scope_empty
             transaction_sampler.notice_scope_empty
+            sql_sampler.notice_scope_empty
           end
 
           def record_transaction_cpu

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :net
+
   depends_on do
     defined?(Net) && defined?(Net::HTTP)
   end

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :passenger
+  
   depends_on do
     defined?(PhusionPassenger)
   end

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

@@ -1,77 +1,104 @@
-# FIXME: this should be a separate dependency block for each kind of
-# view instrumentation
 DependencyDetection.defer do
+  @name = :rails21_view
+  
   depends_on do
-    defined?(ActionController) && defined?(ActionController::Base)
+    !NewRelic::Control.instance['disable_view_instrumentation'] &&
+    defined?(ActionController) && defined?(ActionController::Base) && defined?(ActionView::PartialTemplate) && defined?(ActionView::Template) &&
+    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.1\./   # Rails 2.1 &&
+  end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 2.1 View instrumentation'
+  end
+
+  executes do
+    ActionView::PartialTemplate.class_eval do
+      add_method_tracer :render, 'View/#{path_without_extension[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Partial'
+    end
+    # this is for template rendering, as opposed to partial rendering.
+    ActionView::Template.class_eval do
+      add_method_tracer :render, 'View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering'
+    end
   end
+end
 
+DependencyDetection.defer do
+  @name = :old_rails_view
+  
   depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
+    !NewRelic::Control.instance['disable_view_instrumentation'] &&
+    defined?(ActionController) && defined?(ActionController::Base) &&
+    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^(1\.|2\.0)/  # Rails 1.* - 2.0 
+  end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 1.* - 2.0 View instrumentation'
+  end
+  
+  executes do
+    ActionController::Base.class_eval do
+      add_method_tracer :render, 'View/#{newrelic_metric_path}/Rendering'
+    end
+    
   end
+end
 
+DependencyDetection.defer do
+  @name = :rails23_view
+  
   depends_on do
-    !NewRelic::Control.instance['disable_view_instrumentation']
+    !NewRelic::Control.instance['disable_view_instrumentation'] &&
+    defined?(ActionView) && defined?(ActionView::Template) && defined?(ActionView::RenderablePartial) &&
+    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.[23]/ 
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 2.2 - 2.3 View instrumentation'
+  end
+  
   executes do    
-    case Rails::VERSION::STRING
-
-    when /^(1\.|2\.0)/  # Rails 1.* - 2.0
-      ActionController::Base.class_eval do
-        add_method_tracer :render, 'View/#{newrelic_metric_path}/Rendering'
-      end
-
-    when /^2\.1\./  # Rails 2.1
-      ActionView::PartialTemplate.class_eval do
-        add_method_tracer :render, 'View/#{path_without_extension[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Partial'
-      end
-      # this is for template rendering, as opposed to partial rendering.
-      ActionView::Template.class_eval do
-        add_method_tracer :render, 'View/#{(path_without_extension || @view.controller.newrelic_metric_path)[%r{^(/.*/)?(.*)$},2]}.#{@view.template_format}.#{extension}/Rendering'
-      end
-
-    when /^2\./   # Rails 2.2-2.*
-      ActionView::RenderablePartial.module_eval do
-        add_method_tracer :render_partial, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Partial'
-      end
-      ActionView::Template.class_eval do
-        add_method_tracer :render, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering'
-      end
+    ActionView::RenderablePartial.module_eval do
+      add_method_tracer :render_partial, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Partial'
     end
-  end
+    ActionView::Template.class_eval do
+      add_method_tracer :render, 'View/#{path[%r{^(/.*/)?(.*)$},2]}/Rendering'
+    end
+  end  
 end
 
 DependencyDetection.defer do
+  @name = :rails2_controller
+  
   depends_on do
     defined?(ActionController) && defined?(ActionController::Base)
   end
-
+  
   depends_on do
     defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails Controller instrumentation'
+    NewRelic::Agent.logger.debug 'Installing Rails 2 Controller instrumentation'
   end
-
+  
   executes do
     ActionController::Base.class_eval do
       include NewRelic::Agent::Instrumentation::ControllerInstrumentation
-
+      
       # Compare with #alias_method_chain, which is not available in
       # Rails 1.1:
       alias_method :perform_action_without_newrelic_trace, :perform_action
       alias_method :perform_action, :perform_action_with_newrelic_trace
       private :perform_action
-
+      
       def self.newrelic_write_attr(attr_name, value) # :nodoc:
         write_inheritable_attribute(attr_name, value)
       end
-
+      
       def self.newrelic_read_attr(attr_name) # :nodoc:
         read_inheritable_attribute(attr_name)
       end
-
+      
       # determine the path that is used in the metric name for
       # the called controller action
       def newrelic_metric_path(action_name_override = nil)

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :rails_action_web_service
+  
   depends_on do
     defined?(ActionWebService)
   end

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

@@ -62,6 +62,7 @@ module NewRelic
                 log_without_newrelic_instrumentation(sql, name, &block)
               ensure
                 NewRelic::Agent.instance.transaction_sampler.notice_sql(sql, supported_config, (Time.now - t0).to_f)
+                NewRelic::Agent.instance.sql_sampler.notice_sql(sql, metric, supported_config, (Time.now - t0).to_f)
               end
             end
           end
@@ -73,12 +74,14 @@ module NewRelic
 end
 
 DependencyDetection.defer do
+  @name = :rails2_active_record
+  
   depends_on do
     defined?(ActiveRecord) && defined?(ActiveRecord::Base)
   end
 
   depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 2
   end
 
   depends_on do
@@ -90,7 +93,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails ActiveRecord instrumentation'
+    NewRelic::Agent.logger.debug 'Installing Rails 2 ActiveRecord instrumentation'
   end
   
   executes do

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

@@ -1,14 +1,16 @@
 DependencyDetection.defer do
+  @name = :rails2_error
+  
   depends_on do
     defined?(ActionController) && defined?(ActionController::Base)
   end
 
   depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 2
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails Error instrumentation'
+    NewRelic::Agent.logger.debug 'Installing Rails 2 Error instrumentation'
   end  
   
   executes do

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

@@ -36,14 +36,27 @@ module NewRelic
           end
 
         end
+
+        module ActionView
+          def _render_template(template, layout = nil, options = {}) #:nodoc:
+            NewRelic::Agent.trace_execution_scoped "View/#{template.virtual_path}/Rendering" do
+              super
+            end
+          end
+
+          module PartialRenderer
+          end
+        end
       end
     end
   end
 end
 
 DependencyDetection.defer do
+  @name = :rails3_controller
+  
   depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 3
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3
   end
 
   depends_on do
@@ -51,7 +64,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing Rails3 Controller instrumentation'
+    NewRelic::Agent.logger.debug 'Installing Rails 3 Controller instrumentation'
   end  
   
   executes do
@@ -62,3 +75,44 @@ DependencyDetection.defer do
   end
 end
 
+DependencyDetection.defer do
+  @name = :rails3_view
+  
+  depends_on do
+    defined?(ActionView) && defined?(ActionView::Base) && defined?(ActionView::Partials)
+  end
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i >= 1
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['disable_view_instrumentation']
+  end
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 3 view instrumentation'
+  end
+  
+  executes do
+    class ActionView::Base
+      include NewRelic::Agent::Instrumentation::Rails3::ActionView
+    end
+    old_klass = ActionView::Partials::PartialRenderer
+    ActionView::Partials::PartialRenderer = Class.new(old_klass)
+    class ActionView::Partials::PartialRenderer
+      def render_partial(*args)
+        NewRelic::Agent.trace_execution_scoped "View/#{@template.virtual_path}/Partial" do
+          super
+        end
+      end
+
+      def render_collection(*args)
+        name = @template ? @template.virtual_path : "Mixed"
+        NewRelic::Agent.trace_execution_scoped "View/#{name}/Collection" do
+          super
+        end
+      end
+    end
+  end
+end