newrelic_rpm 2.13.0.beta5 → 2.13.1

data/lib/new_relic/recipes.rb

@@ -1,6 +1,6 @@
 # When installed as a plugin this is loaded automatically.
 #
-# When installed as a gem, you need to add 
+# When installed as a gem, you need to add
 #  require 'new_relic/recipes'
 # to your deploy.rb
 #
@@ -9,10 +9,10 @@
 # If it fails, it will not affect the task execution or do a rollback.
 #
 make_notify_task = lambda do
-  
+
   namespace :newrelic do
-    
-    # on all deployments, notify RPM 
+
+    # 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(:newrelic_rails_env, fetch(:rails_env, "production"))
@@ -22,7 +22,7 @@ make_notify_task = lambda do
         # if it doesn't work.  Problem is that I don't know what directory the .git is
         # in when using git.  I could possibly use the remote cache but i don't know
         # if that's always there.
-=begin        
+=begin
         run "cd #{current_release}; #{log_command}" do | io, stream_id, output |
           changelog = output
         end
@@ -42,13 +42,13 @@ make_notify_task = lambda do
           end
           changelog = `#{log_command}`
         end
-        new_revision = rev || source.query_revision(source.head()) do |cmd| 
+        new_revision = rev || source.query_revision(source.head()) do |cmd|
           logger.debug "executing locally: '#{cmd}'"
-          `#{cmd}` 
+          `#{cmd}`
         end
         deploy_options = { :environment => rails_env,
           :revision => new_revision,
-          :changelog => changelog, 
+          :changelog => changelog,
           :description => description,
           :appname => appname }
         logger.debug "Uploading deployment to New Relic"
@@ -79,4 +79,4 @@ else
   else
     make_notify_task.call
   end
-end
+end

data/lib/new_relic/stats.rb

@@ -1,23 +1,23 @@
 
 module NewRelic
   module Stats
-    
+
     def absent?
       # guess on absent values
       call_count == 0
-    end  
+    end
 
     def time_str(value_ms)
       case
-        when value_ms >= 10000 
+        when value_ms >= 10000
        "%.1f s" % (value_ms / 1000.0)
-        when value_ms >= 5000 
+        when value_ms >= 5000
        "%.2f s" % (value_ms / 1000.0)
       else
        "%.0f ms" % value_ms
       end
     end
-    
+
     def average_call_time
       return 0 if call_count == 0
       total_call_time / call_count
@@ -55,15 +55,15 @@ module NewRelic
         self.begin_time = s.begin_time if s.begin_time.to_f < begin_time.to_f || begin_time.to_f == 0.0
         self.end_time = s.end_time if s.end_time.to_f > end_time.to_f
       end
-      
+
       self
     end
-    
+
     def merge(other_stats)
       stats = self.clone
       stats.merge! other_stats
     end
-    
+
     # 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
@@ -78,7 +78,7 @@ module NewRelic
       current_end_time = rollup_begin_time + rollup_period
 
       return [self] if current_end_time >= self.end_time
-      
+
       timeslices = []
       while current_end_time < self.end_time do
         ts = yield(current_begin_time, current_end_time)
@@ -89,7 +89,7 @@ module NewRelic
         current_begin_time = current_end_time
         current_end_time = current_begin_time + rollup_period
       end
-      
+
       if self.end_time > current_begin_time
         percentage = rollup_period / self.duration + (self.begin_time - rollup_begin_time) / rollup_period
         ts = yield(current_begin_time, self.end_time)
@@ -98,14 +98,14 @@ module NewRelic
           timeslices << ts
         end
       end
-      
+
       timeslices
     end
-    
+
     def is_reset?
       call_count == 0 && total_call_time == 0.0 && total_exclusive_time == 0.0
     end
-    
+
     def reset
       self.call_count = 0
       self.total_call_time = 0.0
@@ -116,12 +116,12 @@ module NewRelic
       self.begin_time = Time.at(0)
       self.end_time = Time.at(0)
     end
-    
+
     def as_percentage_of(other_stats)
       return 0 if other_stats.total_call_time == 0
       return (total_call_time / other_stats.total_call_time) * 100.0
     end
-    
+
     # the stat total_call_time is a percent
     def as_percentage
       if call_count.zero?
@@ -130,7 +130,7 @@ module NewRelic
         (total_call_time / call_count) * 100.0
       end
     end
-    
+
     def duration
       end_time - begin_time
     end
@@ -141,23 +141,23 @@ module NewRelic
       else
         (call_count / duration.to_f) * 60.0
       end
-    end    
-    
+    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?
-      
+
       # Convert sum of squares into standard deviation based on
       # formula for the standard deviation for the entire population
       x = self.sum_of_squares - (self.call_count * (self.average_value**2))
       return 0 if x <= 0
-      
+
       Math.sqrt(x / self.call_count)
     end
-    
+
     # returns the time spent in this component as a percentage of the total
     # time window.
     def time_percentage
@@ -173,7 +173,7 @@ module NewRelic
     alias average_value average_call_time
     alias average_response_time average_call_time
     alias requests_per_minute calls_per_minute
-    
+
     def to_s
       summary
     end
@@ -183,7 +183,7 @@ module NewRelic
       format = "%m/%d/%y %I:%M%p"
       "[#{Time.at(begin_time).utc.strftime(format)} UTC, #{'%2.3fs' % duration}; #{'%2i' % call_count} calls #{'%4i' % to_ms(average_call_time)} ms]"
     end
-    
+
     # round all of the values to n decimal points
     def round!
       self.total_call_time = round_to_3(total_call_time)
@@ -195,7 +195,7 @@ module NewRelic
       self.end_time = end_time
     end
 
-    # calculate this set of stats to be a percentage fraction 
+    # calculate this set of stats to be a percentage fraction
     # of the provided stats, which has an overlapping time window.
     # used as a key part of the split algorithm
     def fraction_of(s)
@@ -210,16 +210,16 @@ module NewRelic
       self.call_count = s.call_count * percentage
       self.sum_of_squares = (s.sum_of_squares || 0) * percentage
     end
-    
-    # multiply the total time and rate by the given percentage 
+
+    # multiply the total time and rate by the given percentage
     def multiply_by(percentage)
       self.total_call_time = total_call_time * percentage
       self.call_count = call_count * percentage
       self.sum_of_squares = sum_of_squares * percentage
-      
+
       self
     end
-    
+
 
     # returns s,t,f
     def get_apdex
@@ -232,17 +232,17 @@ module NewRelic
     end
 
     private
-    
+
     def to_ms(number)
       (number*1000).round
     end
-        
+
     def round_to_3(val)
       (val * 1000).round / 1000.0
     end
   end
-  
-  
+
+
   class StatsBase
     include Stats
 
@@ -252,67 +252,67 @@ module NewRelic
     attr_accessor :total_call_time
     attr_accessor :total_exclusive_time
     attr_accessor :sum_of_squares
-    
-    def initialize 
+
+    def initialize
       reset
     end
-    
+
     def freeze
       @end_time = Time.now
       super
     end
-    
+
     def to_json(*a)
-      {'call_count' => call_count, 
-      'min_call_time' => min_call_time, 
-      'max_call_time' => max_call_time, 
+      {'call_count' => call_count,
+      'min_call_time' => min_call_time,
+      'max_call_time' => max_call_time,
       'total_call_time' => total_call_time,
       'total_exclusive_time' => total_exclusive_time,
       'sum_of_squares' => sum_of_squares}.to_json(*a)
     end
 
-    
+
     # In this class, we explicitly don't track begin and end time here, to save space during
     # cross process serialization via xml.  Still the accessor methods must be provided for merge to work.
     def begin_time=(t)
     end
-    
+
     def end_time=(t)
     end
-    
+
     def begin_time
       0.0
     end
-    
+
     def end_time
       0.0
     end
   end
-  
-  
+
+
   class BasicStats < StatsBase
   end
-  
+
   class ApdexStats < StatsBase
-    
+
     def record_apdex_s
       @call_count += 1
     end
-    
+
     def record_apdex_t
       @total_call_time += 1
     end
-    
+
     def record_apdex_f
       @total_exclusive_time += 1
     end
   end
-  
+
   # Statistics used to track the performance of traced methods
   class MethodTraceStats < StatsBase
-    
+
     alias data_point_count call_count
-    
+
     # record a single data point into the statistical gatherer.  The gatherer
     # will aggregate all data points collected over a specified period and upload
     # its data to the NewRelic server
@@ -326,9 +326,9 @@ module NewRelic
       @sum_of_squares += (value * value)
       self
     end
-    
+
     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
@@ -340,13 +340,13 @@ module NewRelic
       @sum_of_squares += (avg_val * avg_val) * count
       self
     end
-    
+
     def increment_count(value = 1)
       @call_count += value
     end
 
   end
-  
+
   class ScopedMethodTraceStats < MethodTraceStats
     def initialize(unscoped_stats)
       super()

data/lib/new_relic/timer_lib.rb

@@ -23,5 +23,5 @@ module NewRelic #:nodoc:
     require 'timeout'
     TimerLib = Timeout
   end
-  
-end
+
+end

data/lib/new_relic/transaction_analysis.rb

@@ -4,11 +4,11 @@ module TransactionAnalysis
   def database_time
     time_percentage(/^Database\/.*/)
   end
-  
+
   def render_time
     time_percentage(/^View\/.*/)
   end
-  
+
   # summarizes performance data for all calls to segments
   # with the same metric_name
   class SegmentSummary
@@ -18,41 +18,41 @@ module TransactionAnalysis
       @total_time, @exclusive_time, @call_count = 0,0,0
       @sample = sample
     end
-    
+
     def <<(segment)
       if metric_name != segment.metric_name
-        raise ArgumentError, "Metric Name Mismatch: #{segment.metric_name} != #{metric_name}" 
+        raise ArgumentError, "Metric Name Mismatch: #{segment.metric_name} != #{metric_name}"
       end
-      
+
       @total_time += segment.duration
       @exclusive_time += segment.exclusive_duration
       @call_count += 1
     end
-    
+
     def average_time
       @total_time / @call_count
     end
-    
+
     def average_exclusive_time
       @exclusive_time / @call_count
     end
-    
+
     def exclusive_time_percentage
       return 0 unless @exclusive_time && @sample.duration && @sample.duration > 0
       @exclusive_time / @sample.duration
     end
-    
+
     def total_time_percentage
       return 0 unless @total_time && @sample.duration && @sample.duration > 0
       @total_time / @sample.duration
     end
-    
+
     def developer_name
       return @metric_name if @metric_name == 'Remainder'
       NewRelic::MetricParser.parse(@metric_name).developer_name
     end
   end
-  
+
   # return the data that breaks down the performance of the transaction
   # as an array of SegmentSummary objects.  If a limit is specified, then
   # limit the data set to the top n
@@ -65,13 +65,13 @@ module TransactionAnalysis
         metric_hash[metric_name] << segment
       end
     end
-    
+
     data = metric_hash.values
-    
+
     data.sort! do |x,y|
       y.exclusive_time <=> x.exclusive_time
     end
-    
+
     if limit && data.length > limit
       data = data[0..limit - 1]
     end
@@ -81,17 +81,17 @@ module TransactionAnalysis
     data.each do |segment|
       remainder -= segment.exclusive_time
     end
-    
+
     if (remainder*1000).round > 0
       remainder_summary = SegmentSummary.new('Remainder', self)
       remainder_summary.total_time = remainder_summary.exclusive_time = remainder
       remainder_summary.call_count = 1
       data << remainder_summary
     end
-      
+
     data
   end
-  
+
   # return an array of sql statements executed by this transaction
   # each element in the array contains [sql, parent_segment_metric_name, duration]
   def sql_segments(show_non_sql_segments = true)
@@ -101,8 +101,8 @@ module TransactionAnalysis
     end
     segments
   end
-  
-  private 
+
+  private
     def time_percentage(regex)
       total = 0
       each_segment do |segment|