ghazel-newrelic_rpm 3.1.0.1 → 3.4.0.2

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

@@ -1,11 +1,16 @@
 require 'set'
 
 DependencyDetection.defer do
-
+  @name = :merb_controller
+  
   depends_on do
     defined?(Merb) && defined?(Merb::Controller)
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Merb Controller instrumentation'
+  end
+  
   executes do
     require 'merb-core/controller/merb_controller'
 

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
@@ -6,7 +8,11 @@ DependencyDetection.defer do
   depends_on do
     Merb::Dispatcher::DefaultException.respond_to?(:before)
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Merb Errors instrumentation'
+  end
+  
   executes do
 
     # Hook in the notification to merb

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

@@ -67,17 +67,18 @@ module NewRelic
             include_class 'java.lang.management.ManagementFactory'
             include_class 'com.sun.management.OperatingSystemMXBean'
             @@java_classes_loaded = true
-          rescue Exception => e
+          rescue => e
           end
         end
 
         attr_reader :depth
 
         def initialize
-          Thread.current[:newrelic_start_time] = @start = Time.now
+          @start = Time.now
           @path_stack = [] # stack of [controller, path] elements
           @jruby_cpu_start = jruby_cpu_time
           @process_cpu_start = process_cpu
+          Thread.current[:last_metric_frame] = self
         end
 
         def agent
@@ -87,15 +88,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 +133,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
 
@@ -193,11 +200,19 @@ module NewRelic
         def self.add_custom_parameters(p)
           current.add_custom_parameters(p) if current
         end
-
+        
         def self.custom_parameters
           (current && current.custom_parameters) ? current.custom_parameters : {}
         end
 
+        def self.set_user_attributes(attributes)
+          current.set_user_attributes(attributes) if current 
+        end
+
+        def self.user_attributes
+          (current) ? current.user_attributes : {}
+        end
+          
         def record_apdex()
           return unless recording_web_transaction? && NewRelic::Agent.is_execution_traced?
           t = Time.now
@@ -242,10 +257,22 @@ module NewRelic
         def custom_parameters
           @custom_parameters ||= {}
         end
+        
+        def user_attributes
+          @user_atrributes ||= {}
+        end
+        
+        def queue_time
+          apdex_start - start
+        end
 
         def add_custom_parameters(p)
           custom_parameters.merge!(p)
         end
+        
+        def set_user_attributes(attributes)
+          user_attributes.merge!(attributes)
+        end
 
         def self.recording_web_transaction?
           c = Thread.current[:newrelic_metric_frame]

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

@@ -17,12 +17,9 @@ module NewRelic
             NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
           end
 
-          def process_histogram_for_transaction(ending)
-            agent.histogram.process((ending - start).to_f)
-          end
-
           def notice_scope_empty
             transaction_sampler.notice_scope_empty
+            sql_sampler.notice_scope_empty
           end
 
           def record_transaction_cpu
@@ -59,7 +56,6 @@ module NewRelic
 
           def notify_transaction_sampler(web_transaction)
             record_transaction_cpu
-            process_histogram_for_transaction(Time.now) if web_transaction
             notice_scope_empty
           end
 

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

@@ -1,12 +1,18 @@
 DependencyDetection.defer do
+  @name = :net
+
   depends_on do
     defined?(Net) && defined?(Net::HTTP)
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Net instrumentation'
+  end
+  
   executes do
     Net::HTTP.class_eval do
       def request_with_newrelic_trace(*args, &block)
-        metrics = ["External/#{@address}/Net::HTTP/#{args[0].method}","External/#{@address}/all"]
+        metrics = ["External/#{@address}/Net::HTTP/#{args[0].method}", "External/#{@address}/all", "External/all"]
         if NewRelic::Agent::Instrumentation::MetricFrame.recording_web_transaction?
           metrics << "External/allWeb"
         else

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

@@ -1,4 +1,6 @@
 DependencyDetection.defer do
+  @name = :passenger
+  
   depends_on do
     defined?(PhusionPassenger)
   end
@@ -26,8 +28,9 @@ DependencyDetection.defer do
   end
 
   executes do
-    # We're on an older version of passenger
-    NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
+    ## We're on an older version of passenger
+    ## FIXME: This warning is printing on current version of passenger
+    # NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
 
     NewRelic::Agent::Instrumentation::MetricFrame.check_server_connection = true
   end

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

@@ -172,7 +172,7 @@ module NewRelic
         def record_time_stat(name, start_time, end_time) # (String, Time, Time) -> nil
           total_time = end_time - start_time
           if total_time < 0
-            raise "should not provide an end time less than start time: #{end_time} is less than #{start_time}"
+            raise "should not provide an end time less than start time: #{end_time.strftime('%s.%N')} is less than #{start_time.strftime('%s.%N')}. total time is #{total_time}."
           else
             NewRelic::Agent.get_stats(name).trace_call(total_time)
           end

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

@@ -1,73 +1,104 @@
 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
 
-  depends_on do
-    defined?(Rails) && Rails::VERSION::MAJOR.to_i == 2
+  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
-    !NewRelic::Control.instance['disable_view_instrumentation']
+    !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
 
-    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
+DependencyDetection.defer do
+  @name = :rails23_view
+  
+  depends_on do
+    !NewRelic::Control.instance['disable_view_instrumentation'] &&
+    defined?(ActionView) && defined?(ActionView::Template) && defined?(ActionView::RenderablePartial) &&
+    defined?(Rails::VERSION::STRING) && Rails::VERSION::STRING =~ /^2\.[23]/ 
+  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
-    end
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 2.2 - 2.3 View instrumentation'
   end
+  
+  executes do    
+    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
+  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 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,8 +1,14 @@
 DependencyDetection.defer do
+  @name = :rails_action_web_service
+  
   depends_on do
     defined?(ActionWebService)
   end
-
+  
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails ActionWebService instrumentation'
+  end  
+  
   executes do
     # NewRelic Agent instrumentation for WebServices
 

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

@@ -1,12 +1,18 @@
 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 2 Error instrumentation'
+  end  
+  
   executes do
 
     ActionController::Base.class_eval do

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

@@ -36,20 +36,51 @@ module NewRelic
           end
 
         end
+
+        module ActionView
+          module NewRelic
+            extend self
+            def template_metric(identifier, options = {})
+              if options[:file]
+                "file"
+              elsif identifier.nil?
+                "(unknown)"
+              elsif identifier.include? '/' # this is a filepath
+                identifier.split('/')[-2..-1].join('/')
+              else
+                identifier
+              end
+            end
+            def render_type(file_path)
+              file = File.basename(file_path)
+              if file.starts_with?('_')
+                return 'Partial'
+              else
+                return 'Rendering'
+              end
+            end
+          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
     defined?(ActionController) && defined?(ActionController::Base)
   end
 
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 3 Controller instrumentation'
+  end
+
   executes do
     class ActionController::Base
       include NewRelic::Agent::Instrumentation::ControllerInstrumentation
@@ -57,4 +88,93 @@ DependencyDetection.defer do
     end
   end
 end
+DependencyDetection.defer do
+  @name = :rails30_view
+
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ::Rails::VERSION::MINOR.to_i == 0
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['disable_view_instrumentation']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 3.0 view instrumentation'
+  end
+
+  executes do
+    ActionView::Template.class_eval do
+      include NewRelic::Agent::MethodTracer
+      def render_with_newrelic(*args, &block)
+        options = if @virtual_path && @virtual_path.starts_with?('/') # file render
+          {:file => true }
+        else
+          {}
+        end
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(@identifier, options)}/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.render_type(@identifier)}"
+        trace_execution_scoped str do
+          render_without_newrelic(*args, &block)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+
+    end
+  end
+end
+
+DependencyDetection.defer do
+  @name = :rails31_view
+
+  # We can't be sure that this wil work with future versions of Rails 3.
+  # Currently enabled for Rails 3.1 and 3.2
+  depends_on do
+    defined?(::Rails) && ::Rails::VERSION::MAJOR.to_i == 3 && ([1,2].member?(::Rails::VERSION::MINOR.to_i))
+  end
+
+  depends_on do
+    !NewRelic::Control.instance['disable_view_instrumentation']
+  end
+
+  executes do
+    NewRelic::Agent.logger.debug 'Installing Rails 3.1/3.2 view instrumentation'
+  end
 
+  executes do
+    ActionView::TemplateRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+      # namespaced helper methods
+
+      def render_with_newrelic(context, options)
+        # This is needed for rails 3.2 compatibility
+        @details = extract_details(options) if respond_to? :extract_details
+        identifier = determine_template(options) ? determine_template(options).identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier, options)}/Rendering"
+        trace_execution_scoped str do
+          render_without_newrelic(context, options)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+    end
+
+    ActionView::PartialRenderer.class_eval do
+      include NewRelic::Agent::MethodTracer
+
+      def render_with_newrelic(*args, &block)
+        setup(*args, &block)
+        identifier = find_partial ? find_partial.identifier : nil
+        str = "View/#{NewRelic::Agent::Instrumentation::Rails3::ActionView::NewRelic.template_metric(identifier)}/Partial"
+        trace_execution_scoped str do
+          render_without_newrelic(*args, &block)
+        end
+      end
+
+      alias_method :render_without_newrelic, :render
+      alias_method :render, :render_with_newrelic
+    end
+  end
+end