newrelic_rpm 3.5.7.59 → 3.5.8.64.beta

data/lib/new_relic/agent/stats_engine/stats_hash.rb

@@ -0,0 +1,58 @@
+# A Hash-descended class for storing metric data in the NewRelic Agent.
+#
+# Keys are NewRelic::MetricSpec objects.
+# Values are NewRelic::Agent::Stats objects.
+#
+# Missing keys will be automatically created as empty NewRelic::Agent::Stats
+# instances, so use has_key? explicitly to check for key existence.
+#
+# This class makes no provisions for safe usage from multiple threads, such
+# measures should be externally provided.
+module NewRelic
+  module Agent
+    class StatsHash < ::Hash
+      def initialize
+        super { |hash, key| hash[key] = NewRelic::Agent::Stats.new }
+      end
+
+      def marshal_dump
+        Hash[self]
+      end
+
+      def marshal_load(hash)
+        self.merge!(hash)
+      end
+
+      def ==(other)
+        Hash[self] == Hash[other]
+      end
+
+      def record(metric_specs, value=nil)
+        Array(metric_specs).each do |metric_spec|
+          stats = self[metric_spec]
+          if block_given?
+            yield stats
+          else
+            case value
+            when Numeric
+              stats.record_data_point(value)
+            when NewRelic::Agent::Stats
+              stats.merge!(value)
+            end
+          end
+        end
+      end
+
+      def merge!(other)
+        other.each do |key,val|
+          if self.has_key?(key)
+            self[key].merge!(val)
+          else
+            self[key] = val
+          end
+        end
+        self
+      end
+    end
+  end
+end

data/lib/new_relic/agent/stats_engine/transactions.rb

@@ -5,8 +5,8 @@ module Agent
     # A simple stack element that tracks the current name and length
     # of the executing stack
     class ScopeStackElement
-      attr_reader :name, :deduct_call_time_from_parent
-      attr_accessor :children_time
+      attr_reader :deduct_call_time_from_parent
+      attr_accessor :name, :children_time
       def initialize(name, deduct_call_time)
         @name = name
         @deduct_call_time_from_parent = deduct_call_time
@@ -30,6 +30,8 @@ module Agent
         def pop_scope(*args); end
       end
 
+      attr_reader :transaction_sampler
+
       # add a new transaction sampler, unless we're currently in a
       # transaction (then we fail)
       def transaction_sampler= sampler
@@ -74,6 +76,12 @@ module Agent
         @transaction_sampler && Agent.config[:'transaction_tracer.enabled']
       end
       
+      # Rename the segment associated with the last pushed scope to +new_name+.
+      def rename_scope_segment( new_name )
+        self.peek_scope.name = new_name
+        @transaction_sampler.rename_scope_segment( new_name )
+      end
+      
       # Returns the latest ScopeStackElement
       def peek_scope
         scope_stack.last

data/lib/new_relic/agent/transaction_info.rb

@@ -3,17 +3,27 @@ require 'erb'
 module NewRelic
   module Agent
     class TransactionInfo
+      DEFAULT_TRANSACTION_NAME = '(unknown)'
 
-      attr_accessor :token, :capture_deep_tt, :transaction_name
+      attr_accessor :token, :capture_deep_tt
+      attr_writer :transaction_name
       attr_reader :start_time
 
       def initialize
         @guid = ""
-        @transaction_name = "(unknown)"
+        @transaction_name = nil
         @start_time = Time.now
         @ignore_end_user = false
       end
 
+      def transaction_name_set?
+        !@transaction_name.nil?
+      end
+
+      def transaction_name
+        @transaction_name || DEFAULT_TRANSACTION_NAME
+      end
+
       def force_persist_sample?(sample)
         token && sample.duration > Agent.config[:apdex_t]
       end
@@ -37,11 +47,26 @@ module NewRelic
       def ignore_end_user?
         @ignore_end_user
       end
-      
+
       def ignore_end_user=(value)
         @ignore_end_user = value
       end
 
+      def apdex_t
+        (Agent.config[:web_transactions_apdex] &&
+         Agent.config[:web_transactions_apdex][@transaction_name]) ||
+          Agent.config[:apdex_t]
+      end
+
+      def transaction_trace_threshold
+        key = :'transaction_tracer.transaction_threshold'
+        if Agent.config.source(key).class == Configuration::DefaultSource
+          apdex_t * 4
+        else
+          Agent.config[key]
+        end
+      end
+
       def self.get()
         Thread.current[:newrelic_transaction_info] ||= TransactionInfo.new
       end
@@ -64,9 +89,9 @@ module NewRelic
 
       def self.get_token(request)
         return nil unless request
-        
+
         agent_flag = request.cookies['NRAGENT']
-        if agent_flag and agent_flag.instance_of? String 
+        if agent_flag and agent_flag.instance_of? String
           s = agent_flag.split("=")
           if s.length == 2
             if s[0] == "tk" && s[1]
@@ -78,7 +103,7 @@ module NewRelic
         end
       end
 
-      # Run through a collection of unsafe characters ( in the context of the token ) 
+      # Run through a collection of unsafe characters ( in the context of the token )
       # and set the token to an empty string if any of them are found in the token so that
       # potential XSS attacks via the token are avoided
       def self.sanitize_token(token)

data/lib/new_relic/agent/transaction_sample_builder.rb

@@ -21,22 +21,25 @@ module NewRelic
       def sample_id
         @sample.sample_id
       end
-      
+
       def ignored?
         @ignore || @sample.params[:path].nil?
       end
-      
+
       def ignore_transaction
         @ignore = true
       end
       
+      def segment_limit
+        Agent.config[:'transaction_tracer.limit_segments']
+      end
+
       def trace_entry(metric_name, time)
-        segment_limit = Agent.config[:'transaction_tracer.limit_segments']
-        if @sample.count_segments < segment_limit
+        if @sample.count_segments < segment_limit()
           segment = @sample.create_segment(time.to_f - @sample_start, metric_name)
           @current_segment.add_called_segment(segment)
           @current_segment = segment
-          if @sample.count_segments == segment_limit
+          if @sample.count_segments == segment_limit()
             ::NewRelic::Agent.logger.debug("Segment limit of #{segment_limit} reached, ceasing collection.")
           end
           @current_segment
@@ -44,7 +47,7 @@ module NewRelic
       end
 
       def trace_exit(metric_name, time)
-        return unless @sample.count_segments < Agent.config[:'transaction_tracer.limit_segments']
+        return unless @sample.count_segments < segment_limit()
         if metric_name != @current_segment.metric_name
           fail "unbalanced entry/exit: #{metric_name} != #{@current_segment.metric_name}"
         end
@@ -52,7 +55,7 @@ module NewRelic
         @current_segment = @current_segment.parent_segment
       end
 
-      def finish_trace(time)
+      def finish_trace(time=Time.now.to_f)
         # This should never get called twice, but in a rare case that we can't reproduce in house it does.
         # log forensics and return gracefully
         if @sample.frozen?
@@ -63,7 +66,9 @@ module NewRelic
         @sample.params[:custom_params] ||= {}
         @sample.params[:custom_params].merge!(normalize_params(NewRelic::Agent::Instrumentation::MetricFrame.custom_parameters))
 
-        @sample.force_persist = NewRelic::Agent::TransactionInfo.get.force_persist_sample?(sample)
+        txn_info = NewRelic::Agent::TransactionInfo.get
+        @sample.force_persist = txn_info.force_persist_sample?(sample)
+        @sample.threshold = txn_info.transaction_trace_threshold
         @sample.freeze
         @current_segment = nil
       end
@@ -106,6 +111,12 @@ module NewRelic
         @sample.params[:custom_params][:cpu_time] = cpu_time
       end
 
+      # Set the metric name of the current segment to +new_name+ if 
+      def rename_current_segment( new_name )
+        return unless @sample.count_segments < segment_limit()
+        @current_segment.metric_name = new_name
+      end
+
       def sample
         @sample
       end

data/lib/new_relic/agent/transaction_sampler.rb

@@ -116,6 +116,12 @@ module NewRelic
         end
       end
 
+      # Rename the latest scope's segment in the builder to +new_name+.
+      def rename_scope_segment( new_name )
+        return unless builder
+        builder.rename_current_segment( new_name )
+      end
+
       # Defaults to zero, otherwise delegated to the transaction
       # sample builder
       def scope_depth
@@ -204,7 +210,8 @@ module NewRelic
       # Sets @slowest_sample to the passed in sample if it is slower
       # than the current sample in @slowest_sample
       def store_slowest_sample(sample)
-        if slowest_sample?(@slowest_sample, sample)
+        if slowest_sample?(@slowest_sample, sample) && sample.threshold &&
+            sample.duration >= sample.threshold
           @slowest_sample = sample
         end
       end
@@ -256,7 +263,7 @@ module NewRelic
         return unless builder
         segment = builder.current_segment
         if segment
-          new_message = truncate_message(append_new_message(segment[key],
+          new_message = self.class.truncate_message(append_new_message(segment[key],
                                                             message))
           if key == :sql && config.respond_to?(:has_key?) && config.has_key?(:adapter)
             segment[key] = Database::Statement.new(new_message)
@@ -274,7 +281,7 @@ module NewRelic
       # Truncates the message to `MAX_DATA_LENGTH` if needed, and
       # appends an ellipsis because it makes the trucation clearer in
       # the UI
-      def truncate_message(message)
+      def self.truncate_message(message)
         if message.length > (MAX_DATA_LENGTH - 4)
           message[0..MAX_DATA_LENGTH - 4] + '...'
         else
@@ -319,6 +326,12 @@ module NewRelic
         notice_extra_data(key, duration, :key)
       end
 
+      # Set parameters on the current segment.
+      def add_segment_parameters( params )
+        return unless builder
+        builder.current_segment.params.merge!( params )
+      end
+
       # Every 1/n harvests, adds the most recent sample to the harvest
       # array if it exists. Makes sure that the random sample is not
       # also the slowest sample for this harvest by `uniq!`ing the
@@ -352,13 +365,7 @@ module NewRelic
 
         force_persist.each {|sample| store_force_persist(sample)}
 
-
-        # Now get the slowest sample
-        if @slowest_sample &&
-            @slowest_sample.duration >=
-            Agent.config[:'transaction_tracer.transaction_threshold']
-          result << @slowest_sample
-        end
+        result << @slowest_sample if @slowest_sample
 
         result.compact!
         result = result.sort_by { |x| x.duration }

data/lib/new_relic/helper.rb

@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 module NewRelic
   # A singleton for shared generic helper methods
   module Helper
@@ -31,4 +33,34 @@ module NewRelic
       (time.to_f * 1000).round
     end
   end
+
+  # Load the JSON library from the standard library.
+  def self::load_stdlib_json
+    # Don't even try to use 1.9.1's json.
+    return false if RUBY_VERSION == '1.9.1'
+
+    require 'json'
+    define_method( :json_dump, &::JSON.method(:dump) )
+    define_method( :json_load, &::JSON.method(:parse) )
+
+    return true
+  rescue LoadError
+    NewRelic::Agent.logger.debug "%p while loading JSON library: %s" % [ err, err.message ] if
+      defined?( NewRelic::Agent ) && NewRelic::Agent.respond_to?( :logger )
+    return false
+  end
+
+
+  # Load the fallback JSON library
+  def self::load_okjson
+    require 'new_relic/okjson'
+    define_method( :json_dump, &::NewRelic::OkJson.method(:encode) )
+    define_method( :json_load, &::NewRelic::OkJson.method(:decode) )
+  end
+
+
+  load_stdlib_json or load_okjson
+  module_function :json_dump, :json_load
+
 end
+

data/lib/new_relic/local_environment.rb

@@ -49,7 +49,7 @@ module NewRelic
     rescue => e
       Agent.logger.error e
     end
-    
+
     # yields to the block and appends the returned value to the list
     # of gems - this catches errors that might be raised in the block
     def append_gem_list
@@ -57,7 +57,7 @@ module NewRelic
     rescue => e
       Agent.logger.error e
     end
-    
+
     # yields to the block and appends the returned value to the list
     # of plugins - this catches errors that might be raised in the block
     def append_plugin_list
@@ -65,7 +65,7 @@ module NewRelic
     rescue => e
       Agent.logger.error e
     end
-    
+
     # An instance id pulled from either @dispatcher_instance_id or by
     # splitting out the first part of the running file
     def dispatcher_instance_id
@@ -76,7 +76,7 @@ module NewRelic
       end
       @dispatcher_instance_id
     end
-    
+
     # Interrogates some common ruby constants for useful information
     # about what kind of ruby environment the agent is running in
     def gather_ruby_info
@@ -89,7 +89,7 @@ module NewRelic
         gather_jruby_info
       end
     end
-    
+
     # like gather_ruby_info but for the special case of JRuby
     def gather_jruby_info
       append_environment_value('JRuby version') { JRUBY_VERSION }
@@ -122,14 +122,14 @@ module NewRelic
         processors
       end
     end
-    
+
     # Grabs the architecture string from either `uname -p` or the env
     # variable PROCESSOR_ARCHITECTURE
     def gather_architecture_info
       append_environment_value('Arch') { `uname -p` } ||
         append_environment_value('Arch') { ENV['PROCESSOR_ARCHITECTURE'] }
     end
-    
+
     # gathers OS info from either `uname -v`, `uname -s`, or the OS
     # env variable
     def gather_os_info
@@ -137,13 +137,13 @@ module NewRelic
       append_environment_value('OS') { `uname -s` } ||
         append_environment_value('OS') { ENV['OS'] }
     end
-    
+
     # Gathers the architecture and cpu info
     def gather_system_info
       gather_architecture_info
       gather_cpu_info
     end
-    
+
     # Looks for a capistrano file indicating the current revision
     def gather_revision_info
       rev_file = File.join(NewRelic::Control.instance.root, "REVISION")
@@ -153,11 +153,10 @@ module NewRelic
         end
       end
     end
-    
+
     # The name of the AR database adapter for the current environment and
     # the current schema version
     def gather_ar_adapter_info
-      
       append_environment_value 'Database adapter' do
         if defined?(ActiveRecord) && defined?(ActiveRecord::Base) &&
             ActiveRecord::Base.respond_to?(:configurations)
@@ -168,7 +167,7 @@ module NewRelic
         end
       end
     end
-    
+
     # Datamapper version
     def gather_dm_adapter_info
       append_environment_value 'DataMapper version' do
@@ -176,7 +175,7 @@ module NewRelic
         DataMapper::VERSION
       end
     end
-    
+
     # sensing for which adapter is defined, then appends the relevant
     # config information
     def gather_db_info
@@ -212,13 +211,13 @@ module NewRelic
       i << [ 'Gems', @gems.to_a] if not @gems.empty?
       i
     end
-    
+
     # it's a working jruby if it has the runtime method, and object
     # space is enabled
     def working_jruby?
       !(defined?(::JRuby) && JRuby.respond_to?(:runtime) && !JRuby.runtime.is_object_space_enabled)
     end
-    
+
     # Runs through all the objects in ObjectSpace to find the first one that
     # match the provided class
     def find_class_in_object_space(klass)
@@ -227,7 +226,7 @@ module NewRelic
       end
       return nil
     end
-    
+
     # Sets the @mongrel instance variable if we can find a Mongrel::HttpServer
     def mongrel
       return @mongrel if @mongrel
@@ -236,13 +235,13 @@ module NewRelic
       end
       @mongrel
     end
-    
+
     private
 
     # Although you can override the dispatcher with NEWRELIC_DISPATCHER this
     # is not advisable since it implies certain api's being available.
     def discover_dispatcher
-      dispatchers = %w[passenger torquebox trinidad glassfish thin mongrel litespeed webrick fastcgi unicorn sinatra]
+      dispatchers = %w[passenger torquebox trinidad glassfish resque thin mongrel litespeed webrick fastcgi unicorn]
       while dispatchers.any? && @discovered_dispatcher.nil?
         send 'check_for_'+(dispatchers.shift)
       end
@@ -316,20 +315,13 @@ module NewRelic
       end
     end
 
-    def check_for_sinatra
-      return unless defined?(::Sinatra) && defined?(::Sinatra::Base)
-
-      begin
-        version = ::Sinatra::VERSION
-      rescue
-        $stderr.puts("Error determining Sinatra version")
-      end
-
-      if ::NewRelic::VersionNumber.new('0.9.2') > version
-        $stderr.puts("Your Sinatra version is #{version}, we highly recommend upgrading to >=0.9.2")
-      end
-
-      @discovered_dispatcher = :sinatra
+    def check_for_resque
+      using_resque = (
+        defined?(::Resque) &&
+        (ENV['QUEUE'] || ENV['QUEUES']) &&
+        (File.basename($0) == 'rake' && ARGV.include?('resque:work'))
+      )
+      @discovered_dispatcher = :resque if using_resque
     end
 
     def check_for_thin