newrelic_rpm 3.1.2 → 3.2.0.beta1

data/test/new_relic/transaction_sample/segment_test.rb

@@ -343,87 +343,12 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     assert_equal(s, s.find_segment(id_to_find))
   end
 
-  def test_explain_sql_no_sql
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    s.params = {:sql => nil}
-    assert_equal(nil, s.explain_sql)
-  end
-
-  def test_explain_sql_no_connection_config
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    s.params = {:sql => 'foo', :connection_config => nil}
-    assert_equal(nil, s.explain_sql)
-  end
-
-  def test_explain_sql_non_select
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    s.params = {:sql => 'foo', :connection_config => mock('config')}
-    assert_equal([], s.explain_sql)
-  end
-
-  def test_explain_sql_one_select_no_connection
-    # NB this test raises an error in the log, much as it might if a
-    # user supplied a config that was not valid. This is generally
-    # expected behavior - the get_connection method shouldn't allow
-    # errors to percolate up.
-    config = mock('config')
-    config.stubs(:[]).returns(nil)
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    s.params = {:sql => 'SELECT', :connection_config => config}
-    assert_equal([], s.explain_sql)
-  end
-
-  def test_explain_sql_one_select_with_mysql_connection
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    config = {:adapter => 'mysql'}
-    config.default('val')
-    s.params = {:sql => 'SELECT', :connection_config => config}
-    connection = mock('connection')
-    plan = {
-      "select_type"=>"SIMPLE", "key_len"=>nil, "table"=>"blogs", "id"=>"1",
-      "possible_keys"=>nil, "type"=>"ALL", "Extra"=>"", "rows"=>"2",
-      "ref"=>nil, "key"=>nil
-    }
-    result = mock('explain plan')
-    result.expects(:each_hash).yields(plan)
-    # two rows, two columns
-    connection.expects(:execute).with('EXPLAIN SELECT').returns(result)
-    NewRelic::TransactionSample.expects(:get_connection).with(config).returns(connection)
-    
-    assert_equal(plan.keys.sort, s.explain_sql[0].sort)
-    assert_equal(plan.values.compact.sort, s.explain_sql[1][0].compact.sort)    
-  end
-
-  def test_process_resultset
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    resultset = [["column"]]
-    assert_equal([nil, [["column"]]], s.process_resultset(resultset))
-  end
-
-  def test_explain_sql_one_select_with_pg_connection
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    config = {:adapter => 'postgresql'}
-    config.default('val')
-    s.params = {:sql => "select count(id) from blogs limit 1;", :connection_config => config}
-    connection = mock('connection')
-    plan = [{"QUERY PLAN"=>"Limit  (cost=11.75..11.76 rows=1 width=4)"},
-            {"QUERY PLAN"=>"  ->  Aggregate  (cost=11.75..11.76 rows=1 width=4)"},
-            {"QUERY PLAN"=>"        ->  Seq Scan on blogs  (cost=0.00..11.40 rows=140 width=4)"}]
-    connection.expects(:execute).returns(plan)
-    NewRelic::TransactionSample.expects(:get_connection).with(config).returns(connection)
-    assert_equal([['QUERY PLAN'],
-                  [["Limit  (cost=11.75..11.76 rows=1 width=4)"],
-                   ["  ->  Aggregate  (cost=11.75..11.76 rows=1 width=4)"],
-                   ["        ->  Seq Scan on blogs  (cost=0.00..11.40 rows=140 width=4)"]]],
-                 s.explain_sql)
-  end
-
   def test_explain_sql_raising_an_error
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     config = mock('config')
     s.params = {:sql => 'SELECT', :connection_config => config}
     connection = mock('connection')
-    NewRelic::TransactionSample.expects(:get_connection).with(config).raises(RuntimeError.new("whee"))
+    NewRelic::Agent::Database.expects(:get_connection).with(config).raises(RuntimeError.new("whee"))
     assert_nothing_raised do
       s.explain_sql
     end
@@ -438,25 +363,12 @@ class NewRelic::TransactionSample::SegmentTest < Test::Unit::TestCase
     s.params = params
     assert_equal(params, s.instance_eval { @params })
   end
-
-  def test_handle_exception_in_explain
-    s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
-    fake_error = Exception.new
-    fake_error.expects(:message).returns('a message')
-    NewRelic::Control.instance.log.expects(:error).with('Error getting query plan: a message')
-    # backtrace can be basically any string, just should get logged
-    NewRelic::Control.instance.log.expects(:debug).with(instance_of(String))
-    s.handle_exception_in_explain do
-      raise(fake_error)
-    end
-  end
-
+  
   def test_obfuscated_sql
-    sql = 'some sql'
+    sql = 'select * from table where id = 1'
     s = NewRelic::TransactionSample::Segment.new(Time.now, 'Custom/test/metric', nil)
     s[:sql] = sql
-    NewRelic::TransactionSample.expects(:obfuscate_sql).with(sql)
-    s.obfuscated_sql
+    assert_equal('select * from table where id = ?', s.obfuscated_sql)
   end
 
   def test_called_segments_equals

data/test/new_relic/transaction_sample_test.rb

@@ -8,7 +8,7 @@ class NewRelic::TransactionSampleTest < Test::Unit::TestCase
     @connection_stub = Mocha::Mockery.instance.named_mock('connection')
     @connection_stub.stubs(:execute).returns([['QUERY RESULT']])
 
-    NewRelic::TransactionSample.stubs(:get_connection).returns @connection_stub
+    NewRelic::Agent::Database.stubs(:get_connection).returns @connection_stub
     @t = make_sql_transaction(::SQL_STATEMENT, ::SQL_STATEMENT)
   end
 

data/test/test_helper.rb

@@ -46,7 +46,7 @@ require 'mocha/integration/test_unit/assertion_counter'
 class Test::Unit::TestCase
   include Mocha::API
 
-  # FIXME delete this trick when we stop supporting rails2.0.x
+  # we can delete this trick when we stop supporting rails2.0.x
   if ENV['BRANCH'] != 'rails20'
     # a hack because rails2.0.2 does not like double teardowns
     def teardown

data/ui/helpers/developer_mode_helper.rb

@@ -27,8 +27,8 @@ module NewRelic::DeveloperModeHelper
   def application_caller(trace)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
     trace.each do |trace_line|
-      file = file_and_line(trace_line).first
-      unless exclude_file_from_stack_trace?(file, false)
+      file, line, gem = file_and_line(trace_line)
+      unless file && exclude_file_from_stack_trace?(file, false, gem)
         return trace_line
       end
     end
@@ -38,8 +38,8 @@ module NewRelic::DeveloperModeHelper
   def application_stack_trace(trace, include_rails = false)
     trace = strip_nr_from_backtrace(trace) unless params[:show_nr]
     trace.reject do |trace_line|
-      file = file_and_line(trace_line).first
-      exclude_file_from_stack_trace?(file, include_rails)
+      file, line, gem = file_and_line(trace_line)
+      file && exclude_file_from_stack_trace?(file, include_rails, gem)
     end
   end
 
@@ -60,7 +60,7 @@ module NewRelic::DeveloperModeHelper
 
   def url_for_source(trace_line)
     file, line = file_and_line(trace_line)
-
+    return "#" if file.nil?
     begin
       file = Pathname.new(file).realpath
     rescue Errno::ENOENT
@@ -70,7 +70,6 @@ module NewRelic::DeveloperModeHelper
     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
@@ -230,8 +229,14 @@ module NewRelic::DeveloperModeHelper
   end
 
   private
+  # return three objects, the file path, the line in the file, and the gem the file belongs to 
+  # if found
   def file_and_line(stack_trace_line)
-    stack_trace_line.match(/(.*):(\d+)/)[1..2]
+    if stack_trace_line =~ /^(?:(\w+) \([\d.]*\) )?(.*):(\d+)/
+      return $2, $3, $1
+    else
+      return nil
+    end
   end
 
   def using_textmate?
@@ -262,9 +267,10 @@ module NewRelic::DeveloperModeHelper
     html
   end
 
-  def exclude_file_from_stack_trace?(file, include_rails)
+  def exclude_file_from_stack_trace?(file, include_rails, gem=nil)
     return false if include_rails
     return true if file !~ /\.(rb|java)/
+    return true if %w[rack activerecord activeresource activesupport actionpack railties].include? gem
     %w[/actionmailer/
              /activerecord
              /activeresource

data/ui/helpers/google_pie_chart.rb

@@ -1,6 +1,5 @@
 
 # A wrapper around the google charts service.
-# TODO consider making generic and open sourcing
 class GooglePieChart
   attr_accessor :width, :height, :color
 

data/vendor/gems/dependency_detection-0.0.1.build/lib/dependency_detection.rb

@@ -17,8 +17,13 @@ module DependencyDetection
     end
   end
 
+  def dependency_by_name(name)
+    @@items.find {|i| i.name == name }
+  end
+
   class Dependent
     attr_reader :executed
+    attr_reader :name
     def executed!
       @executed = true
     end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/mem_cache.rb

@@ -4,13 +4,13 @@ module NewRelic
     class MemCache < NewRelic::MetricParser::MetricParser
       def is_memcache?; true; end
 
-      # for MemCache metrics, the short name is actually
+      # for Memcache metrics, the short name is actually
       # the full name
       def short_name
-        name
+        'Memcache'
       end
       def developer_name
-        "MemCache #{segments[1..-1].join '/'}"
+        "Memcache #{segments[1..-1].join '/'}"
       end
 
       def all?
@@ -22,19 +22,19 @@ module NewRelic
       def legend_name
         case segments[1]
         when 'allWeb'
-          "MemCache"
+          "Memcache"
         when 'allOther'
-          "Non-web MemCache"
+          "Non-web Memcache"
         else
-          "MemCache #{operation} operations"
+          "Memcache #{operation} operations"
         end
       end
       def tooltip_name
         case segments[1]
         when 'allWeb'
-          "MemCache calls from web transactions"
+          "Memcache calls from web transactions"
         when 'allOther'
-          "MemCache calls from non-web transactions"
+          "Memcache calls from non-web transactions"
         else
           "MemCache #{operation} operations"
         end
@@ -43,11 +43,11 @@ module NewRelic
       def developer_name
         case segments[1]
         when 'allWeb'
-          "Web MemCache"
+          "Web Memcache"
         when 'allOther'
-          "Non-web MemCache"
+          "Non-web Memcache"
         else
-          "MemCache #{operation}"
+          "Memcache #{operation}"
         end
       end
     end

data/vendor/gems/metric_parser-0.1.0.pre1/lib/new_relic/metric_parser/view.rb

@@ -16,6 +16,8 @@ module NewRelic
           "#{file_name(segments[-2])} Template"
         when "Partial"
           "#{file_name(segments[-2])} Partial"
+        when "Collection"
+          "#{file_name(segments[-2])} Collection"
         when ".rhtml Processing"
           "ERB compilation"
         else
@@ -28,6 +30,8 @@ module NewRelic
           "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Template"
         when "Partial"
           "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Partial"
+        when "Collection"
+          "#{file_name(segments[1..-2].join(NewRelic::MetricParser::MetricParser::SEPARATOR))} Collection"
         when ".rhtml Processing"
           "ERB compilation"
         else

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.1.2
-  prerelease: 
+  version: 3.2.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Bill Kayser
@@ -12,12 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-07 00:00:00.000000000 -07:00
+date: 2011-09-23 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156970120 !ruby/object:Gem::Requirement
+  requirement: &2173242300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156970120
+  version_requirements: *2173242300
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156969640 !ruby/object:Gem::Requirement
+  requirement: &2173241580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,10 +36,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156969640
+  version_requirements: *2173241580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156969160 !ruby/object:Gem::Requirement
+  requirement: &2173239980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -47,7 +47,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156969160
+  version_requirements: *2173239980
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
   Inc (http://www.newrelic.com).  New Relic provides you with deep
@@ -91,6 +91,7 @@ files:
 - lib/new_relic/agent/browser_monitoring.rb
 - lib/new_relic/agent/busy_calculator.rb
 - lib/new_relic/agent/chained_call.rb
+- lib/new_relic/agent/database.rb
 - lib/new_relic/agent/error_collector.rb
 - lib/new_relic/agent/instrumentation.rb
 - lib/new_relic/agent/instrumentation/active_merchant.rb
@@ -125,6 +126,7 @@ files:
 - lib/new_relic/agent/samplers/memory_sampler.rb
 - lib/new_relic/agent/samplers/object_sampler.rb
 - lib/new_relic/agent/shim_agent.rb
+- lib/new_relic/agent/sql_sampler.rb
 - lib/new_relic/agent/stats_engine.rb
 - lib/new_relic/agent/stats_engine/metric_stats.rb
 - lib/new_relic/agent/stats_engine/samplers.rb
@@ -194,6 +196,7 @@ files:
 - test/new_relic/agent/beacon_configuration_test.rb
 - test/new_relic/agent/browser_monitoring_test.rb
 - test/new_relic/agent/busy_calculator_test.rb
+- test/new_relic/agent/database_test.rb
 - test/new_relic/agent/error_collector/notice_error_test.rb
 - test/new_relic/agent/error_collector_test.rb
 - test/new_relic/agent/instrumentation/active_record_instrumentation_test.rb
@@ -213,6 +216,7 @@ files:
 - test/new_relic/agent/rpm_agent_test.rb
 - test/new_relic/agent/sampler_test.rb
 - test/new_relic/agent/shim_agent_test.rb
+- test/new_relic/agent/sql_sampler_test.rb
 - test/new_relic/agent/stats_engine/metric_stats/harvest_test.rb
 - test/new_relic/agent/stats_engine/metric_stats_test.rb
 - test/new_relic/agent/stats_engine/samplers_test.rb
@@ -234,6 +238,7 @@ files:
 - test/new_relic/metric_spec_test.rb
 - test/new_relic/rack/all_test.rb
 - test/new_relic/rack/browser_monitoring_test.rb
+- test/new_relic/rack/developer_mode_helper_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
@@ -334,7 +339,7 @@ post_install_message: ! "\nPLEASE NOTE:\n\nDeveloper Mode is now a Rack middlewa
   to\nyour middleware stack.\n\nIf you are using JRuby, we recommend using at least
   version 1.4 or \nlater because of issues with the implementation of the timeout
   library.\n\nRefer to the README.md file for more information.\n\nPlease see http://github.com/newrelic/rpm/blob/master/CHANGELOG\nfor
-  a complete description of the features and enhancements available\nin version 3.1
+  a complete description of the features and enhancements available\nin version 3.2
   of the Ruby Agent.\n  \n"
 rdoc_options:
 - --line-numbers