wd_newrelic_rpm 3.3.4.1 → 3.5.5

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

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActiveMerchant instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveMerchant instrumentation'
   end
   
   executes do

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

@@ -18,7 +18,8 @@ module NewRelic
           end
           
           sql, name, binds = args
-          metric = metric_for_name(name) || metric_for_sql(sql)
+          metric = metric_for_name(NewRelic::Helper.correctly_encoded(name)) ||
+            metric_for_sql(NewRelic::Helper.correctly_encoded(sql))
           
           if !metric
             log_without_newrelic_instrumentation(*args, &block)
@@ -99,15 +100,11 @@ DependencyDetection.defer do
   end
 
   depends_on do
-    !NewRelic::Control.instance['skip_ar_instrumentation']
-  end
-
-  depends_on do
-    !NewRelic::Control.instance['disable_activerecord_instrumentation']
+    !NewRelic::Agent.config[:disable_activerecord_instrumentation]
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActiveRecord instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActiveRecord instrumentation'
   end
   
   executes do

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

@@ -37,7 +37,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing ActsAsSolr instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing ActsAsSolr instrumentation'
   end
   
   executes do

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

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
 
   executes do
-    NewRelic::Agent.logger.debug 'Installing AuthLogic instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing AuthLogic instrumentation'
   end  
   
   executes do

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

@@ -0,0 +1,41 @@
+module NewRelic
+  module Agent
+    module Instrumentation
+      class BrowserMonitoringTimings
+
+        def initialize(queue_time_in_seconds, transaction)
+          if transaction.nil?
+            @start_time_in_seconds = 0.0
+          else
+            @transaction_name = transaction.transaction_name
+            @start_time_in_seconds = transaction.start_time
+          end
+
+          @queue_time_in_seconds = queue_time_in_seconds
+        end
+
+        attr_reader :transaction_name
+
+        def start_time_in_millis
+          convert_to_milliseconds(@start_time_in_seconds)
+        end
+
+        def queue_time_in_millis
+          convert_to_milliseconds(@queue_time_in_seconds)
+        end
+
+        def app_time_in_millis
+          convert_to_milliseconds(Time.now - @start_time_in_seconds)
+        end
+
+        private
+
+        def convert_to_milliseconds(value)
+          value = (value.to_f * 1000.0).round
+          return 0.0 if value < 0
+          value
+        end
+      end
+    end
+  end
+end

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

@@ -26,6 +26,7 @@ module NewRelic
         module ClassMethodsShim # :nodoc:
           def newrelic_ignore(*args); end
           def newrelic_ignore_apdex(*args); end
+          def newrelic_ignore_enduser(*args); end
         end
 
         module Shim # :nodoc:
@@ -51,11 +52,15 @@ module NewRelic
             newrelic_ignore_aspect('ignore_apdex', specifiers)
           end
 
+          def newrelic_ignore_enduser(specifiers={})
+            newrelic_ignore_aspect('ignore_enduser', specifiers)
+          end
+
           def newrelic_ignore_aspect(property, specifiers={}) # :nodoc:
             if specifiers.empty?
               self.newrelic_write_attr property, true
             elsif ! (Hash === specifiers)
-              logger.error "newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')"
+              ::NewRelic::Agent.logger.error "newrelic_#{property} takes an optional hash with :only and :except lists of actions (illegal argument type '#{specifiers.class}')"
             else
               self.newrelic_write_attr property, specifiers
             end
@@ -138,16 +143,23 @@ module NewRelic
                          end
               options_arg << %Q[:#{key} => #{valuestr}]
             end
+            traced_method, punctuation = method.to_s.sub(/([?!=])$/, ''), $1
+            visibility = NewRelic::Helper.instance_method_visibility self, method
+
             class_eval <<-EOC
-              def #{method.to_s}_with_newrelic_transaction_trace(*args, &block)
+              def #{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}(*args, &block)
                 perform_action_with_newrelic_trace(#{options_arg.join(',')}) do
-                  #{method.to_s}_without_newrelic_transaction_trace(*args, &block)
+                  #{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}(*args, &block)
                  end
               end
             EOC
-            alias_method "#{method.to_s}_without_newrelic_transaction_trace", method.to_s
-            alias_method method.to_s, "#{method.to_s}_with_newrelic_transaction_trace"
-            NewRelic::Control.instance.log.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
+            without_method_name = "#{traced_method.to_s}_without_newrelic_transaction_trace#{punctuation}"
+            with_method_name = "#{traced_method.to_s}_with_newrelic_transaction_trace#{punctuation}"
+            alias_method without_method_name, method.to_s
+            alias_method method.to_s, with_method_name
+            send visibility, method
+            send visibility, with_method_name
+            ::NewRelic::Agent.logger.debug("Traced transaction: class = #{self.name}, method = #{method.to_s}, options = #{options.inspect}")
           end
         end
 
@@ -242,8 +254,9 @@ module NewRelic
               return perform_action_without_newrelic_trace(*args)
             end
           end
-
-          return perform_action_with_newrelic_profile(args, &block) if NewRelic::Control.instance.profiling?
+          
+          control = NewRelic::Control.instance
+          return perform_action_with_newrelic_profile(args, &block) if control.profiling?
 
           frame_data = _push_metric_frame(block_given? ? args : [])
           begin
@@ -251,11 +264,17 @@ module NewRelic
               frame_data.start_transaction
               begin
                 NewRelic::Agent::BusyCalculator.dispatcher_start frame_data.start
-                if block_given?
+                result = if block_given?
                   yield
                 else
                   perform_action_without_newrelic_trace(*args)
                 end
+                if defined?(request) && request && defined?(response) && response
+                  if !Agent.config[:disable_mobile_headers]
+                    NewRelic::Agent::BrowserMonitoring.insert_mobile_response_header(request, response)
+                  end
+                end
+                result
               rescue => e
                 frame_data.notice_error(e)
                 raise
@@ -266,8 +285,9 @@ module NewRelic
             # Look for a metric frame in the thread local and process it.
             # Clear the thread local when finished to ensure it only gets called once.
             frame_data.record_apdex unless ignore_apdex?
-
             frame_data.pop
+            
+            NewRelic::Agent::TransactionInfo.get.ignore_end_user = true if ignore_enduser?
           end
         end
 
@@ -309,6 +329,10 @@ module NewRelic
         def ignore_apdex?
           _is_filtered?('ignore_apdex')
         end
+        
+        def ignore_enduser?
+          _is_filtered?('ignore_enduser')
+        end
 
         private
 
@@ -426,8 +450,7 @@ module NewRelic
           end
           queue_start || now
         rescue => e
-          NewRelic::Control.instance.log.error("Error detecting upstream wait time: #{e}")
-          NewRelic::Control.instance.log.debug("#{e.backtrace[0..20]}")
+          ::NewRelic::Agent.logger.error("Error detecting upstream wait time:", e)
           now
         end
         

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

@@ -57,7 +57,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing DataMapper instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing DataMapper instrumentation'
   end
   
   executes do
@@ -180,14 +180,6 @@ module NewRelic
   module Agent
     module Instrumentation
       module DataMapperInstrumentation
-
-        def self.included(klass)
-          klass.class_eval do
-            alias_method :log_without_newrelic_instrumentation, :log
-            alias_method :log, :log_with_newrelic_instrumentation
-          end
-        end
-
         # Unlike in AR, log is called in DM after the query actually ran,
         # complete with metrics.  Since DO has already calculated the
         # duration, there's nothing more to measure, so just record and log.
@@ -195,9 +187,9 @@ module NewRelic
         # We rely on the assumption that all possible entry points have been
         # hooked with tracers, ensuring that notice_sql attaches this SQL to
         # the proper call scope.
-        def log_with_newrelic_instrumentation(msg)
+        def log(msg)
           return unless NewRelic::Agent.is_execution_traced?
-          return unless operation = case msg.query
+          return unless operation = case NewRelic::Helper.correctly_encoded(msg.query)
                                     when /^\s*select/i          then 'find'
                                     when /^\s*(update|insert)/i then 'save'
                                     when /^\s*delete/i          then 'destroy'
@@ -216,7 +208,7 @@ module NewRelic
             NewRelic::Agent.instance.stats_engine.get_stats_no_scope(metric).trace_call(duration)
           end
         ensure
-          log_without_newrelic_instrumentation(msg)
+          super
         end
 
       end # DataMapperInstrumentation

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

@@ -4,7 +4,7 @@ DependencyDetection.defer do
   @name = :delayed_job
   
   depends_on do
-    !NewRelic::Control.instance['disable_dj']
+    !NewRelic::Agent.config[:disable_dj]
   end
 
   depends_on do
@@ -14,7 +14,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing DelayedJob instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing DelayedJob instrumentation'
   end
   
   executes do

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

@@ -32,7 +32,7 @@ module NewRelic
          end      
         end
         def memcache_key_snippet(method_name)
-          return "" unless NewRelic::Control.instance['capture_memcache_keys']
+          return "" unless NewRelic::Agent.config[:capture_memcache_keys]
           "NewRelic::Agent.instance.transaction_sampler.notice_nosql(args.first.inspect, (Time.now - t0).to_f) rescue nil"
         end
       end
@@ -44,7 +44,7 @@ DependencyDetection.defer do
   @name = :memcache
   
   depends_on do
-    !NewRelic::Control.instance['disable_memcache_instrumentation']
+    !NewRelic::Agent.config[:disable_memcache_instrumentation]
   end
 
   depends_on do
@@ -57,24 +57,24 @@ DependencyDetection.defer do
     if defined? ::MemCache
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::MemCache,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing MemCache instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing MemCache instrumentation'
     end
     if defined? ::Memcached
       commands << 'cas'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Memcached,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Memcached instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Memcached instrumentation'
     end
     if defined? ::Dalli::Client
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Dalli::Client,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Dalli Memcache instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Dalli Memcache instrumentation'
     end
     if defined? ::Spymemcached
       commands << 'multiget'
       NewRelic::Agent::Instrumentation::Memcache.instrument_methods(::Spymemcached,
                                                                     commands)
-      NewRelic::Agent.logger.debug 'Installing Spymemcached instrumentation'
+      ::NewRelic::Agent.logger.info 'Installing Spymemcached instrumentation'
     end
   end
 end

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

@@ -8,7 +8,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Merb Controller instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Merb Controller instrumentation'
   end
   
   executes do

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

@@ -10,7 +10,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Merb Errors instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Merb Errors instrumentation'
   end
   
   executes do

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

@@ -27,21 +27,11 @@ module NewRelic
         attr_accessor :request
 
 
-        @@check_server_connection = false
-        def self.check_server_connection=(value)
-          @@check_server_connection = value
-        end
         # Return the currently active metric frame, or nil.  Call with +true+
         # to create a new metric frame if one is not already on the thread.
         def self.current(create_if_empty=nil)
           f = Thread.current[:newrelic_metric_frame]
           return f if f || !create_if_empty
-
-          # Reconnect to the server if necessary.  This is only done
-          # for old versions of passenger that don't implement an explicit after_fork
-          # event.
-          agent.after_fork(:keep_retrying => false) if @@check_server_connection
-
           Thread.current[:newrelic_metric_frame] = new
         end
 
@@ -64,8 +54,8 @@ module NewRelic
         if defined? JRuby
           begin
             require 'java'
-            include_class 'java.lang.management.ManagementFactory'
-            include_class 'com.sun.management.OperatingSystemMXBean'
+            java_import 'java.lang.management.ManagementFactory'
+            java_import 'com.sun.management.OperatingSystemMXBean'
             @@java_classes_loaded = true
           rescue => e
           end
@@ -263,7 +253,7 @@ module NewRelic
         end
         
         def queue_time
-          apdex_start - start
+          start - apdex_start
         end
 
         def add_custom_parameters(p)
@@ -320,7 +310,7 @@ module NewRelic
         # the apdex should be recorded as a failure regardless of duration.
         def self.update_apdex(stat, duration, failed)
           duration = duration.to_f
-          apdex_t = NewRelic::Control.instance.apdex_t
+          apdex_t = Agent.config[:apdex_t]
           case
           when failed
             stat.record_apdex_f

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

@@ -14,7 +14,7 @@ module NewRelic
           end
 
           def log_underflow
-            NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
+            ::NewRelic::Agent.logger.error "Underflow in metric frames: #{caller.join("\n   ")}"
           end
 
           def notice_scope_empty

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

@@ -6,7 +6,7 @@ DependencyDetection.defer do
   end
   
   executes do
-    NewRelic::Agent.logger.debug 'Installing Net instrumentation'
+    ::NewRelic::Agent.logger.info 'Installing Net instrumentation'
   end
   
   executes do

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

@@ -1,19 +1,19 @@
 DependencyDetection.defer do
   @name = :passenger
-  
+
   depends_on do
-    defined?(PhusionPassenger)
+    defined?(::PhusionPassenger)
   end
 
   executes do
-    NewRelic::Agent.logger.debug "Installing Passenger event hooks."
+    ::NewRelic::Agent.logger.debug "Installing Passenger event hooks."
 
-    PhusionPassenger.on_event(:stopping_worker_process) do
-      NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
+    ::PhusionPassenger.on_event(:stopping_worker_process) do
+      ::NewRelic::Agent.logger.debug "Passenger stopping this process, shutdown the agent."
       NewRelic::Agent.instance.shutdown
     end
 
-    PhusionPassenger.on_event(:starting_worker_process) do |forked|
+    ::PhusionPassenger.on_event(:starting_worker_process) do |forked|
       # We want to reset the stats from the stats engine in case any carried
       # over into the spawned process.  Don't clear them in case any were
       # cached.  We do this even in conservative spawning.
@@ -21,17 +21,3 @@ DependencyDetection.defer do
     end
   end
 end
-
-DependencyDetection.defer do
-  depends_on do
-    defined?(::Passenger) && defined?(::Passenger::AbstractServer) || defined?(::IN_PHUSION_PASSENGER)
-  end
-
-  executes do
-    ## 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
-end