newrelic_rpm 2.14.1 → 3.0.0.beta1

data/test/new_relic/transaction_sample_subtest_test.rb

@@ -1,49 +1,49 @@
 class NewRelic::TransactionSample::SubTest < Test::Unit::TestCase
   def setup
     @t = NewRelic::TransactionSample.new
-    
+
     @t.params[:test] = "hi"
-    
+
     s1 = @t.create_segment(1.0, "controller")
-    
+
     @t.root_segment.add_called_segment(s1)
-    
+
     s2 = @t.create_segment(2.0, "AR1")
-    
+
     s2.params[:test] = "test"
-    
+
     s1.add_called_segment(s2)
     s2.end_trace 3.0
     s1.end_trace 4.0
-    
+
     s3 = @t.create_segment(4.0, "post_filter")
     @t.root_segment.add_called_segment(s3)
     s3.end_trace 6.0
-    
+
     s4 = @t.create_segment(6.0, "post_filter")
     @t.root_segment.add_called_segment(s4)
     s4.end_trace 7.0
   end
-  
+
   def test_exclusive_duration
     s1 = @t.root_segment.called_segments.first
     assert_equal 3.0, s1.duration
     assert_equal 2.0, s1.exclusive_duration
   end
-  
+
   def test_count_the_segments
     assert_equal 4, @t.count_segments
   end
-  
+
   def test_truncate_long_samples
     @t.truncate(2)
     assert_equal 2, @t.count_segments
-    
+
     @t = NewRelic::TransactionSample.new
-    
+
     s1 = @t.create_segment(1.0, "controller")
     @t.root_segment.add_called_segment(s1)
-    
+
     100.times do
       s1.add_called_segment(@t.create_segment(1.0, "segment"))
     end
@@ -52,5 +52,5 @@ class NewRelic::TransactionSample::SubTest < Test::Unit::TestCase
     assert_equal 2, @t.count_segments
     assert_equal 101, @t.params[:segment_count]
   end
-  
+
 end

data/test/new_relic/transaction_sample_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper.rb', __FILE__) 
+require File.expand_path('../../test_helper.rb', __FILE__)
 
 class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   include TransactionSampleTestHelper
@@ -7,23 +7,23 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
   def setup
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns('QUERY RESULT')
-    
+
     NewRelic::TransactionSample.stubs(:get_connection).returns @connection_stub
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
   end
-  
+
   def test_be_recorded
     assert_not_nil @t
   end
-  
+
   def test_not_record_sql_when_record_sql_off
     s = @t.prepare_to_send(:explain_sql => 0.00000001)
     s.each_segment do |segment|
       assert_nil segment.params[:explanation]
       assert_nil segment.params[:sql]
-    end        
+    end
   end
-  
+
   def test_record_raw_sql
     s = @t.prepare_to_send(:explain_sql => 0.00000001, :record_sql => :raw)
     got_one = false
@@ -33,58 +33,58 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     end
     assert got_one
   end
-  
+
   def test_record_obfuscated_sql
-    
+
     s = @t.prepare_to_send(:explain_sql => 0.00000001, :record_sql => :obfuscated)
 
     got_one = false
     s.each_segment do |segment|
       got_one = got_one || segment.params[:explanation] || segment.params[:sql]
-    end        
-    
+    end
+
     assert got_one
   end
-  
+
   def test_have_sql_rows_when_sql_is_recorded
     s = @t.prepare_to_send(:explain_sql => 0.00000001)
-    
+
     assert s.sql_segments.empty?
     s.root_segment[:sql] = 'hello'
     assert !s.sql_segments.empty?
   end
-  
+
   def test_have_sql_rows_when_sql_is_obfuscated
     s = @t.prepare_to_send(:explain_sql => 0.00000001)
-    
+
     assert s.sql_segments.empty?
     s.root_segment[:sql_obfuscated] = 'hello'
     assert !s.sql_segments.empty?
   end
-  
+
   def test_have_sql_rows_when_recording_non_sql_keys
     s = @t.prepare_to_send(:explain_sql => 0.00000001)
-    
+
     assert s.sql_segments.empty?
     s.root_segment[:key] = 'hello'
     assert !s.sql_segments.empty?
   end
-  
+
   def test_catch_exceptions
     @connection_stub.expects(:execute).raises
     # the sql connection will throw
     @t.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.00000001)
   end
-  
+
   def test_have_explains
-    
+
     s = @t.prepare_to_send(:record_sql => :obfuscated, :explain_sql => 0.00000001)
-    
+
     explain_count = 0
     s.each_segment do |segment|
       if segment.params[:explanation]
         explanations = segment.params[:explanation]
-        
+
         explanations.each do |explanation|
           assert_kind_of Array, explanation
           assert_kind_of Array, explanation[0]
@@ -101,14 +101,14 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     NewRelic::Agent.disable_sql_recording do
       t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
     end
-    
+
     s = t.prepare_to_send(:explain_sql => 0.00000001)
-    
+
     s.each_segment do |segment|
       assert_nil segment.params[:explanation]
       assert_nil segment.params[:sql]
     end
-  end        
+  end
 
   def test_not_record_transactions
     NewRelic::Agent.disable_transaction_tracing do
@@ -116,5 +116,5 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
       assert t.nil?
     end
   end
-  
+
 end

data/test/new_relic/version_number_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 class NewRelic::VersionNumberTest < Test::Unit::TestCase
-  
+
   def test_comparison__first
     versions = %w[1.0.0 0.1.0 0.0.1 10.0.1 1.10.0].map {|s| NewRelic::VersionNumber.new s }
     assert_equal %w[0.0.1 0.1.0 1.0.0 1.10.0 10.0.1], versions.sort.map(&:to_s)
@@ -35,14 +35,14 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert v3 > v0
   end
   def test_sort
-    values = %w[1.1.1 
-                1.1.99 
-                1.1.999 
-                2.0.6 
-                2.6.5 
-                2.7 
-                2.7.1 
-                2.7.2 
+    values = %w[1.1.1
+                1.1.99
+                1.1.999
+                2.0.6
+                2.6.5
+                2.7
+                2.7.1
+                2.7.2
                 2.7.2.0
                 3
                 999]
@@ -59,7 +59,7 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert v0 < '1.2.0'
     assert v0 < '1.2.0.c'
     assert v0 < '1.2.0.0'
-    
+
   end
   def test_compare_string
     v0 = NewRelic::VersionNumber.new '1.2.0'
@@ -86,4 +86,4 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert_equal '1.2.0', NewRelic::VersionNumber.new('1.2.0').to_s
     assert_equal '1.2', NewRelic::VersionNumber.new('1.2').to_s
   end
-end
+end

data/test/test_contexts.rb

@@ -1,21 +1,21 @@
 
 module TestContexts
   def with_running_agent
-    
+
     context 'with running agent' do # this is needed for the nested setups
-      
+
       setup do
         @log_data = StringIO.new
         @log = Logger.new(@log_data)
-        NewRelic::Agent.manual_start :log => @log 
+        NewRelic::Agent.manual_start :log => @log
         @agent = NewRelic::Agent.instance
         @agent.transaction_sampler.send :clear_builder
         @agent.transaction_sampler.reset!
         @agent.stats_engine.clear_stats
       end
-      
+
       yield
-      
+
       def teardown
         super
         NewRelic::Agent.shutdown
@@ -23,7 +23,7 @@ module TestContexts
         NewRelic::Control.instance['dispatcher']=nil
         NewRelic::Control.instance['dispatcher_instance_id']=nil
       end
-      
+
     end
   end
-end
+end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ $LOAD_PATH.uniq!
 
 require 'rubygems'
 # We can speed things up in tests that don't need to load rails.
-# You can also run the tests in a mode without rails.  Many tests 
+# You can also run the tests in a mode without rails.  Many tests
 # will be skipped.
 
 begin
@@ -19,7 +19,7 @@ begin
   rescue LoadError
     # ignore load problems on test help - it doesn't exist in rails 3
   end
-  
+
 rescue LoadError
   puts "Unable to load Rails for New Relic tests"
   raise
@@ -121,16 +121,16 @@ module TransactionSampleTestHelper
     sampler.notice_first_scope_push Time.now.to_f
     sampler.notice_transaction '/path', nil, :jim => "cool"
     sampler.notice_push_scope "a"
-    
+
     sampler.notice_transaction '/path/2', nil, :jim => "cool"
-    
+
     sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "test"}, 0 ) }
-    
+
     sleep 1.0
     yield if block_given?
     sampler.notice_pop_scope "a"
     sampler.notice_scope_empty
-    
+
     sampler.samples[0]
   end
 end

data/ui/helpers/developer_mode_helper.rb

@@ -6,23 +6,23 @@ module NewRelic::DeveloperModeHelper
   include NewRelic::CollectionHelper
 
   private
-  
+
   # limit of how many detail/SQL rows we display - very large data sets (~10000+) crash browsers
   def trace_row_display_limit
     2000
   end
-  
+
   def trace_row_display_limit_reached
    (!@detail_segment_count.nil? && @detail_segment_count > trace_row_display_limit) || @sample.sql_segments.length > trace_row_display_limit
   end
-  
+
   # return the sample but post processed to strip out segments that normally don't show
   # up in production (after the first execution, at least) such as application code loading
   def stripped_sample(sample = @sample)
     sample.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)')
   end
-  
-  # return the highest level in the call stack for the trace that is not rails or 
+
+  # return the highest level in the call stack for the trace that is not rails or
   # newrelic agent code
   def application_caller(trace)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
@@ -34,7 +34,7 @@ module NewRelic::DeveloperModeHelper
     end
     trace.last
   end
-  
+
   def application_stack_trace(trace, include_rails = false)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
     trace.reject do |trace_line|
@@ -42,10 +42,10 @@ module NewRelic::DeveloperModeHelper
       exclude_file_from_stack_trace?(file, include_rails)
     end
   end
-  
+
   def render_backtrace
     if @segment[:backtrace]
-      content_tag('h3', 'Application Stack Trace') + 
+      content_tag('h3', 'Application Stack Trace') +
       render(:partial => 'stack_trace')
     end
   end
@@ -53,35 +53,35 @@ module NewRelic::DeveloperModeHelper
   def h(text)
     text
   end
-  
+
   def agent_views_path(path)
     path
   end
-  
+
   def url_for_source(trace_line)
     file, line = file_and_line(trace_line)
-    
+
     begin
       file = Pathname.new(file).realpath
     rescue Errno::ENOENT
       # we hit this exception when Pathame.realpath fails for some reason; attempt a link to
       # the file without a real path.  It may also fail, only when the user clicks on this specific
       # entry in the stack trace
-    rescue 
+    rescue
       # catch all other exceptions.  We're going to create an invalid link below, but that's okay.
     end
-    
+
     if using_textmate?
       "txmt://open?url=file://#{file}&line=#{line}"
     else
       "show_source?file=#{file}&line=#{line}&anchor=selected_line"
     end
   end
-  
+
   def dev_name(metric_name)
     NewRelic::MetricParser::MetricParser.parse(metric_name).developer_name
   end
-  
+
   # write the metric label for a segment metric in the detail view
   def write_segment_label(segment)
     if source_available && segment[:backtrace] && (source_url = url_for_source(application_caller(segment[:backtrace])))
@@ -90,36 +90,36 @@ module NewRelic::DeveloperModeHelper
       dev_name(segment.metric_name)
     end
   end
-  
+
   def source_available
     true
   end
-  
+
   # write the metric label for a segment metric in the summary table of metrics
   def write_summary_segment_label(segment)
     dev_name(segment.metric_name)
   end
-  
+
   def write_stack_trace_line(trace_line)
     link_to trace_line, url_for_source(trace_line)
   end
-  
+
   # write a link to the source for a trace
   def link_to_source(trace)
     image_url = 'file/images/' + (using_textmate? ? "textmate.png" : "file_icon.png")
-    
+
     link_to "<img src=#{image_url} alt=\"View Source\" title=\"View Source\"/>", url_for_source(application_caller(trace))
   end
-  
+
   # print the formatted timestamp for a segment
   def timestamp(segment)
     sprintf("%1.3f", segment.entry_timestamp)
   end
-  
+
   def format_timestamp(time)
-    time.strftime("%H:%M:%S") 
+    time.strftime("%H:%M:%S")
   end
-  
+
   def colorize(value, yellow_threshold = 0.05, red_threshold = 0.15, s=to_ms(value))
     if value > yellow_threshold
       color = (value > red_threshold ? 'red' : 'orange')
@@ -128,42 +128,42 @@ module NewRelic::DeveloperModeHelper
       "#{s}"
     end
   end
-  
+
   def expanded_image_path()
     '/newrelic/file/images/arrow-open.png'
   end
-  
+
   def collapsed_image_path()
     '/newrelic/file/images/arrow-close.png'
   end
-  
+
   def explain_sql_url(segment)
     "explain_sql?id=#{@sample.sample_id}&amp;segment=#{segment.segment_id}"
   end
-  
+
   def segment_duration_value(segment)
     link_to colorize(segment.duration, 0.05, 0.15, "#{with_delimiter(to_ms(segment.duration))} ms"), explain_sql_url(segment)
   end
-  
+
   def line_wrap_sql(sql)
     sql.gsub(/\,/,', ').squeeze(' ') if sql
   end
-  
+
   def render_sample_details(sample)
     @indentation_depth=0
     # skip past the root segments to the first child, which is always the controller
     first_segment = sample.root_segment.called_segments.first
-    
+
     # render the segments, then the css classes to indent them
     render_segment_details(first_segment).to_s + render_indentation_classes(@indentation_depth).to_s
   end
-  
+
   # the rows logger plugin disables the sql tracing functionality of the NewRelic agent -
   # notify the user about this
   def rows_logger_present?
     File.exist?(File.join(File.dirname(__FILE__), "../../../rows_logger/init.rb"))
   end
-  
+
   def expand_segment_image(segment, depth)
     if depth > 0
       if !segment.called_segments.empty?
@@ -172,49 +172,49 @@ module NewRelic::DeveloperModeHelper
       end
     end
   end
-  
+
   def segment_child_row_class(segment)
     "segment#{segment.segment_id}"
   end
-  
+
   def summary_pie_chart(sample, width, height)
     pie_chart = GooglePieChart.new
     pie_chart.color, pie_chart.width, pie_chart.height = '6688AA', width, height
-    
+
     chart_data = sample.breakdown_data(6)
     chart_data.each { |s| pie_chart.add_data_point dev_name(s.metric_name), to_ms(s.exclusive_time) }
-    
+
     pie_chart.render
   end
-  
+
   def segment_row_classes(segment, depth)
     classes = []
-    
-    classes << "segment#{segment.parent_segment.segment_id}" if depth > 1 
-    
+
+    classes << "segment#{segment.parent_segment.segment_id}" if depth > 1
+
     classes << "view_segment" if segment.metric_name.index('View') == 0
     classes << "summary_segment" if segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
-    
+
     classes.join(' ')
   end
-  
+
   # render_segment_details should be called before calling this method
   def render_indentation_classes(depth)
-    styles = [] 
+    styles = []
      (1..depth).each do |d|
       styles <<  ".segment_indent_level#{d} { display: inline-block; margin-left: #{(d-1)*20}px }"
     end
-    content_tag("style", styles.join(' '))    
+    content_tag("style", styles.join(' '))
   end
-  
+
   def sql_link_mouseover_options(segment)
     { :onmouseover => "sql_mouse_over(#{segment.segment_id})", :onmouseout => "sql_mouse_out(#{segment.segment_id})"}
   end
-  
+
   def explain_sql_link(segment, child_sql = false)
     link_to 'SQL', explain_sql_url(segment)+ '"' + sql_link_mouseover_options(segment).map {|k,v| "#{k}=\"#{v}\""}.join(' ')+ 'fake=\"'
   end
-  
+
   def explain_sql_links(segment)
     if segment[:sql]
       explain_sql_link segment
@@ -228,23 +228,23 @@ module NewRelic::DeveloperModeHelper
       links[0..1].join(', ') + (links.length > 2?', ...':'')
     end
   end
-  
+
   private
   def file_and_line(stack_trace_line)
     stack_trace_line.match(/(.*):(\d+)/)[1..2]
   end
-  
+
   def using_textmate?
     NewRelic::Control.instance.use_textmate?
   end
-  
-  
+
+
   def render_segment_details(segment, depth=0)
     @detail_segment_count ||= 0
     @detail_segment_count += 1
-    
+
     return '' if @detail_segment_count > trace_row_display_limit
-    
+
     @indentation_depth = depth if depth > @indentation_depth
     repeat = nil
     if segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
@@ -254,34 +254,34 @@ module NewRelic::DeveloperModeHelper
       html = render(:partial => 'segment', :object => [segment, depth, repeat])
       depth += 1
     end
-    
+
     segment.called_segments.each do |child|
       html << render_segment_details(child, depth)
     end
-    
+
     html
   end
-  
+
   def exclude_file_from_stack_trace?(file, include_rails)
     return false if include_rails
     return true if file !~ /\.(rb|java)/
-    %w[/actionmailer/ 
-             /activerecord 
-             /activeresource 
-             /activesupport 
-             /lib/mongrel 
-             /actionpack 
+    %w[/actionmailer/
+             /activerecord
+             /activeresource
+             /activesupport
+             /lib/mongrel
+             /actionpack
              /passenger/
              /railties
              benchmark.rb].each { |s| return true if file.include? s }
      false
   end
-  
+
   def show_view_link(title, page_name)
     link_to_function("[#{title}]", "show_view('#{page_name}')");
   end
 
-  
+
   def link_to(name, location)
     location = "/newrelic/#{location}" unless /:\/\// =~ location
     "<a href=\"#{location}\">#{name}</a>"
@@ -302,7 +302,7 @@ module NewRelic::DeveloperModeHelper
       text
     end
   end
-  
+
   def cycle(even, odd)
     @cycle ||= 'a'
     if @cycle == 'a'
@@ -341,7 +341,7 @@ module NewRelic::DeveloperModeHelper
     parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
     parts.join '.'
   end
-  
+
   def profile_table(profile)
     out = StringIO.new
     printer = RubyProf::GraphHtmlPrinter.new(profile)