newrelic_rpm 2.12.3 → 2.13.0.beta3

data/test/new_relic/stats_test.rb

@@ -1,3 +1,4 @@
+ENV['SKIP_RAILS'] = 'true'
 require File.expand_path(File.join(File.dirname(__FILE__),'..', 'test_helper'))
 ##require "new_relic/stats"
 
@@ -28,7 +29,7 @@ class NewRelic::StatsTest < Test::Unit::TestCase
   def test_to_s
     s1 = NewRelic::MethodTraceStats.new
     s1.trace_call 10
-    assert_equal(s1.to_s, "Begin=0.0, Duration=0.0 s, Count=1, Total=10000, Total Exclusive=10000, Avg=10000, Min=10000, Max=10000, StdDev=0")
+    assert_equal("[01/01/70 12:00AM UTC, 0.000s;  1 calls 10000 ms]", s1.to_s)
   end
 
   def test_time_str
@@ -60,7 +61,7 @@ class NewRelic::StatsTest < Test::Unit::TestCase
   def test_multiply_by
     s1 = NewRelic::MethodTraceStats.new
     s1.trace_call 10
-    assert_equal(s1.multiply_by(10).to_s, "Begin=0.0, Duration=0.0 s, Count=10, Total=100000, Total Exclusive=10000, Avg=10000, Min=10000, Max=10000, StdDev=0")
+    assert_equal("[01/01/70 12:00AM UTC, 0.000s; 10 calls 10000 ms]", s1.multiply_by(10).to_s)
   end
 
   def test_get_apdex

data/test/test_contexts.rb

@@ -0,0 +1,28 @@
+
+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 
+        @agent = NewRelic::Agent.instance
+        @agent.transaction_sampler.send :clear_builder
+        @agent.transaction_sampler.reset!
+        @agent.stats_engine.clear_stats
+      end
+      
+      yield
+      
+      def teardown
+        NewRelic::Agent.shutdown
+        @log_data.reset
+        NewRelic::Control.instance['dispatcher']=nil
+        NewRelic::Control.instance['dispatcher_instance_id']=nil
+      end
+      
+    end
+  end
+end

data/test/test_helper.rb

@@ -1,16 +1,35 @@
 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")
 $LOAD_PATH.uniq!
 
-require File.expand_path(File.join(NEWRELIC_PLUGIN_DIR, "..","..","..","config","environment"))
-
-require 'test_help'
-require 'mocha'
+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 
+# will be skipped.
+if ENV['SKIP_RAILS']
+  dirs = File.dirname(__FILE__).split('/')
+  while dirs.any? && !File.directory?((dirs+%w[log]).join('/'))
+    dirs.pop
+  end
+  RAILS_ROOT = dirs.any? ? dirs.join("/") : "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+  $LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR, "lib")
+  require File.join(NEWRELIC_PLUGIN_DIR, "lib/newrelic_rpm")
+else
+  begin
+    require File.expand_path("../../../config/environment", NEWRELIC_PLUGIN_DIR)
+    require 'test_help'
+  rescue LoadError
+    puts "Unable to load Rails for New Relic tests: try setting the environment variable SKIP_RAILS=false"
+    raise
+  end
+end
 require 'test/unit'
+require 'mocha'
+require 'shoulda'
+require 'test_contexts'
 
 def assert_between(floor, ceiling, value, message = nil)
   assert floor <= value && value <= ceiling,

data/ui/helpers/{newrelic_helper.rb → developer_mode_helper.rb}

@@ -1,6 +1,9 @@
 require 'pathname'
-module NewrelicHelper
+require File.expand_path('../google_pie_chart', __FILE__)
+module NewRelic::DeveloperModeHelper
   include NewRelic::CollectionHelper
+
+  private
   
   # return the host that serves static content (css, metric documentation, images, etc)
   # that supports the desktop edition.
@@ -47,9 +50,13 @@ module NewrelicHelper
   def render_backtrace
     if @segment[:backtrace]
       content_tag('h3', 'Application Stack Trace') + 
-      render(:partial => agent_views_path('stack_trace'), :locals => {:segment => @segment})
+      render(:partial => 'stack_trace')
     end
   end
+
+  def h(text)
+    text
+  end
   
   def agent_views_path(path)
     path
@@ -75,7 +82,7 @@ module NewrelicHelper
     if using_textmate?
       "txmt://open?url=file://#{file}&line=#{line}"
     else
-      url_for :action => 'show_source', :file => file, :line => line, :anchor => 'selected_line'
+      "show_source?file=#{file}&line=#{line}&anchor=selected_line"
     end
   end
   
@@ -88,7 +95,7 @@ module NewrelicHelper
     if source_available && segment[:backtrace] && (source_url = url_for_source(application_caller(segment[:backtrace])))
       link_to dev_name(segment.metric_name), source_url
     else
-      h(dev_name(segment.metric_name))
+      dev_name(segment.metric_name)
     end
   end
   
@@ -102,14 +109,14 @@ module NewrelicHelper
   end
   
   def write_stack_trace_line(trace_line)
-    link_to h(trace_line), url_for_source(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 = url_for(:controller => :newrelic, :action => :file, :file => (using_textmate? ? "textmate.png" : "file_icon.png"))
+    image_url = 'file/images/' + (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))
+    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
@@ -131,17 +138,15 @@ module NewrelicHelper
   end
   
   def expanded_image_path()
-    url_for(:controller => :newrelic, :action => :file, :file => 'arrow-open.png')
+    '/newrelic/file/images/arrow-open.png'
   end
   
   def collapsed_image_path()
-    url_for(:controller => :newrelic, :action => :file, :file => 'arrow-close.png')
+    '/newrelic/file/images/arrow-close.png'
   end
   
   def explain_sql_url(segment)
-    url_for(:action => :explain_sql, 
-      :id => @sample.sample_id, 
-      :segment => segment.segment_id)
+    "explain_sql?id=#{@sample.sample_id}&amp;segment=#{segment.segment_id}"
   end
   
   def segment_duration_value(segment)
@@ -149,7 +154,7 @@ module NewrelicHelper
   end
   
   def line_wrap_sql(sql)
-    h(sql.gsub(/\,/,', ').squeeze(' ')) if sql
+    sql.gsub(/\,/,', ').squeeze(' ') if sql
   end
   
   def render_sample_details(sample)
@@ -158,7 +163,7 @@ module NewrelicHelper
     first_segment = sample.root_segment.called_segments.first
     
     # render the segments, then the css classes to indent them
-    render_segment_details(first_segment) + render_indentation_classes(@indentation_depth)
+    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 -
@@ -171,10 +176,7 @@ module NewrelicHelper
     if depth > 0
       if !segment.called_segments.empty?
         row_class =segment_child_row_class(segment)
-        link_to_function(tag('img', :src => collapsed_image_path, :id => "image_#{row_class}",
-            :class_for_children => row_class, 
-            :class => (!segment.called_segments.empty?) ? 'parent_segment_image' : 'child_segment_image'), 
-            "toggle_row_class(this)")
+        link_to_function("<img src=\"#{collapsed_image_path}\" id=\"image_#{row_class}\" class_for_children=\"#{row_class}\" class=\"#{(!segment.called_segments.empty?) ? 'parent_segment_image' : 'child_segment_image'}\"", "toggle_row_class(this)")
       end
     end
   end
@@ -218,16 +220,16 @@ module NewrelicHelper
   end
   
   def explain_sql_link(segment, child_sql = false)
-    link_to 'SQL', explain_sql_url(segment), sql_link_mouseover_options(segment)
+    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_obfuscated] || segment[:sql]
+    if segment[:sql]
       explain_sql_link segment
     else
       links = []
       segment.called_segments.each do |child|
-        if child[:sql_obfuscated] || child[:sql]
+        if child[:sql]
           links << explain_sql_link(child, true)
         end
       end
@@ -257,7 +259,7 @@ module NewrelicHelper
       html = ''
     else
       repeat = segment.parent_segment.detail_segments.length if segment.parent_segment.is_a?(NewRelic::TransactionSample::CompositeSegment)
-      html = render(:partial => agent_views_path('segment'), :object => segment, :locals => {:indent => depth, :repeat => repeat})
+      html = render(:partial => 'segment', :object => [segment, depth, repeat])
       depth += 1
     end
     
@@ -286,8 +288,46 @@ module NewrelicHelper
   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>"
+  end
+
+  def link_to_if(predicate, text, location="")
+    if predicate
+      link_to(text, location)
+    else
+      text
+    end
+  end
+
+  def link_to_unless_current(text, hash)
+    unless params[hash.keys[0].to_s]
+      link_to(text,"?#{hash.keys[0]}=#{hash.values[0]}")
+    else
+      text
+    end
+  end
+  
+  def cycle(even, odd)
+    @cycle ||= 'a'
+    if @cycle == 'a'
+      @cycle = 'b'
+      even
+    else
+      @cycle = 'a'
+      odd
+    end
+  end
+
+  def link_to_function(title, javascript)
+    "<a href=\"#\" onclick=\"#{javascript}; return false;\">#{title}</a>"
+  end
+
   def mime_type_from_extension(extension)
-    extension = extension[/[^.]*$/].downcase
+    extension = extension[/[^.]*$/].dncase
     case extension
       when 'png'; 'image/png'
       when 'gif'; 'image/gif'

data/ui/views/layouts/newrelic_default.rhtml

@@ -1,18 +1,18 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
     xml:lang="en" lang="en">
 <head>
-<script type="text/javascript" src="<%= url_for(:controller => :newrelic, :action => :file, :file => 'prototype-scriptaculous.js') %>"></script>
+<script type="text/javascript" src="/newrelic/file/javascript/jquery-1.4.2.js"></script>
 <title>New Relic RPM Developer Mode</title>
-	<link href="<%= url_for(:controller => :newrelic, :action => :file, :file => 'style.css') %>" 
+	<link href="/newrelic/file/stylesheets/style.css" 
 				media="screen" rel="stylesheet" type="text/css" />
 </head>
 <body>
 	<div id="header">
-		<img width="100%" height="4" src="<%= url_for(:controller => :newrelic, :action => :file, :file => 'blue_bar.gif') %>" alt="spacer"/>
+		<img width="100%" height="4" src="/newrelic/file/images/blue_bar.gif" alt="spacer"/>
 		<table width="100%" height="60">
 			<tr>
 				<td valign="middle">
-					<a href='/newrelic'><img src="<%= url_for(:controller => :newrelic, :action => :file, :file => 'new_relic_rpm_desktop.gif') %>" hspace="10" alt="New Relic RPM"/></a>
+					<a href='/newrelic'><img src="/newrelic/file/images/new_relic_rpm_desktop.gif" hspace="10" alt="New Relic RPM"/></a>
 				</td>
 				<td class="top_nav" valign="bottom">
 					<ul id="navlist">
@@ -22,7 +22,7 @@
 			</tr>
 		</table>
 		<div id="page_nav">
-			<table width="100%" height="100%" background="<%= url_for(:controller => :newrelic, :action => :file, :file => 'gray_bar.gif') %>">
+			<table width="100%" height="100%" background="/newrelic/file/images/gray_bar.gif">
 				<tr valign="middle">
 					<td>
 						<span class="application_title">Developer Mode</span>
@@ -38,7 +38,7 @@
 		<%= yield %>
 	</div>
 	<div id='footer'>
-		<img width="100%" height="4" src="<%= url_for(:controller => :newrelic, :action => :file, :file => 'blue_bar.gif', :content_type => 'image/gif') %>" alt="spacer"/>
+		<img width="100%" height="4" src="/newrelic/file/images/blue_bar.gif" alt="spacer"/>
 		<p>
 		<a href="/newrelic">Home</a> | <a href="&#109;&#97;&#105;&#108;&#116;&#111;:&#x73;&#x75;&#x70;&#112;&#111;&#x72;&#116;&#x40;&#x6E;&#x65;&#119;&#114;&#x65;&#x6C;&#105;&#x63;&#x2E;&#99;&#x6F;&#109;?subject=&#70;&#101;&#x65;&#x64;&#x62;&#x61;&#x63;&#107;" title="">&#x46;&#x65;&#101;&#x64;&#98;&#97;&#x63;&#x6B;</a><br />
 		Monitor your Rails Application in Production. <a href="http://www.newrelic.com/dev-upgrade.html">Learn more. &raquo;</a><br />

data/ui/views/newrelic/_explain_plans.rhtml

@@ -17,11 +17,11 @@
   <tr>
   <th align=right>Plan</th>
   <td><p class="plan">
-  <% @explanation.each do |row| -%>
-      <% row.each do |col| -%>
+  <% @explanation.each do |row| %>
+      <% row.each do |col| %>
 <%= h(col) %>
-      <% end -%>
-  <% end -%>
+      <% end %>
+  <% end %>
   </p></td>
   </tr>
 <% end %>

data/ui/views/newrelic/_sample.rhtml

@@ -1,19 +1,20 @@
+<% sample = object %>
 <tr class="<%= cycle('even_row', 'odd_row') %>">
-	<td align=right nowrap=true>
-		<%= Time.at(stripped_sample(sample).timestamp).strftime "%H:%M:%S" %>
-	</td>
-	<td align=right nowrap=true>
-		<%= colorize(stripped_sample(sample).duration, 1, 2) %> ms
-	</td>
-	<td>
-		<%= link_to "#{sample.params[:uri]}", :action => :show_sample_summary, :id => sample.sample_id %>
-	</td>
-	<td>
-		<% if sample.profile %>
-		<%= link_to "[Profile]", :action => :show_sample_summary, :id => sample.sample_id %>
-		<% else %>
-		<%= link_to "[Detail]", :action => :show_sample_detail, :id => sample.sample_id %><br/>
-		<%= link_to "[SQL (#{sample.sql_segments.size})]", :action => :show_sample_sql, :id => sample.sample_id %>
-		<% end %>
-	</td>
+<td align=right nowrap=true>
+  <%= Time.at(stripped_sample(sample).timestamp).strftime "%H:%M:%S" %>
+</td>
+<td align=right nowrap=true>
+  <%= colorize(stripped_sample(sample).duration, 1, 2) %> ms
+</td>
+<td>
+  <%= link_to "#{sample.params[:uri]}", "show_sample_summary?id=#{sample.sample_id}" %>
+</td>
+<td>
+  <% if sample.profile %>
+    <%= link_to "[Profile]", "show_sample_summary?id=#{sample.sample_id}" %>
+  <% else %>
+    <%= link_to "[Detail]", "show_sample_detail?id=#{sample.sample_id}" %><br/>
+    <%= link_to "[SQL (#{sample.sql_segments.size})]", "show_sample_sql?id=#{sample.sample_id}" %>
+  <% end %>
+</td>
 </tr>

data/ui/views/newrelic/_segment.rhtml

@@ -1,3 +1,4 @@
+<% segment, indent, repeat = object %>
 <tr style="<%= 'display:none' if indent > 1 %>" child_row_class="<%=segment_child_row_class(segment)%>" onmouseover="mouse_over_row(this)" onmouseout="mouse_out_row(this)" class='<%=segment_row_classes(segment, indent)%>'>
 	
 <td nowrap=true>

data/ui/views/newrelic/_segment_row.rhtml

@@ -1,14 +1,14 @@
 <tr class='<%= cycle('even_row', 'odd_row') %>'>
 	<td>
-			<%= write_summary_segment_label segment_row %>
+			<%= write_summary_segment_label object %>
 			<small>
-			<%= link_to "?", url_for_metric_doc(segment_row.metric_name) %>
+			<%= link_to "?", url_for_metric_doc(object.metric_name) %>
       </small>
 	</td>
-	<td align=left> <%= segment_row.call_count %></td>
-	<td align=right><%= with_delimiter(to_ms(segment_row.exclusive_time)) %> ms</td>
-	<td align=right><%= to_percentage(segment_row.exclusive_time_percentage) %>% </td>
+	<td align=left> <%= object.call_count %></td>
+	<td align=right><%= with_delimiter(to_ms(object.exclusive_time)) %> ms</td>
+	<td align=right><%= to_percentage(object.exclusive_time_percentage) %>% </td>
 	<td>  </td>
-	<td align=right><%= with_delimiter(to_ms(segment_row.total_time)) %> ms</td>
-	<td align=right><%= to_percentage(segment_row.total_time_percentage) %>%</td>
-</tr>
+	<td align=right><%= with_delimiter(to_ms(object.total_time)) %> ms</td>
+	<td align=right><%= to_percentage(object.total_time_percentage) %>%</td>
+</tr>

data/ui/views/newrelic/_show_sample_detail.rhtml

@@ -21,4 +21,4 @@
   <%= render_sample_details(@sample) %>
 </table>
 
-<%= render :partial => agent_views_path('segment_limit_message') if trace_row_display_limit_reached %>
+<%= render :partial => 'segment_limit_message' if trace_row_display_limit_reached %>

data/ui/views/newrelic/_show_sample_sql.rhtml

@@ -5,7 +5,7 @@
     visibility, you must remove <samp>rows_logger_plugin</samp>, or change your plugin load order 
     so that the rows logger is loaded first.  
   <% else %>
-  <%= render :partial => agent_views_path('segment_limit_message') if trace_row_display_limit_reached %>
+  <%= render :partial => 'segment_limit_message' if trace_row_display_limit_reached %>
 	<table width="100%">
 		<thead>
 		<tr>
@@ -15,6 +15,6 @@
 		</tr>
 		</thead>
 		
-		<%= render :partial => agent_views_path('sql_row'), :collection => @sample.sql_segments[0...trace_row_display_limit] %>
+		<%= render :partial => 'sql_row', :collection => @sample.sql_segments[0...trace_row_display_limit] %>
 	</table>
   <% end %>

data/ui/views/newrelic/_sql_row.rhtml

@@ -1,11 +1,16 @@
-<% segment = sql_row %>
+<% segment = object %>
 <tr class='<%= cycle('even_row', 'odd_row') %>'>
   <td align=right><%= timestamp(segment) %></td>
 	<td align=right><%= segment_duration_value(segment) %> </td>
     <td> <%= link_to_source(segment[:backtrace]) %> </td>
 	<td align=left>
 		<div class="sql_statement">
-			<small><%= line_wrap_sql(segment[:sql] || segment[:sql_obfuscated]) %></small>
+                  <small>
+                    <% if segment[:sql] %>
+                      <%= line_wrap_sql(segment[:sql] ) %>
+                    <% else %>
+                      Non-sql query: <%= segment.metric_name %> <%= line_wrap_sql(segment[:key]) %>
+                   <% end %></small>
 		</div>
 	</td>
-</tr>
+</tr>