newrelic_rpm 3.6.3.111 → 3.6.4.113.beta

data/test/new_relic/agent/agent/connect_test.rb

@@ -84,21 +84,21 @@ class NewRelic::Agent::Agent::ConnectTest < Test::Unit::TestCase
   end
 
   def test_connect_settings_have_environment_report
-    assert NewRelic::Agent.agent.connect_settings[:environment].detect{ |(k, v)|
+    NewRelic::Agent.agent.generate_environment_report
+    assert NewRelic::Agent.agent.connect_settings[:environment].detect{ |(k, _)|
       k == 'Gems'
     }, "expected connect_settings to include gems from environment"
   end
 
   def test_environment_for_connect_negative
     with_config(:send_environment_info => false) do
+      NewRelic::Agent.agent.generate_environment_report
       assert_equal [], NewRelic::Agent.agent.connect_settings[:environment]
     end
   end
 
   def test_connect_settings
-    control = mocked_control
     NewRelic::Agent.config.expects(:app_names)
-    self.expects(:environment_for_connect)
     keys = %w(pid host app_name language agent_version environment settings)
     value = connect_settings
     keys.each do |k|

data/test/new_relic/agent/agent/start_test.rb

@@ -51,6 +51,7 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
   end
 
   def test_check_config_and_start_agent_normal
+    self.expects(:generate_environment_report)
     self.expects(:start_worker_thread)
     self.expects(:install_exit_handler)
     with_config(:sync_startup => false, :monitor_mode => true, :license_key => 'a' * 40) do
@@ -59,6 +60,7 @@ class NewRelic::Agent::Agent::StartTest < Test::Unit::TestCase
   end
 
   def test_check_config_and_start_agent_sync
+    self.expects(:generate_environment_report)
     self.expects(:connect_in_foreground)
     self.expects(:start_worker_thread)
     self.expects(:install_exit_handler)

data/test/new_relic/agent/configuration/manager_test.rb

@@ -213,6 +213,16 @@ module NewRelic::Agent::Configuration
       assert_equal false, called
     end
 
+    def test_high_security_enables_strip_exception_messages
+      @manager.apply_config(:high_security => true)
+
+      assert_truthy @manager[:'strip_exception_messages.enabled']
+    end
+
+    def test_stripped_exceptions_whitelist_contains_only_valid_exception_classes
+      @manager.apply_config(:'strip_exception_messages.whitelist' => 'LocalJumpError, NonExistentException')
+      assert_equal [LocalJumpError], @manager.stripped_exceptions_whitelist
+    end
 
     def test_should_log_when_applying
       expects_logging(:debug, anything, includes("asdf"))

data/test/new_relic/agent/error_collector_test.rb

@@ -36,7 +36,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     assert_equal '', err.params[:request_uri]
     assert_equal '', err.params[:request_referer]
     assert_equal 'path', err.path
-    assert_equal 'Error', err.exception_class
+    assert_equal 'Error', err.exception_name_for_collector
+    assert_equal String, err.exception_class
   end
 
   def test_simple
@@ -50,10 +51,11 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
     err = errors.first
     assert_equal 'message', err.message
     assert_equal 'y', err.params[:request_params][:x]
-    assert err.params[:request_uri] == '/myurl/'
-    assert err.params[:request_referer] == "test_referer"
-    assert err.path == 'path'
-    assert err.exception_class == 'StandardError'
+    assert_equal '/myurl/', err.params[:request_uri]
+    assert_equal 'test_referer', err.params[:request_referer]
+    assert_equal 'path', err.path
+    assert_equal StandardError, err.exception_class
+    assert_equal 'StandardError', err.exception_name_for_collector
 
     # the collector should now return an empty array since nothing
     # has been added since its last harvest
@@ -183,10 +185,8 @@ class NewRelic::Agent::ErrorCollectorTest < Test::Unit::TestCase
       old_errors = []
       errors = @error_collector.harvest_errors([])
 
-      assert_equal('YO SQL BAD: serect * flom test where foo = ?',
-                   errors[0].message)
-      assert_equal('YO SQL BAD: serect * flom test where foo in (?,?,?,?,?)',
-                   errors[1].message)
+      assert_equal(NewRelic::NoticedError::STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE, errors[0].message)
+      assert_equal(NewRelic::NoticedError::STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE, errors[1].message)
     end
   end
 

data/test/new_relic/agent/method_tracer_test.rb

@@ -92,9 +92,16 @@ class NewRelic::Agent::MethodTracerTest < Test::Unit::TestCase
     assert_equal '12345', TestModuleWithLog.other_method
   end
 
+  def test_record_metrics_does_not_raise_outside_transaction
+    assert_nothing_raised do
+      NewRelic::Agent::MethodTracer::InstanceMethods::TraceExecutionScoped.record_metrics('a', ['b'], 12, 10, :metric => true)
+    end
+    expected = { :call_count => 1, :total_call_time => 12, :total_exclusive_time => 10 }
+    assert_metrics_recorded('a' => expected, 'b' => expected)
+  end
+
   def test_trace_execution_scoped_records_metric_data
     metric = "hello"
-    freeze_time
     self.class.trace_execution_scoped(metric) do
       advance_time 0.05
     end

data/test/new_relic/agent/request_sampler_test.rb

@@ -132,6 +132,16 @@ class NewRelic::Agent::RequestSamplerTest < Test::Unit::TestCase
     end
   end
 
+  def test_limits_total_sample_count_even_without_throttle
+    freeze_time
+    with_sampler_config( :'request_sampler.sample_rate_ms' => 60_000 ) do
+      15.times do
+        @event_listener.notify( :transaction_finished, 'Controller/foo/bar', 0.1)
+        advance_time(60.001)
+      end
+      assert_equal(10, @sampler.samples.size)
+    end
+  end
 
   #
   # Helpers

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -120,10 +120,8 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
     in_transaction('scopey') do
       @engine.record_metrics('foo', 42)
     end
-    unscoped_stats = @engine.get_stats('foo', false)
-    scoped_stats = @engine.get_stats('foo', true, true, 'scopey')
-    assert_equal(1, unscoped_stats.call_count)
-    assert_equal(0, scoped_stats.call_count)
+    assert_metrics_recorded('foo' => { :call_count => 1, :total_call_time => 42 })
+    assert_metrics_not_recorded([['foo', 'scopey']])
   end
 
   def test_record_metrics_records_to_scoped_metric_if_requested
@@ -193,4 +191,42 @@ class NewRelic::Agent::MetricStatsTest < Test::Unit::TestCase
 
     assert_equal 1, @engine.lookup_stats('foo').call_count
   end
+
+  def test_record_supportability_metric_timed_records_duration_of_block
+    freeze_time
+    2.times do
+      @engine.record_supportability_metric_timed('foo/bar') { advance_time(2.0) }
+    end
+
+    assert_metrics_recorded(['Supportability/foo/bar'] => {
+      :call_count => 2,
+      :total_call_time => 4.0
+    })
+  end
+
+  def test_record_supportability_metric_timed_does_not_break_when_block_raises
+    begin
+      freeze_time
+      @engine.record_supportability_metric_timed('foo/bar') do
+        advance_time(2.0)
+        1 / 0
+      end
+    rescue ZeroDivisionError
+      nil
+    end
+
+    assert_metrics_recorded(['Supportability/foo/bar'] => {
+      :call_count => 1,
+      :total_call_time => 2.0
+    })
+  end
+
+  def test_record_supportability_metric_count_records_counts_only
+    @engine.record_supportability_metric_count('foo/bar', 1)
+    @engine.record_supportability_metric_count('foo/bar', 42)
+    assert_metrics_recorded(['Supportability/foo/bar'] => {
+      :call_count => 42,
+      :total_call_time => 0
+    })
+  end
 end

data/test/new_relic/agent/transaction_test.rb

@@ -215,4 +215,27 @@ class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
 
     assert_equal 2.1, options[:web_duration]
   end
+
+  def test_parent_returns_parent_transaction_if_there_is_one
+    txn, outer_txn = nil
+    in_transaction('outer') do
+      outer_txn = NewRelic::Agent::Transaction.current
+      in_transaction('inner') do
+        txn = NewRelic::Agent::Transaction.parent
+      end
+    end
+    assert_same(outer_txn, txn)
+  end
+
+  def test_parent_returns_nil_if_there_is_no_parent
+    txn = 'this is a non-nil placeholder'
+    in_transaction('outer') do
+      txn = NewRelic::Agent::Transaction.parent
+    end
+    assert_nil(txn)
+  end
+
+  def test_parent_returns_nil_if_outside_transaction_entirely
+    assert_nil(NewRelic::Agent::Transaction.parent)
+  end
 end

data/test/new_relic/noticed_error_test.rb

@@ -4,6 +4,10 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
+class NoticedErrorTestException < StandardError; end
+class ParentException < Exception; end
+class ChildException < ParentException; end
+
 class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
   def setup
     @path = 'foo/bar/baz'
@@ -12,10 +16,10 @@ class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
   end
 
   def test_to_collector_array
-    e = Exception.new('test exception')
+    e = NoticedErrorTestException.new('test exception')
     error = NewRelic::NoticedError.new(@path, @params, e, @time)
     expected = [
-      (@time.to_f * 1000).round, @path, 'test exception', 'Exception', @params
+      (@time.to_f * 1000).round, @path, 'test exception', 'NoticedErrorTestException', @params
     ]
     assert_equal expected, error.to_collector_array
   end
@@ -33,4 +37,82 @@ class NewRelic::Agent::NoticedErrorTest < Test::Unit::TestCase
     error = NewRelic::NoticedError.new(@path, @params, e, @time)
     assert_equal(String, error.message.class)
   end
+
+  def test_strips_message_from_exceptions_in_high_security_mode
+    with_config(:high_security => true) do
+      e = NoticedErrorTestException.new('test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_equal NewRelic::NoticedError::STRIPPED_EXCEPTION_REPLACEMENT_MESSAGE, error.message
+    end
+  end
+
+  def test_permits_messages_from_whitelisted_exceptions_in_high_security_mode
+    with_config(:'strip_exception_messages.whitelist' => 'NoticedErrorTestException') do
+      e = NoticedErrorTestException.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_equal 'whitelisted test exception', error.message
+    end
+  end
+
+  def test_whitelisted_returns_nil_with_an_empty_whitelist
+    with_config(:'strip_exception_messages.whitelist' => '') do
+      e = NoticedErrorTestException.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_falsy error.whitelisted?
+    end
+  end
+
+  def test_whitelisted_returns_nil_when_error_is_not_in_whitelist
+    with_config(:'strip_exception_messages.whitelist' => 'YourErrorIsInAnotherCastle') do
+      e = NoticedErrorTestException.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_falsy error.whitelisted?
+    end
+  end
+
+  def test_whitelisted_is_true_when_error_is_in_whitelist
+    with_config(:'strip_exception_messages.whitelist' => 'OtherException,NoticedErrorTestException') do
+      test_exception_class = NoticedErrorTestException
+      e = test_exception_class.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_truthy error.whitelisted?
+    end
+  end
+
+  def test_whitelisted_ignores_nonexistent_exception_types_in_whitelist
+    with_config(:'strip_exception_messages.whitelist' => 'NonExistent::Exception,NoticedErrorTestException') do
+      test_exception_class = NoticedErrorTestException
+      e = test_exception_class.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_truthy error.whitelisted?
+    end
+  end
+
+  def test_whitelisted_is_true_when_an_exceptions_ancestor_is_whitelisted
+    with_config(:'strip_exception_messages.whitelist' => 'ParentException') do
+      e = ChildException.new('whitelisted test exception')
+      error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+      assert_truthy error.whitelisted?
+    end
+  end
+
+  def test_exception_name_for_collector_returns_error_for_non_exceptions
+    error = NewRelic::NoticedError.new(@path, @params, nil, @time)
+
+    assert_equal 'Error', error.exception_name_for_collector
+  end
+
+  def test_exception_name_for_collector_returns_class_name_for_exceptions
+    e = NoticedErrorTestException.new('test exception')
+    error = NewRelic::NoticedError.new(@path, @params, e, @time)
+
+    assert_equal 'NoticedErrorTestException', error.exception_name_for_collector
+  end
 end

data/test/test_helper.rb

@@ -86,7 +86,8 @@ def default_service(stubbed_method_overrides = {})
     :error_data => nil,
     :transaction_sample_data => nil,
     :sql_trace_data => nil,
-    :get_agent_commands => []
+    :get_agent_commands => [],
+    :analytic_event_data => nil
   }
 
   service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))
@@ -108,21 +109,6 @@ class Test::Unit::TestCase
   end
 end
 
-def with_config(config_hash, opts={})
-  opts = { :level => 0, :do_not_cast => false }.merge(opts)
-  if opts[:do_not_cast]
-    config = config_hash
-  else
-    config = NewRelic::Agent::Configuration::DottedHash.new(config_hash)
-  end
-  NewRelic::Agent.config.apply_config(config, opts[:level])
-  begin
-    yield
-  ensure
-    NewRelic::Agent.config.remove_config(config)
-  end
-end
-
 def with_verbose_logging
   orig_logger = NewRelic::Agent.logger
   $stderr.puts '', '---', ''

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_rpm
 version: !ruby/object:Gem::Version
-  version: 3.6.3.111
-  prerelease: 
+  version: 3.6.4.113.beta
+  prerelease: 10
 platform: ruby
 authors:
 - Jason Clark
@@ -41,7 +41,7 @@ cert_chain:
   cHUySWFQWE92bTNUOEc0TzZxWnZobkxoL1VpZW4rK0RqOGVGQmVjVFBvTThw
   VmpLM3BoNQpuL0V3dVpDY0U2Z2h0Q0NNCi0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies: []
 description: ! 'New Relic is a performance management system, developed by New Relic,
 
@@ -531,9 +531,14 @@ files:
 - lib/new_relic/build.rb
 homepage: http://www.github.com/newrelic/rpm
 licenses: []
-post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.3 ##\n\n*
-  Better Sinatra Support\n\n  A number of improvements have been made to our Sinatra
-  instrumentation.\n  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent\n\n
+post_install_message: ! "# New Relic Ruby Agent Release Notes #\n\n## v3.6.4 ##\n\n*
+  Exception Whitelist\n\n  We've improved exception message handling for applications
+  running in\n  high security mode. Enabling 'high_security' now removes exception
+  messages\n  entirely rather than simply obfuscating any SQL.\n\n  By default this
+  feature affects all exceptions, though you can configure a\n  whitelist of exceptions
+  whose messages should be left intact.\n\n  More details: https://newrelic.com/docs/ruby/ruby-agent-configuration\n\n##
+  3.6.3 ##\n\n* Better Sinatra Support\n\n  A number of improvements have been made
+  to our Sinatra instrumentation.\n  More details: https://newrelic.com/docs/ruby/sinatra-support-in-the-ruby-agent\n\n
   \ Sinatra instrumentation has been updated to more accurately reflect the final\n
   \ route that was actually executed, taking pass and conditions into account.\n\n
   \ New Relic middlewares for error collection, real user monitoring, and cross\n