newrelic_rpm 2.9.9 → 2.10.3

data/test/new_relic/control_test.rb

@@ -8,14 +8,37 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     NewRelic::Agent.manual_start
     @c =  NewRelic::Control.instance
   end
+  def shutdown
+    NewRelic::Agent.shutdown
+  end
+
+  def test_monitor_mode
+    assert ! @c.monitor_mode?
+    @c.settings.delete 'enabled'
+    @c.settings.delete 'monitor_mode'
+    assert !@c.monitor_mode?
+    @c['enabled'] = false
+    assert ! @c.monitor_mode?
+    @c['enabled'] = true
+    assert @c.monitor_mode?
+    @c['monitor_mode'] = nil
+    assert !@c.monitor_mode?
+    @c['monitor_mode'] = false
+    assert !@c.monitor_mode?
+    @c['monitor_mode'] = true
+    assert @c.monitor_mode?
+  ensure
+    @c['enabled'] = false
+    @c['monitor_mode'] = false
+  end
   
   def test_test_config
     assert_equal :rails, c.app
     assert_equal :test, c.framework
     assert_match /test/i, c.dispatcher_instance_id
     assert_equal nil, c.dispatcher
-    
-    assert_equal false, c['enabled']
+    assert !c['enabled']
+    assert_equal false, c['monitor_mode']
     c.local_env
   end
   
@@ -26,8 +49,6 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   
   def test_info
     props = NewRelic::Control.instance.local_env.snapshot
-    list = props.assoc('Plugin List').last.sort
-    assert_not_nil list # can't really guess what might be in here.  
     assert_match /jdbc|postgres|mysql|sqlite/, props.assoc('Database adapter').last
   end
   
@@ -51,7 +72,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     assert_equal c['sval'], 'sure'
   end
   def test_config_apdex
-    assert_equal 1.1, c['apdex_t']
+    assert_equal 1.1, c.apdex_t
   end
   def test_transaction_threshold
     assert_equal 'Apdex_f', c['transaction_tracer']['transaction_threshold']
@@ -60,14 +81,6 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   def test_log_file_name
     assert_match /newrelic_agent.log$/, c.instance_variable_get('@log_file')
   end
-  def test_environment_info
-    NewRelic::Control.instance.send :append_environment_info
-    snapshot = NewRelic::Control.instance.local_env.snapshot
-    assert snapshot.assoc('Plugin List').last.include?('newrelic_rpm'), snapshot.inspect
-  end
-  def test_config_apdex
-    assert_equal 1.1, c['apdex_t']
-  end
    
   def test_transaction_threshold__apdex
     forced_start

data/test/new_relic/metric_parser_test.rb

@@ -47,7 +47,7 @@ class MetricParserTest < Test::Unit::TestCase
       assert !m.is_web_service?
       
       assert_not_nil m.base_metric_name
-      assert m.base_metric_name.starts_with?('Controller/')
+      assert_equal 0, m.base_metric_name.index('Controller/')
     end
     
   end
@@ -139,4 +139,34 @@ class MetricParserTest < Test::Unit::TestCase
     m = NewRelic::MetricParser.for_metric_named("Errors/Type/MyType")
     assert_equal m.short_name, 'MyType'
   end
+  def test_external
+    m = NewRelic::MetricParser.for_metric_named("External/all")
+    assert m.all?
+    assert !m.hosts_all?
+    assert_equal "All External", m.developer_name
+    assert_equal "calls to external systems", m.tooltip_name
+    assert_equal "External Services", m.legend_name
+    assert_nil m.operation
+    assert_nil m.library
+    
+    m = NewRelic::MetricParser.for_metric_named("External/venus/all")
+    assert !m.all?
+    assert m.hosts_all?
+    assert_equal "venus", m.developer_name
+    assert_equal "calls to venus", m.tooltip_name
+    assert_equal "All venus calls", m.legend_name
+    assert_nil m.operation
+    assert_equal 'all', m.library
+
+    m = NewRelic::MetricParser.for_metric_named("External/venus/Net::Http/get")
+    assert !m.all?
+    assert !m.hosts_all?
+    assert_equal "Net::Http[venus]: get", m.developer_name
+    assert_equal "calls to Net::Http[venus]: get", m.tooltip_name
+    assert_equal "Net::Http[venus]: get", m.legend_name
+    assert_equal 'get', m.operation
+    assert_equal 'Net::Http', m.library
+    
+    
+  end
 end

data/test/new_relic/metric_spec_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 ##require "new_relic/stats"
-class NewRelic::StatsTest < Test::Unit::TestCase
+class NewRelic::MetricSpecTest < Test::Unit::TestCase
   
   def test_simple
     stats = NewRelic::MethodTraceStats.new 
@@ -20,7 +20,7 @@ class NewRelic::StatsTest < Test::Unit::TestCase
     
     assert spec1.eql?(NewRelic::MetricSpec.new('Controller'))
     assert spec2.eql?(NewRelic::MetricSpec.new('Controller', nil))
-    assert !spec1.eql?(spec2)
+    assert spec1.eql?(spec2)
     assert !spec2.eql?(NewRelic::MetricSpec.new('Controller', '/dude'))
   end
 

data/test/new_relic/stats_test.rb

@@ -93,14 +93,6 @@ class NewRelic::StatsTest < Test::Unit::TestCase
     assert_equal(s1.calls_per_minute, 2)
   end
 
-  def test_calls_per_second
-    s1 = NewRelic::TestObjectForStats.new
-    s1.call_count = 90
-    s1.begin_time = Time.at(0)
-    s1.end_time = Time.at(30)
-    assert_equal(s1.calls_per_second, 3)
-  end
-
   def test_total_call_time_per_minute
     s1 = NewRelic::TestObjectForStats.new
     s1.begin_time = Time.at(0)

data/test/new_relic/version_number_test.rb

@@ -19,15 +19,33 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert v1 > v3
     assert v3 < v0
   end
+  def test_bug
+    v0 = NewRelic::VersionNumber.new '2.8.999'
+    v1 = NewRelic::VersionNumber.new '2.9.10'
+    assert v1 > v0
+    assert v0 <= v1
+  end
   def test_long_version
     v0 = NewRelic::VersionNumber.new '1.2.3.4'
     v1 = NewRelic::VersionNumber.new '1.2.3.3'
     v3 = NewRelic::VersionNumber.new '1.3'
     assert v0 > v1
+    assert v0 < '1.2.3.5'
+    assert ! (v0 < '1.2.3.4')
     assert v3 > v0
   end
   def test_sort
-    values = %w[1.1.1 2.6.5 2.7 2.7.1]
+    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]
     assert_equal values, values.map{|v| NewRelic::VersionNumber.new v}.sort.map(&:to_s)
   end
   def test_compare_string
@@ -39,6 +57,18 @@ class NewRelic::VersionNumberTest < Test::Unit::TestCase
     assert v3 < '1.2.0'
     assert v0 == '1.2.0'
   end
+  def test_4_numbers
+    v0 = NewRelic::VersionNumber.new '1.2.0'
+    v1 = NewRelic::VersionNumber.new '1.2.0.1'
+    v2 = NewRelic::VersionNumber.new '1.2.1.0'
+    v3 = NewRelic::VersionNumber.new '1.2.1.1'
+    assert v0 < v1
+    assert v1 < v2
+    assert v2 < v3
+    assert v0 < v3
+    assert v0 < '1.2.0.1'
+    assert v0 > '1.1.0.1'
+  end
   def test_string
     assert_equal '1.2.0', NewRelic::VersionNumber.new('1.2.0').to_s
     assert_equal '1.2', NewRelic::VersionNumber.new('1.2').to_s

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 module NewRelic; TEST = true; end unless defined? NewRelic::TEST
-
+#ENV['NEWRELIC_ENABLE'] = 'true'
+ENV['RAILS_ENV'] = 'test'
 NEWRELIC_PLUGIN_DIR = File.expand_path(File.join(File.dirname(__FILE__),".."))
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"test")
 $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"ui/helpers")
@@ -15,3 +16,38 @@ def assert_between(floor, ceiling, value, message = nil)
   assert floor <= value && value <= ceiling,
   message || "expected #{floor} <= #{value} <= #{ceiling}"
 end
+
+def compare_metrics expected_list, actual_list
+  actual = Set.new actual_list
+  actual.delete('GC/cumulative') # in case we are in REE
+  expected = Set.new expected_list
+  assert_equal expected.to_a.sort, actual.to_a.sort, "extra: #{(actual - expected).to_a.join(", ")}; missing: #{(expected - actual).to_a.join(", ")}"
+end
+=begin Enable this to see test names as they run
+Test::Unit::TestCase.class_eval do
+  def run_with_info *args, &block
+    puts "#{self.class.name.underscore}/#{@method_name}"
+    run_without_info *args, &block
+  end
+  alias_method_chain :run, :info
+end
+=end
+module TransactionSampleTestHelper
+  def make_sql_transaction(*sql)
+    sampler = NewRelic::Agent::TransactionSampler.new
+    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/controllers/newrelic_controller.rb

@@ -40,20 +40,28 @@ class NewrelicController < ActionController::Base
   
   write_inheritable_attribute('do_not_trace', true)
   
-  def css
-    forward_to_file '/newrelic/stylesheets/', 'text/css'
-  end
-  
-  def image
-    forward_to_file '/newrelic/images/', params[:content_type]
+  def profile
+    NewRelic::Control.instance.profiling = params['start'] == 'true'
+    get_samples
+    redirect_to :action => 'index'
   end
   
-  def javascript
-    forward_to_file '/newrelic/javascript/', 'text/javascript'
+  def file
+    file_name=params[:file].join
+    file_name=~/^.*[.]([^.]*)$/
+    ext=$1
+    case ext
+      when 'css' then
+        forward_to_file '/newrelic/stylesheets/', 'text/css'
+      when 'gif','jpg','png' then
+        forward_to_file '/newrelic/images/', "image/#{ext}"
+      when 'js' then
+        forward_to_file '/newrelic/javascript/', 'text/javascript'
+      else
+        raise "Unknown type '#{ext}' (#{file_name})"
+    end
   end
-  
-  
-  
+
   def index
     get_samples
   end

data/ui/helpers/google_pie_chart.rb

@@ -7,7 +7,6 @@ class GooglePieChart
   def initialize
     # an array of [label, value]
     @data = []
-
     self.width = 300
     self.height = 200
   end
@@ -20,18 +19,13 @@ class GooglePieChart
   # render the chart to html by creating an image object and
   # placing the correct URL to the google charts api
   def render
-    labels = ''
-    values = ''
+    labels = []
+    values = []
     @data.each do |label, value|
-      labels << CGI::escape(label) + '|'
-      values << (value * 100 / @max).round.to_s + ","
+      labels << CGI::escape(label)
+      values << (value > 0 ? value * 100 / @max : value).round.to_s
     end
-
-    # strip of the last separator char for labels and values
-    labels = labels[0..-2]
-    values = values[0..-2]
-      
-    params = {:cht => 'p', :chs => "#{width}x#{height}", :chd => "t:#{values}", :chl => labels }
+    params = {:cht => 'p', :chs => "#{width}x#{height}", :chd => "t:#{values.join(',')}", :chl => labels.join('|') }
     params['chco'] = color if color
     
     url = "http://chart.apis.google.com/chart?#{to_query(params)}"

data/ui/helpers/newrelic_helper.rb

@@ -15,17 +15,13 @@ module NewrelicHelper
   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
+   (!@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)
-    if session[:newrelic_strip_code_loading] || true
-      sample.omit_segments_with('(Rails/Application Code Loading)|(Database/.*/.+ Columns)')
-    else
-      sample
-    end
+    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 
@@ -48,11 +44,11 @@ module NewrelicHelper
       exclude_file_from_stack_trace?(file, include_rails)
     end
   end
-
+  
   def render_backtrace
     if @segment[:backtrace]
       content_tag('h3', 'Application Stack Trace') + 
-          render(:partial => agent_views_path('stack_trace'), :locals => {:segment => @segment})
+      render(:partial => agent_views_path('stack_trace'), :locals => {:segment => @segment})
     end
   end
   
@@ -76,7 +72,7 @@ module NewrelicHelper
     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
@@ -109,10 +105,10 @@ module NewrelicHelper
   def write_stack_trace_line(trace_line)
     link_to h(trace_line), url_for_source(trace_line)
   end
-
+  
   # write a link to the source for a trace
   def link_to_source(trace)
-    image_url = url_for(:controller => :newrelic, :action => :image, :file => (using_textmate? ? "textmate.png" : "file_icon.png"), :content_type => 'image/png')
+    image_url = url_for(:controller => :newrelic, :action => :file, :file => (using_textmate? ? "textmate.png" : "file_icon.png"))
     
     link_to image_tag(image_url, :alt => (title = 'View Source'), :title => title), url_for_source(application_caller(trace))
   end
@@ -125,7 +121,7 @@ module NewrelicHelper
   def format_timestamp(time)
     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')
@@ -136,11 +132,11 @@ module NewrelicHelper
   end
   
   def expanded_image_path()
-    url_for(:controller => :newrelic, :action => :image, :file => 'arrow-open.png')
+    url_for(:controller => :newrelic, :action => :file, :file => 'arrow-open.png')
   end
   
   def collapsed_image_path()
-    url_for(:controller => :newrelic, :action => :image, :file => 'arrow-close.png')
+    url_for(:controller => :newrelic, :action => :file, :file => 'arrow-close.png')
   end
   
   def explain_sql_url(segment)
@@ -202,17 +198,17 @@ module NewrelicHelper
     classes = []
     
     classes << "segment#{segment.parent_segment.segment_id}" if depth > 1 
-  
-    classes << "view_segment" if segment.metric_name.starts_with?('View')
+    
+    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 = [] 
-    (1..depth).each do |d|
+     (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(' '))    
@@ -240,17 +236,16 @@ module NewrelicHelper
     end
   end
   
-private
+  private
   def file_and_line(stack_trace_line)
     stack_trace_line.match(/(.*):(\d+)/)[1..2]
   end
   
   def using_textmate?
-    # For now, disable textmate integration
-    false
+    NewRelic::Control.instance.use_textmate?
   end
   
-
+  
   def render_segment_details(segment, depth=0)
     @detail_segment_count ||= 0
     @detail_segment_count += 1
@@ -273,17 +268,20 @@ private
     
     html
   end
-    
+  
   def exclude_file_from_stack_trace?(file, include_rails)
-    !include_rails && (
-      file =~ /\/active(_)*record\// ||
-      file =~ /\/action(_)*controller\// ||
-      file =~ /\/activesupport\// ||
-      file =~ /\/lib\/mongrel/ ||
-      file =~ /\/actionpack\// ||
-      file =~ /\/passenger\// ||
-      file =~ /\/benchmark.rb/ ||
-      file !~ /\.rb/)                  # must be a .rb file, otherwise it's a script of something else...we could have gotten trickier and tried to see if this file exists...
+    return false if include_rails
+    return true if file !~ /\.(rb|java)/
+    %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)
@@ -297,14 +295,14 @@ private
       when 'jpg'; 'image/jpg'
       when 'css'; 'text/css'
       when 'js'; 'text/javascript'
-      else 'text/plain'
+    else 'text/plain'
     end
   end
   def to_ms(number)
    (number*1000).round
   end
   def to_percentage(value)
-    (value * 100).round if value
+   (value * 100).round if value
   end
   def with_delimiter(val)
     return '0' if val.nil?
@@ -312,4 +310,11 @@ private
     parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
     parts.join '.'
   end
+  
+  def profile_table(profile)
+    out = StringIO.new
+    printer = RubyProf::GraphHtmlPrinter.new(profile)
+    printer.print(out, :min_percent=>0.5)
+    out.string[/<body>(.*)<\/body>/im, 0].gsub('<table>', '<table class=profile>')
+  end
 end