newrelic_rpm 2.9.9 → 2.10.3

data/lib/new_relic/metric_data.rb

@@ -5,7 +5,7 @@ module NewRelic
     attr_accessor :stats
     
     def initialize(metric_spec, stats, metric_id)
-      self.metric_spec = metric_spec
+      @metric_spec = metric_spec
       self.stats = stats
       self.metric_id = metric_id
     end
@@ -13,16 +13,25 @@ module NewRelic
     def eql?(o)
      (metric_spec.eql? o.metric_spec) && (stats.eql? o.stats)
     end
+
+    def original_spec
+      @original_spec || @metric_spec
+    end
+    def metric_spec
+      @metric_spec
+    end
+    def metric_spec= new_spec
+      @original_spec = @metric_spec if @metric_spec
+      @metric_spec = new_spec
+    end
     
     def hash
-      metric_spec.hash + stats.hash
+      metric_spec.hash ^ stats.hash
     end
     
+    # Serialize with all attributes, but if the metric id is not nil, then don't send the metric spec
     def to_json(*a)
-      {'metric_spec' => metric_spec,
-      'stats' => stats,
-      'metric_id' => metric_id
-      }.to_json(*a)
+       %Q[{"metric_spec":#{metric_id ? 'null' : metric_spec.to_json},"stats":{"total_exclusive_time":#{stats.total_exclusive_time},"min_call_time":#{stats.min_call_time},"call_count":#{stats.call_count},"sum_of_squares":#{stats.sum_of_squares},"total_call_time":#{stats.total_call_time},"max_call_time":#{stats.max_call_time}},"metric_id":#{metric_id ? metric_id : 'null'}}]
     end
     
     def to_s

data/lib/new_relic/metric_parser.rb

@@ -66,6 +66,15 @@ module NewRelic
       short_name
     end
     
+    def apdex_metric_path
+      "Apdex/#{segments[1..-1].join('/')}"
+    end
+    
+    # A short name for legends in the graphs
+    def legend_name
+      short_name
+    end
+    
     # Return the name of another metric if the current
     # metric is really add-on data for another metric.
     def base_metric_name
@@ -102,7 +111,11 @@ module NewRelic
     def url
     ''
     end
-
+    
+    # returns a hash of params for url_for(), giving you a drilldown URL to an RPM page for this metric
+    # define in subclasses - TB 2009-12-18
+    # def drilldown_url(metric_id); end
+    
     def initialize(name)
       @name = name
     end

data/lib/new_relic/metric_parser/active_record.rb

@@ -5,6 +5,20 @@ class NewRelic::MetricParser::ActiveRecord < NewRelic::MetricParser
     return segments[1]
   end
   
+  def legend_name
+    if name == 'ActiveRecord/all'
+      'Database'
+    else
+      super
+    end
+  end
+  def tooltip_name
+    if name == 'ActiveRecord/all'
+      'all SQL execution'
+    else
+      super
+    end
+  end
   def developer_name
     "#{model_class}##{segments.last}"
   end

data/lib/new_relic/metric_parser/controller.rb

@@ -1,11 +1,14 @@
 class NewRelic::MetricParser::Controller < NewRelic::MetricParser
-  
+
   def is_controller?
     true
   end
   
+  # If the controller name segments look like a file path, convert it to the controller
+  # class name.  If it begins with a capital letter, assume it's already a class name
   def controller_name
-    segments[1..-2].join('/').camelize+"Controller"
+    path = segments[1..-2].join('/')
+    path < 'a' ? path : path.camelize+"Controller" 
   end
 
   def action_name

data/lib/new_relic/metric_parser/external.rb

@@ -0,0 +1,50 @@
+class NewRelic::MetricParser::External < NewRelic::MetricParser
+  
+  def all?
+    host == 'all' || host == 'allWeb' || host == 'allOther'
+  end
+  def hosts_all?
+    library == 'all'
+  end
+  def host
+    segments[1]
+  end
+  def library
+    segments[2]
+  end
+  def operation
+    segments[3] && segments[3..-1].join("/")
+  end
+  def legend_name
+    case
+    when all?
+      "External Services"
+    when hosts_all?
+      "All #{host} calls"
+    else
+      developer_name
+    end
+  end
+  def tooltip_name
+    case
+    when all?
+      "calls to external systems"
+    when hosts_all?
+      "calls to #{host}"
+    else
+      "calls to #{developer_name}"
+    end
+  end
+  def developer_name
+    case 
+    when all?
+      'All External'
+    when hosts_all?
+      host
+    when operation
+      "#{library}[#{host}]: #{operation}"
+    else
+      "#{library}[#{host}]"
+    end
+  end
+end

data/lib/new_relic/metric_parser/other_transaction.rb

@@ -0,0 +1,15 @@
+# OtherTransaction metrics must have at least three segments: /OtherTransaction/<task>/*
+
+class NewRelic::MetricParser::OtherTransaction < NewRelic::MetricParser
+  def task
+    segments[1]
+  end
+  
+  def developer_name
+    segments[2..-1].join(NewRelic::MetricParser::SEPARATOR)
+  end
+  
+  def drilldown_url(metric_id)
+    {:controller => '/v2/background_tasks', :action => 'index', :task => task, :anchor => "id=#{metric_id}"}
+  end
+end

data/lib/new_relic/metric_parser/web_frontend.rb

@@ -0,0 +1,14 @@
+# The metric where the mongrel queue time is stored
+
+class NewRelic::MetricParser::WebFrontend < NewRelic::MetricParser
+  def short_name
+    if segments.last == 'Average Queue Time'
+      'Mongrel Average Queue Time'
+    else
+      super
+    end
+  end
+  def legend_name
+    'Mongrel Wait'
+  end
+end

data/lib/new_relic/metric_spec.rb

@@ -4,21 +4,51 @@ class NewRelic::MetricSpec
   attr_accessor   :name
   attr_accessor   :scope
   
-  def initialize (metric_name, metric_scope = '')
-    self.name = metric_name
-    self.scope = metric_scope
+  MAX_LENGTH = 100
+  # Need a "zero-arg" constructor so it can be instantiated from java (using
+  # jruby) for sending responses to ruby agents from the java collector.
+  #
+  def initialize(metric_name = '', metric_scope = '')
+    self.name = (metric_name || '') && metric_name[0...MAX_LENGTH]
+    self.scope = metric_scope && metric_scope[0...MAX_LENGTH]
   end
   
-  def eql? (o)
-    scope_equal = scope.nil? ? o.scope.nil? : scope.eql?(o.scope) 
-    name.eql?(o.name) && scope_equal
+  def truncate!
+    self.name = name[0...100] if name && name.size > 100
+    self.scope = scope[0...100] if scope && scope.size > 100
+  end
+  
+  def ==(o)
+    self.eql?(o)
+  end
+  
+  def eql? o
+    self.class == o.class &&
+    name.eql?(o.name) && 
+    # coerce scope to a string and compare
+     (scope || '') == (o.scope || '')
   end
   
   def hash
     h = name.hash
-    h += scope.hash unless scope.nil?
+    h ^= scope.hash unless scope.nil?
     h
   end
+  # return a new metric spec if the given regex
+  # matches the name or scope.
+  def sub(pattern, replacement, apply_to_scope = true)
+    return nil if name !~ pattern && 
+     (!apply_to_scope || scope.nil? || scope !~ pattern)
+    new_name = name.sub(pattern, replacement)[0...MAX_LENGTH]
+    
+    if apply_to_scope
+      new_scope = (scope && scope.sub(pattern, replacement)[0...MAX_LENGTH])
+    else
+      new_scope = scope
+    end
+    
+    self.class.new new_name, new_scope
+  end
   
   def to_s
     "#{name}:#{scope}"
@@ -30,19 +60,8 @@ class NewRelic::MetricSpec
   end
   
   def <=>(o)
-    namecmp = name <=> o.name
+    namecmp = self.name <=> o.name
     return namecmp if namecmp != 0
-    
-    # i'm sure there's a more elegant way to code this correctly, but at least this passes
-    # my unit test
-    if scope.nil? && o.scope.nil?
-      return 0
-    elsif scope.nil?
-      return -1
-    elsif o.scope.nil?
-      return 1
-    else
-      return scope <=> o.scope
-    end
+    return (self.scope || '') <=> (o.scope || '')
   end
 end

data/lib/new_relic/metrics.rb

@@ -1,7 +1,9 @@
-module NewRelic::Metrics
-  CONTROLLER = "Controller"
-  DISPATCHER = "Rails/HTTP Dispatch"
-  ACTIVE_RECORD = "ActiveRecord"
-  USER_TIME = "CPU/User Time"
-  MEMORY = "Memory/Physical"
-end
+module NewRelic
+  module Metrics
+    CONTROLLER = "Controller"
+    DISPATCHER = "HttpDispatcher"
+    ACTIVE_RECORD = "ActiveRecord"
+    USER_TIME = "CPU/User Time"
+    MEMORY = "Memory/Physical"
+  end
+end

data/lib/new_relic/noticed_error.rb

@@ -1,25 +1,23 @@
-# this class encapsulates an error that was noticed by RPM in a managed app.
-# Unfortunately it was put in the agent in the global namespace early on and
-# for backward compatibility it needs to remain here.
+# This class encapsulates an error that was noticed by RPM in a managed app.
 class NewRelic::NoticedError
   attr_accessor :path, :timestamp, :params, :exception_class, :message
   
-  def initialize(path, data, exception)
+  def initialize(path, data, exception, timestamp = Time.now)
     self.path = path
     self.params = data
     
-    self.exception_class = exception.class.name
+    self.exception_class = exception ? exception.class.name : '<no exception>'
     
     if exception.respond_to?('original_exception')
       self.message = exception.original_exception.message.to_s
     else
-      self.message = exception.message.to_s
+      self.message = (exception || '<no message>').to_s
     end
     
     # clamp long messages to 4k so that we don't send a lot of
     # overhead across the wire
-    self.message = self.message[0..4096] if self.message.length > 4096
+    self.message = self.message[0..4095] if self.message.length > 4096
 
-    self.timestamp = Time.now
+    self.timestamp = timestamp
   end
 end

data/lib/new_relic/rack/metric_app.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
-module NewRelic::Rack
+module NewRelic
+module Rack
   class MetricApp
     def initialize(options)
       if options[:install]
@@ -12,7 +13,6 @@ module NewRelic::Rack
       options[:app_name] ||= 'EPM Monitor'
       options[:disable_samplers] = true
       NewRelic::Agent.manual_start options
-      @stats_engine = NewRelic::Agent.instance.stats_engine
       unless NewRelic::Control.instance.license_key
         NewRelic::Control.instance.log.error "Please add a valid license key to newrelic.yml."
         exit 1
@@ -24,7 +24,7 @@ module NewRelic::Rack
       metric = "Custom/" + segments.join("/")
       raise "Expected value parameter!" unless request['value']
       data = request['value'].to_f
-      stats = @stats_engine.get_stats(metric, false)
+      stats = NewRelic::Agent.get_stats(metric, false)
       stats.record_data_point data
       response = ::Rack::Response.new "#{metric}=#{data}" 
       response.finish
@@ -54,4 +54,5 @@ module NewRelic::Rack
       response.finish
     end
   end
-end
+end
+end

data/lib/new_relic/rack/{newrelic.ru → mongrel_rpm.ru}

@@ -4,7 +4,7 @@ ENV['NEWRELIC_DISPATCHER'] = 'none'
 
 $LOAD_PATH << File.expand_path(File.join(File.dirname(__FILE__), '..','..'))
 
-require 'new_relic/rack'
+require 'new_relic/rack_app'
 
 # Valid options which may be present in this binding:
 # :license_key   optional license key override
@@ -15,11 +15,11 @@ options ||= {}
 
 use Rack::CommonLogger unless options[:logging] == false
 use Rack::ShowExceptions
-map "http://localhost/metrics" do
-  run NewRelic::Rack::MetricApp.new(options)
-end
 map "/" do
   run NewRelic::Rack::Status.new
 end
+map "/metrics" do
+  run NewRelic::Rack::MetricApp.new(options)
+end
 
 

data/lib/new_relic/rack/newrelic.yml

@@ -4,6 +4,7 @@
 #
 common: &default_settings
   log_level: info
+  enabled: true
   
   # This is the key generated by script/create_admin
   license_key: 'your_license_key_here'

data/lib/new_relic/recipes.rb

@@ -15,7 +15,7 @@ make_notify_task = lambda do
     # on all deployments, notify RPM 
     desc "Record a deployment in New Relic RPM (rpm.newrelic.com)"
     task :notice_deployment, :roles => :app, :except => {:no_release => true } do
-      rails_env = fetch(:rails_env, "production")
+      rails_env = fetch(:newrelic_rails_env, fetch(:rails_env, "production"))
       require File.join(File.dirname(__FILE__), 'commands', 'deployments.rb')
       begin
         # Try getting the changelog from the server.  Then fall back to local changelog

data/lib/new_relic/stats.rb

@@ -47,7 +47,7 @@ module NewRelic
       stats.merge! other_stats
     end
     
-    # split into an array of timesclices whose
+    # split into an array of timeslices whose
     # time boundaries start on (begin_time + (n * duration)) and whose
     # end time ends on (begin_time * (n + 1) * duration), except for the
     # first and last elements, whose begin time and end time are the begin
@@ -102,13 +102,16 @@ module NewRelic
     
     def as_percentage_of(other_stats)
       return 0 if other_stats.total_call_time == 0
-      return to_percentage(total_call_time / other_stats.total_call_time)
+      return (total_call_time / other_stats.total_call_time) * 100.0
     end
     
     # the stat total_call_time is a percent
     def as_percentage
-      return 0 if call_count == 0
-      to_percentage(total_call_time / call_count)
+      if call_count.zero?
+        0
+      else
+        (total_call_time / call_count) * 100.0
+      end
     end
     
     def duration
@@ -116,16 +119,17 @@ module NewRelic
     end
 
     def calls_per_minute
-      return 0 if duration.zero?
-      ((call_count / duration.to_f * 6000).round).to_f / 100
-    end
+      if duration.zero?
+        0
+      else
+        (call_count / duration.to_f) * 60.0
+      end
+    end    
     
-    def calls_per_second
-      round_to_2 calls_per_minute / 60
-    end
     def total_call_time_per_minute
       60.0 * time_percentage
     end
+    
     def standard_deviation
       return 0 if call_count < 2 || self.sum_of_squares.nil?
       
@@ -189,7 +193,8 @@ module NewRelic
       min_end = (end_time < s.end_time ? end_time : s.end_time)
       max_begin = (begin_time > s.begin_time ? begin_time : s.begin_time)
       percentage = (min_end - max_begin) / s.duration
-      
+
+      self.total_exclusive_time = s.total_exclusive_time * percentage
       self.total_call_time = s.total_call_time * percentage
       self.min_call_time = s.min_call_time
       self.max_call_time = s.max_call_time
@@ -212,23 +217,17 @@ module NewRelic
       [@call_count, @total_call_time.to_i, @total_exclusive_time.to_i]
     end
 
-		def apdex_score
-			s, t, f = get_apdex
-			(s.to_f + (t.to_f / 2)) / (s+t+f).to_f
-		end
+    def apdex_score
+      s, t, f = get_apdex
+      (s.to_f + (t.to_f / 2)) / (s+t+f).to_f
+    end
+
     private
+    
     def to_ms(number)
       (number*1000).round
     end
-    # utility method that converts floating point percentage values
-    # to integers as a percentage, to improve readability in ui
-    def to_percentage(value)
-      round_to_2(value * 100)
-    end
-    
-    def round_to_2(val)
-      (val * 100).round / 100.0
-    end
+        
     def round_to_3(val)
       (val * 1000).round / 1000.0
     end
@@ -321,6 +320,18 @@ module NewRelic
     
     alias trace_call record_data_point
     
+    def record_multiple_data_points(total_value, count=1)
+      return record_data_point(total_value) if count == 1
+      @call_count += count
+      @total_call_time += total_value
+      avg_val = total_value / count
+      @min_call_time = avg_val if avg_val < @min_call_time || @call_count == count
+      @max_call_time = avg_val if avg_val > @max_call_time
+      @total_exclusive_time += total_value
+      @sum_of_squares += (avg_val * avg_val) * count
+      self
+    end
+    
     def increment_count(value = 1)
       @call_count += value
     end
@@ -329,14 +340,17 @@ module NewRelic
   
   class ScopedMethodTraceStats < MethodTraceStats
     def initialize(unscoped_stats)
-        super()
+      super()
       @unscoped_stats = unscoped_stats
     end
-    
     def trace_call(call_time, exclusive_time = call_time)
       @unscoped_stats.trace_call call_time, exclusive_time
       super call_time, exclusive_time
     end
+    def record_multiple_data_points(total_value, count=1)
+      @unscoped_stats.record_multiple_data_points(total_value, count)
+      super total_value, count
+    end
     def unscoped_stats
       @unscoped_stats
     end