newrelic_rpm 3.1.0.djlogging → 3.1.0.djlogging2

data/lib/new_relic/delayed_job_injection.rb

@@ -16,6 +16,7 @@ DependencyDetection.defer do
     NewRelic::Control.instance.log.info("Attempting to install Delayed Job initialization hook")
     value = defined?(::Delayed) && defined?(::Delayed::Worker)
     NewRelic::Control.instance.log.info("Delayed Job and Delayed Worker instrumentation #{value ? 'is' : 'is not'} being installed")
+    value
   end
 
   executes do

data/lib/new_relic/rack/developer_mode.rb

@@ -224,6 +224,11 @@ module NewRelic
         @sample_controller_name = metric_parser.controller_name
         @sample_action_name = metric_parser.action_name
 
+        @sql_segments = @sample.sql_segments
+        if params['d']
+          @sql_segments.sort!{|a,b| b.duration <=> a.duration }
+        end
+        
         render(:show_sample)
       end
 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 1
     TINY  = 0
-    BUILD = 'djlogging' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'djlogging2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
 

data/newrelic_rpm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "3.1.0.djlogging"
+  s.version = "3.1.0.djlogging2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Justin George"]
-  s.date = %q{2011-05-26}
+  s.date = %q{2011-05-31}
   s.description = %q{New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs
@@ -186,6 +186,7 @@ http://github.com/newrelic/rpm/
     "test/new_relic/metric_data_test.rb",
     "test/new_relic/metric_spec_test.rb",
     "test/new_relic/rack/all_test.rb",
+    "test/new_relic/rack/developer_mode_test.rb",
     "test/new_relic/stats_test.rb",
     "test/new_relic/transaction_analysis/segment_summary_test.rb",
     "test/new_relic/transaction_analysis_test.rb",

data/test/new_relic/rack/developer_mode_test.rb

@@ -0,0 +1,43 @@
+# ENV['SKIP_RAILS'] = 'true'
+require File.expand_path(File.join(File.dirname(__FILE__),'..', '..',
+                                   'test_helper'))
+require 'rack/test'
+require 'new_relic/rack/developer_mode'
+
+ENV['RACK_ENV'] = 'test'
+
+class DeveloperModeTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+  include TransactionSampleTestHelper
+
+  def app
+    mock_app = lambda { |env| [500, {}, "Don't touch me!"] }
+    NewRelic::Rack::DeveloperMode.new(mock_app)
+  end
+  
+  def setup
+    @sampler = NewRelic::Agent::TransactionSampler.new
+    run_sample_trace_on(@sampler, '/here')
+    run_sample_trace_on(@sampler, '/there')
+    run_sample_trace_on(@sampler, '/somewhere')
+    NewRelic::Agent.instance.stubs(:transaction_sampler).returns(@sampler)
+  end
+  
+  def test_index_displays_all_samples
+    get '/newrelic'
+    
+    assert last_response.ok?
+    assert last_response.body.include?('/here')
+    assert last_response.body.include?('/there')
+    assert last_response.body.include?('/somewhere')    
+  end
+
+  def test_show_sample_summary_displays_sample_details
+    get "/newrelic/show_sample_summary?id=#{@sampler.samples[0].sample_id}"
+    
+    assert last_response.ok?
+    assert last_response.body.include?('/here')
+    assert last_response.body.include?('SandwichesController')
+    assert last_response.body.include?('index')    
+  end  
+end

data/test/test_helper.rb

@@ -123,4 +123,22 @@ module TransactionSampleTestHelper
 
     sampler.samples[0]
   end
+
+  def run_sample_trace_on(sampler, path='/path')
+    sampler.notice_first_scope_push Time.now.to_f
+    sampler.notice_transaction path, path, {}
+    sampler.notice_push_scope "Controller/sandwiches/index"
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", nil, 0)
+    sampler.notice_push_scope "ab"
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", nil, 0)
+    yield sampler if block_given?
+    sampler.notice_pop_scope "ab"
+    sampler.notice_push_scope "lew"
+    sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", nil, 0)
+    sampler.notice_pop_scope "lew"
+    sampler.notice_pop_scope "Controller/sandwiches/index"
+    sampler.notice_scope_empty
+    sampler.samples[0]
+  end
+
 end

data/ui/views/newrelic/_show_sample_sql.rhtml

@@ -6,15 +6,19 @@
     so that the rows logger is loaded first.  
   <% else %>
   <%= render :partial => 'segment_limit_message' if trace_row_display_limit_reached %>
-	<table width="100%">
+	<table width="100%" class="segment_list_table">
 		<thead>
 		<tr>
-			<td>Timestamp</td>
-			<td colspan="2">Duration</td>
+			<td>
+                          <%= link_to_if params['d'], "Timestamp", "show_sample_sql?id=#{sample.sample_id}" %>
+                        </td>
+			<td colspan="2">
+                          <%= link_to_if !params['d'], "Duration", "show_sample_sql?id=#{sample.sample_id}&d=y" %>
+                        </td>
 			<td>SQL</td>
 		</tr>
 		</thead>
 		
-		<%= render :partial => 'sql_row', :collection => @sample.sql_segments[0...trace_row_display_limit] %>
+                <%= render :partial => 'sql_row', :collection => @sql_segments[0...trace_row_display_limit] %>
 	</table>
   <% end %>

data/ui/views/newrelic/file/stylesheets/style.css

@@ -310,6 +310,12 @@ div.flash.notice
 	text-decoration: underline;
 }
 
+.segment_list_table thead a
+{
+        color: white;
+        text-decoration: underline;
+}
+
 .application_stack_trace, .full_stack_trace
 {	
 	font-family: monospace;

data/ui/views/newrelic/show_sample.rhtml

@@ -70,9 +70,10 @@
 		<%= show_view_link 'SQL', 'show_sample_sql' %>
 	</div>
 	<br/>
+        
 	<%= %w[show_sample_summary show_sample_sql show_sample_detail].collect do |p|
 		options = {:align => 'center', :id => p}
-		options[:style] = 'display: none' unless p == params['action']
+		options[:style] = 'display: none' unless @req.path.include?(p)
 		content_tag('div', render(:partial => p), options)
 	end.join(' ') %>
 	<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 886112865
+  hash: -511226757
   prerelease: true
   segments: 
   - 3
   - 1
   - 0
-  - djlogging
-  version: 3.1.0.djlogging
+  - djlogging2
+  version: 3.1.0.djlogging2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 -07:00
+date: 2011-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -243,6 +243,7 @@ files:
 - test/new_relic/metric_data_test.rb
 - test/new_relic/metric_spec_test.rb
 - test/new_relic/rack/all_test.rb
+- test/new_relic/rack/developer_mode_test.rb
 - test/new_relic/stats_test.rb
 - test/new_relic/transaction_analysis/segment_summary_test.rb
 - test/new_relic/transaction_analysis_test.rb