newrelic_rpm 3.5.8.72 → 3.6.0.74.beta

data/lib/new_relic/agent/database.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'singleton'
 
 module NewRelic

data/lib/new_relic/agent/error_collector.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     # This class collects errors from the parent application, storing
@@ -16,12 +20,15 @@ module NewRelic
       # memory and data retention
       MAX_ERROR_QUEUE_LENGTH = 20 unless defined? MAX_ERROR_QUEUE_LENGTH
 
+      # This ivar is used to tag exceptions that we've alreday seen, so that we
+      # don't double-count them.
+      EXCEPTION_TAG_IVAR = :@__new_relic_exception_tag
+
       attr_accessor :errors
 
       # Returns a new error collector
       def initialize
         @errors = []
-        @seen_error_ids = []
 
         # lookup of exception class names to ignore.  Hash for fast access
         @ignore = {}
@@ -93,17 +100,26 @@ module NewRelic
           error && filtered_error?(error)
         end
 
+        def seen?(exception)
+          exception.instance_variable_get(EXCEPTION_TAG_IVAR)
+        end
+
+        def tag_as_seen(exception)
+          exception.instance_variable_set(EXCEPTION_TAG_IVAR, true)
+        end
+
         # Increments a statistic that tracks total error rate
         # Be sure not to double-count same exception. This clears per harvest.
         def increment_error_count!(exception)
-          return if @seen_error_ids.include?(exception.object_id)
-          @seen_error_ids << exception.object_id
-
-          NewRelic::Agent.get_stats("Errors/all").increment_count
+          return if seen?(exception)
+          tag_as_seen(exception)
 
           txn_info = NewRelic::Agent::TransactionInfo.get
-          if (txn_info.transaction_name_set?)
-            NewRelic::Agent.get_stats("Errors/#{txn_info.transaction_name}").increment_count
+          metric_names = ["Errors/all"]
+          metric_names << "Errors/#{txn_info.transaction_name}" if txn_info.transaction_name_set?
+          stats_engine = NewRelic::Agent.agent.stats_engine
+          stats_engine.record_metrics(metric_names) do |stats|
+            stats.increment_count
           end
         end
 
@@ -251,9 +267,6 @@ module NewRelic
           errors = @errors
           @errors = []
 
-          # Only expect to re-see errors on same request, so clear on harvest
-          @seen_error_ids = []
-
           if unsent_errors && !unsent_errors.empty?
             errors = unsent_errors + errors
           end

data/lib/new_relic/agent/event_listener.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic::Agent
   # Basic mechanism for the agent instance to provide agent-wide eventing.
   # It is intended to keep different pieces of the app decoupled from each other.

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :active_merchant
   

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Instrumentation

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Instrumentation
     module ActsAsSolrInstrumentation

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :authlogic
   

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Instrumentation

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/instrumentation/metric_frame'
 require 'new_relic/agent/instrumentation/queue_time'
 module NewRelic
@@ -455,7 +459,7 @@ module NewRelic
               # Always subtrace 1 for the active mongrel
               queue_depth = [mongrel.workers.list.length.to_i - 1, 0].max rescue nil
             end
-            NewRelic::Agent.agent.stats_engine.get_stats_no_scope('Mongrel/Queue Length').trace_call(queue_depth) if queue_depth
+            NewRelic::Agent.record_metric('Mongrel/Queue Length', queue_depth) if queue_depth
           end
         end
 
@@ -472,13 +476,6 @@ module NewRelic
           ::NewRelic::Agent.logger.error("Error detecting upstream wait time:", e)
           now
         end
-
-        # returns the NewRelic::Agent::Stats object associated
-        # with the dispatcher time measurement
-        def _dispatch_stat
-          NewRelic::Agent.agent.stats_engine.get_stats_no_scope 'HttpDispatcher'
-        end
-
       end
     end
   end

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 ## NewRelic instrumentation for DataMapper
 #
 # Instrumenting DM has different key challenges versus AR:
@@ -205,7 +209,7 @@ module NewRelic
           # 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)
+            NewRelic::Agent.record_metric(metric, duration)
           end
         ensure
           super

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
 DependencyDetection.defer do

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 # NOTE there are multiple implementations of the MemCache client in Ruby,
 # each with slightly different API's and semantics.
 # See:

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'set'
 
 DependencyDetection.defer do

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :merb_error
 

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/instrumentation'
 module NewRelic
   module Agent
@@ -43,7 +47,7 @@ module NewRelic
           # process doesn't work on JRuby. See the cpu_sampler.rb file
           # to understand where cpu is recorded for non-jruby processes
           def record_jruby_cpu_burn(burn)
-            NewRelic::Agent.get_stats_no_scope(NewRelic::Metrics::USER_TIME).record_data_point(burn)
+            NewRelic::Agent.record_metric(NewRelic::Metrics::USER_TIME, burn)
           end
 
           def cpu_burn

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/instrumentation/metric_frame/pop'
 
 # A struct holding the information required to measure a controller
@@ -300,30 +304,19 @@ module NewRelic
         end
 
         def self.record_apdex(current_metric, action_duration, total_duration, is_error)
-          summary_stat = agent.stats_engine.lookup_stats("Apdex") ||
-            initialize_apdex("Apdex")
-          update_apdex(summary_stat, total_duration, is_error)
-
-          controller_stat = agent.stats_engine.lookup_stats(current_metric.apdex_metric_path) ||
-            initialize_apdex(current_metric.apdex_metric_path)
-          update_apdex(controller_stat, action_duration, is_error)
-        end
-
-        # Apdex min and max values should be initialized to the
-        # current apdex_t
-        def self.initialize_apdex(metric_name)
-          stats = agent.stats_engine.get_stats_no_scope(metric_name)
-          apdex_t = TransactionInfo.get.apdex_t
-          stats.min_call_time = apdex_t
-          stats.max_call_time = apdex_t
-          return stats
+          agent.stats_engine.record_metrics('Apdex') do |stat|
+            update_apdex(stat, total_duration, is_error)
+          end
+          agent.stats_engine.record_metrics(current_metric.apdex_metric_path) do |stat|
+            update_apdex(stat, action_duration, is_error)
+          end
         end
 
         # Record an apdex value for the given stat.  when `failed`
         # the apdex should be recorded as a failure regardless of duration.
         def self.update_apdex(stat, duration, failed)
-          duration = duration.to_f
           apdex_t = TransactionInfo.get.apdex_t
+          duration = duration.to_f
           case
           when failed
             stat.record_apdex_f
@@ -334,6 +327,10 @@ module NewRelic
           else
             stat.record_apdex_f
           end
+          # Apdex min and max values should be initialized to the
+          # current apdex_t
+          stat.min_call_time = apdex_t
+          stat.max_call_time = apdex_t
         end
 
         private

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

@@ -1,4 +1,7 @@
 # encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :net
@@ -6,7 +9,7 @@ DependencyDetection.defer do
   depends_on do
     defined?(Net) && defined?(Net::HTTP)
   end
-  
+
   executes do
     ::NewRelic::Agent.logger.info 'Installing Net instrumentation'
     require 'new_relic/agent/cross_app_tracing'
@@ -25,7 +28,6 @@ DependencyDetection.defer do
 
       alias request_without_newrelic_trace request
       alias request request_with_newrelic_trace
-
     end
   end
 end

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :passenger
 

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Instrumentation
@@ -36,8 +40,8 @@ module NewRelic
         end
 
         def record_frontend_metrics(start_time, now=Time.now)
-          NewRelic::Agent.instance.stats_engine.get_stats(ALL_QUEUE_METRIC) \
-            .record_data_point((now - start_time).to_f)
+          NewRelic::Agent.instance.stats_engine.record_metrics(
+            ALL_QUEUE_METRIC, (now - start_time).to_f, :scoped => true)
         end
 
         def timestamp_string_from_header_value(value)

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
 module NewRelic

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :rails21_view
   

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :rails_action_web_service
   

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :rails2_error
   

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Instrumentation

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 module NewRelic
   module Agent
     module Instrumentation

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

@@ -0,0 +1,26 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+DependencyDetection.defer do
+  @name = :rainbows
+
+  depends_on do
+    defined?(::Rainbows) && defined?(::Rainbows::HttpServer)
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Rainbows instrumentation'
+    ::NewRelic::Agent.logger.info 'Detected Rainbows, please see additional documentation: https://newrelic.com/docs/troubleshooting/im-using-unicorn-and-i-dont-see-any-data'
+  end
+
+  executes do
+    Rainbows::HttpServer.class_eval do
+      old_worker_loop = instance_method(:worker_loop)
+      define_method(:worker_loop) do |worker|
+        NewRelic::Agent.after_fork(:force_reconnect => true)
+        old_worker_loop.bind(self).call(worker)
+      end
+    end
+  end
+end

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

@@ -1,3 +1,7 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
 DependencyDetection.defer do
   @name = :resque
 

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

@@ -0,0 +1,36 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+DependencyDetection.defer do
+  @name = :sidekiq
+
+  depends_on do
+    defined?(::Sidekiq) && !NewRelic::Agent.config[:disable_sidekiq]
+  end
+
+  executes do
+    ::NewRelic::Agent.logger.info 'Installing Sidekiq instrumentation'
+  end
+
+  executes do
+    class NewRelic::SidekiqInstrumentation
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+
+      def call(worker, msg, queue)
+        perform_action_with_newrelic_trace(
+          :name => 'perform',
+          :class_name => msg['class'],
+          :category => 'OtherTransaction/SidekiqJob') do
+          yield
+        end
+      end
+    end
+
+    Sidekiq.configure_server do |config|
+      config.server_middleware do |chain|
+        chain.add NewRelic::SidekiqInstrumentation
+      end
+    end
+  end
+end