newrelic_rpm 2.13.0.beta5 → 2.13.1

data/lib/new_relic/metric_parser/errors.rb

@@ -3,4 +3,4 @@ class NewRelic::MetricParser::Errors < NewRelic::MetricParser
   def short_name
     segments[2..-1].join(NewRelic::MetricParser::SEPARATOR)
   end
-end
+end

data/lib/new_relic/metric_parser/external.rb

@@ -1,5 +1,5 @@
 class NewRelic::MetricParser::External < NewRelic::MetricParser
-  
+
   def all?
     host == 'all' || host == 'allWeb' || host == 'allOther'
   end
@@ -36,7 +36,7 @@ class NewRelic::MetricParser::External < NewRelic::MetricParser
     end
   end
   def developer_name
-    case 
+    case
     when all?
       'All External'
     when hosts_all?
@@ -47,4 +47,4 @@ class NewRelic::MetricParser::External < NewRelic::MetricParser
       "#{library}[#{host}]"
     end
   end
-end
+end

data/lib/new_relic/metric_parser/mem_cache.rb

@@ -1,6 +1,6 @@
 class NewRelic::MetricParser::MemCache < NewRelic::MetricParser
   def is_memcache?; true; end
-  
+
   # for MemCache metrics, the short name is actually
   # the full name
   def short_name
@@ -47,4 +47,4 @@ class NewRelic::MetricParser::MemCache < NewRelic::MetricParser
       "MemCache #{operation}"
     end
   end
-end
+end

data/lib/new_relic/metric_parser/other_transaction.rb

@@ -2,30 +2,30 @@
 # Task is "Background", "Resque", "DelayedJob" etc.
 
 class NewRelic::MetricParser::OtherTransaction < NewRelic::MetricParser
-  
+
   def is_transaction?
     true
   end
   def task
     segments[1]
   end
-  
+
   def developer_name
     segments[2..-1].join(NewRelic::MetricParser::SEPARATOR)
   end
-  
+
   def short_name
     developer_name
   end
-  
+
   def drilldown_url(metric_id)
     {:controller => '/v2/background_tasks', :action => 'index', :task => task, :anchor => "id=#{metric_id}"}
   end
-  
+
   def path
     segments[2..-1].join "/"
   end
-  
+
   def summary_metrics
     if segments.size > 2
       %W[OtherTransaction/#{task}/all OtherTransaction/all]
@@ -33,4 +33,4 @@ class NewRelic::MetricParser::OtherTransaction < NewRelic::MetricParser
       []
     end
   end
-end
+end

data/lib/new_relic/metric_parser/view.rb

@@ -15,7 +15,7 @@ class NewRelic::MetricParser::View < NewRelic::MetricParser
         "#{file_name(segments[-2])} Partial"
       when ".rhtml Processing"
         "ERB compilation"
-      else 
+      else
         segments[1..-1]
     end
   end
@@ -27,15 +27,15 @@ class NewRelic::MetricParser::View < NewRelic::MetricParser
         "#{file_name(segments[1..-2].join(NewRelic::MetricParser::SEPARATOR))} Partial"
       when ".rhtml Processing"
         "ERB compilation"
-      else 
+      else
         segments[1..-1].join("/")
     end
   end
-  
+
   def short_name
     segments[1..-2].join(NewRelic::MetricParser::SEPARATOR)
   end
-  
+
   def controller_name
     template_label
   end
@@ -48,7 +48,7 @@ class NewRelic::MetricParser::View < NewRelic::MetricParser
   def developer_name
     template_label
   end
-  
+
   def url
     '/' + file_name(segments[1..-2].join('/'))
   end

data/lib/new_relic/metric_parser/web_frontend.rb

@@ -11,4 +11,4 @@ class NewRelic::MetricParser::WebFrontend < NewRelic::MetricParser
   def legend_name
     'Mongrel Wait'
   end
-end
+end

data/lib/new_relic/metric_parser/web_service.rb

@@ -6,4 +6,4 @@ class NewRelic::MetricParser::WebService < NewRelic::MetricParser
   def webservice_call_rate_suffix
     'rpm'
   end
-end
+end

data/lib/new_relic/metric_spec.rb

@@ -3,7 +3,7 @@
 class NewRelic::MetricSpec
   attr_accessor   :name
   attr_accessor   :scope
-  
+
   MAX_LENGTH = 255
   # Need a "zero-arg" constructor so it can be instantiated from java (using
   # jruby) for sending responses to ruby agents from the java collector.
@@ -12,23 +12,23 @@ class NewRelic::MetricSpec
     self.name = (metric_name || '') && metric_name[0...MAX_LENGTH]
     self.scope = metric_scope && metric_scope[0...MAX_LENGTH]
   end
-  
+
   def truncate!
     self.name = name[0...MAX_LENGTH] if name && name.size > MAX_LENGTH
     self.scope = scope[0...MAX_LENGTH] if scope && scope.size > MAX_LENGTH
   end
-  
+
   def ==(o)
     self.eql?(o)
   end
-  
+
   def eql? o
     self.class == o.class &&
-    name.eql?(o.name) && 
+    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?
@@ -37,28 +37,28 @@ class NewRelic::MetricSpec
   # 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 && 
+    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}"
   end
-  
+
   def to_json(*a)
-    {'name' => name, 
+    {'name' => name,
     'scope' => scope}.to_json(*a)
   end
-  
+
   def <=>(o)
     namecmp = self.name <=> o.name
     return namecmp if namecmp != 0

data/lib/new_relic/noticed_error.rb

@@ -2,19 +2,19 @@
 class NewRelic::NoticedError
   extend NewRelic::CollectionHelper
   attr_accessor :path, :timestamp, :params, :exception_class, :message
-  
+
   def initialize(path, data, exception, timestamp = Time.now)
     self.path = path
     self.params = NewRelic::NoticedError.normalize_params(data)
-    
+
     self.exception_class = exception.is_a?(Exception) ? exception.class.name : 'Error'
-    
+
     if exception.respond_to?('original_exception')
       self.message = exception.original_exception.message.to_s
     else
       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..4095] if self.message.length > 4096

data/lib/new_relic/rack/developer_mode.rb

@@ -5,7 +5,7 @@ require 'rack/file'
 
 module NewRelic::Rack
 class DeveloperMode
-  
+
   VIEW_PATH = File.expand_path('../../../../ui/views/', __FILE__)
   HELPER_PATH = File.expand_path('../../../../ui/helpers/', __FILE__)
   require File.join(HELPER_PATH, 'developer_mode_helper.rb')
@@ -22,7 +22,7 @@ class DeveloperMode
   end
 
   protected
-  
+
   def _call(env)
     @req = Rack::Request.new(env)
     @rendered = false
@@ -53,9 +53,9 @@ class DeveloperMode
       @app.call(env)
     end
   end
-  
+
   private
-  
+
   def index
     get_samples
     render(:index)
@@ -69,18 +69,18 @@ class DeveloperMode
   def explain_sql
     get_segment
 
-    return render(:sample_not_found) unless @sample 
+    return render(:sample_not_found) unless @sample
 
     @sql = @segment[:sql]
     @trace = @segment[:backtrace]
-    
-    if NewRelic::Agent.agent.record_sql == :obfuscated  
+
+    if NewRelic::Agent.agent.record_sql == :obfuscated
       @obfuscated_sql = @segment.obfuscated_sql
     end
-    
+
     explanations = @segment.explain_sql
     if explanations
-      @explanation = explanations.first 
+      @explanation = explanations.first
       if !@explanation.blank?
         first_row = @explanation.first
         # Show the standard headers if it looks like a mysql explain plan
@@ -99,11 +99,11 @@ class DeveloperMode
     NewRelic::Control.instance.profiling = params['start'] == 'true'
     index
   end
-  
+
   def threads
     render(:threads)
   end
-  
+
   def render(view, layout=true)
     add_rack_array = true
     if view.is_a? Hash
@@ -117,13 +117,13 @@ class DeveloperMode
           render({:partial => view[:partial], :object => object})
         end.join(' ')
       end
-      
+
       if view[:partial]
         add_rack_array = false
         view = "_#{view[:partial]}"
       end
     end
-    binding = Proc.new {}
+    binding = Proc.new {}.binding
     if layout
       body = render_with_layout(view) do
         render_without_layout(view, binding)
@@ -142,7 +142,7 @@ class DeveloperMode
   # that block are interpolated into the layout
   def render_with_layout(view)
     body = ERB.new(File.read(File.join(VIEW_PATH, 'layouts/newrelic_default.rhtml')))
-    body.result(Proc.new {})
+    body.result(Proc.new {}.binding)
   end
 
   # you have to pass a binding to this (a proc) so that ERB can have
@@ -150,7 +150,7 @@ class DeveloperMode
   def render_without_layout(view, binding)
     ERB.new(File.read(File.join(VIEW_PATH, 'newrelic', view.to_s + '.rhtml')), nil, nil, 'frobnitz').result(binding)
   end
-    
+
   def content_tag(tag, contents, opts={})
     opt_values = opts.map {|k, v| "#{k}=\"#{v}\"" }.join(' ')
     "<#{tag} #{opt_values}>#{contents}</#{tag}>"
@@ -159,7 +159,7 @@ class DeveloperMode
   def sample
     @sample || @samples[0]
   end
-  
+
   def params
     @req.params
   end
@@ -167,13 +167,13 @@ class DeveloperMode
   def segment
     @segment
   end
-  
+
 
   # show the selected source file with the highlighted selected line
   def show_source
     @filename = params['file']
     line_number = params['line'].to_i
-    
+
     if !File.readable?(@filename)
       @source="<p>Unable to read #{@filename}.</p>"
       return
@@ -185,7 +185,7 @@ class DeveloperMode
       return
     end
     @source = ""
-    
+
     @source << "<pre>"
     file.each_line do |line|
       # place an anchor 6 lines above the selected line (if the line # < 6)
@@ -193,7 +193,7 @@ class DeveloperMode
         @source << "</pre><pre id = 'selected_line'>"
         @source << line.rstrip
         @source << "</pre><pre>"
-        
+
         # highlight the selected line
       elsif file.lineno == line_number
         @source << "</pre><pre class = 'selected_source_line'>"
@@ -204,36 +204,36 @@ class DeveloperMode
       end
     end
     render(:show_source)
-  end  
-  
+  end
+
   def show_sample_data
     get_sample
-    
-    return render(:sample_not_found) unless @sample 
-    
+
+    return render(:sample_not_found) unless @sample
+
     @request_params = @sample.params['request_params'] || {}
     @custom_params = @sample.params['custom_params'] || {}
 
     controller_metric = @sample.root_segment.called_segments.first.metric_name
-    
+
     metric_parser = NewRelic::MetricParser.for_metric_named controller_metric
     @sample_controller_name = metric_parser.controller_name
     @sample_action_name = metric_parser.action_name
-    
+
     render(:show_sample)
   end
-  
+
     def get_samples
     @samples = NewRelic::Agent.instance.transaction_sampler.samples.select do |sample|
       sample.params[:path] != nil
     end
-    
+
     return @samples = @samples.sort{|x,y| y.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)').duration <=>
         x.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)').duration} if params['h']
     return @samples = @samples.sort{|x,y| x.params[:uri] <=> y.params[:uri]} if params['u']
     @samples = @samples.reverse
   end
-  
+
   def get_sample
     get_samples
     id = params['id']
@@ -245,13 +245,13 @@ class DeveloperMode
       end
     end
   end
-  
+
   def get_segment
     get_sample
     return unless @sample
-    
+
     segment_id = params['segment'].to_i
     @segment = @sample.find_segment(segment_id)
-  end  
+  end
 end
 end

data/lib/new_relic/rack/metric_app.rb

@@ -5,9 +5,9 @@ module NewRelic
       def initialize(options)
         if options[:install]
           src = File.join(File.dirname(__FILE__), "newrelic.yml")
-          require 'new_relic/command'  
+          require 'new_relic/command'
           begin
-            NewRelic::Command::Install.new(:quiet => true, :src_file => src).run    
+            NewRelic::Command::Install.new(:quiet => true, :src_file => src).run
             NewRelic::Agent.logger.info "A newrelic.yml template was copied to #{File.expand_path('.')}."
             NewRelic::Agent.logger.info "Please add a license key to the file and restart #{$0}"
             exit 0