newrelic_rpm 3.7.0.174.beta → 3.7.0.177

data/test/new_relic/agent/audit_logger_test.rb

@@ -8,9 +8,8 @@ require 'new_relic/agent/null_logger'
 
 class AuditLoggerTest < Test::Unit::TestCase
   def setup
-    @config = {
-      :'audit_log.enabled' => true
-    }
+    NewRelic::Agent.config.apply_config(:'audit_log.enabled' => true)
+
     @uri = "http://really.notreal"
     @marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
     @hostname = 'dummyhost'
@@ -26,7 +25,7 @@ class AuditLoggerTest < Test::Unit::TestCase
 
   def setup_fake_logger
     @fakelog = StringIO.new
-    @logger = NewRelic::Agent::AuditLogger.new(@config)
+    @logger = NewRelic::Agent::AuditLogger.new
     @logger.stubs(:ensure_log_path).returns(@fakelog)
   end
 
@@ -37,22 +36,24 @@ class AuditLoggerTest < Test::Unit::TestCase
   end
 
   def test_never_setup_if_disabled
-    config = { :'audit_log.enabled' => false }
-    logger = NewRelic::Agent::AuditLogger.new(config)
-    logger.log_request(@uri, "hi there", @marshaller)
-    assert(!logger.setup?, "Expected logger to not have been setup")
+    with_config(:'audit_log.enabled' => false) do
+      logger = NewRelic::Agent::AuditLogger.new
+      logger.log_request(@uri, "hi there", @marshaller)
+      assert(!logger.setup?, "Expected logger to not have been setup")
+    end
   end
 
   def test_never_prepare_if_disabled
-    config = { :'audit_log.enabled' => false }
-    logger = NewRelic::Agent::AuditLogger.new(config)
-    marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
-    marshaller.expects(:prepare).never
-    logger.log_request(@uri, "hi there", @marshaller)
+    with_config(:'audit_log.enabled' => false) do
+      logger = NewRelic::Agent::AuditLogger.new
+      marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
+      marshaller.expects(:prepare).never
+      logger.log_request(@uri, "hi there", @marshaller)
+    end
   end
 
   def test_log_formatter
-    formatter = NewRelic::Agent::AuditLogger.new(@config).log_formatter
+    formatter = NewRelic::Agent::AuditLogger.new.log_formatter
     time = '2012-01-01 00:00:00'
     msg = 'hello'
     result = formatter.call(Logger::INFO, time, 'bleh', msg)
@@ -61,16 +62,17 @@ class AuditLoggerTest < Test::Unit::TestCase
   end
 
   def test_ensure_path_returns_nil_with_bogus_path
-    opts = { :'audit_log.path' => '/really/really/not/a/path' }
-    FileUtils.stubs(:mkdir_p).raises(SystemCallError, "i'd rather not")
-    logger = NewRelic::Agent::AuditLogger.new(@config.merge(opts))
-    assert_nil(logger.ensure_log_path)
+    with_config(:'audit_log.path' => '/really/really/not/a/path') do
+      FileUtils.stubs(:mkdir_p).raises(SystemCallError, "i'd rather not")
+      logger = NewRelic::Agent::AuditLogger.new
+      assert_nil(logger.ensure_log_path)
+    end
   end
 
   def test_setup_logger_creates_null_logger_when_ensure_path_fails
     null_logger = NewRelic::Agent::NullLogger.new
     NewRelic::Agent::NullLogger.expects(:new).returns(null_logger)
-    logger = NewRelic::Agent::AuditLogger.new(@config)
+    logger = NewRelic::Agent::AuditLogger.new
     logger.stubs(:ensure_log_path).returns(nil)
     assert_nothing_raised do
       logger.setup_logger
@@ -79,7 +81,7 @@ class AuditLoggerTest < Test::Unit::TestCase
   end
 
   def test_log_request_captures_system_call_errors
-    logger = NewRelic::Agent::AuditLogger.new(@config)
+    logger = NewRelic::Agent::AuditLogger.new
     dummy_sink = StringIO.new
     dummy_sink.stubs(:write).raises(SystemCallError, "nope")
     logger.stubs(:ensure_log_path).returns(dummy_sink)

data/test/new_relic/agent/autostart_test.rb

@@ -42,8 +42,9 @@ class AutostartTest < Test::Unit::TestCase
   db:migrate db:migrate:status db:rollback db:schema:cache:clear
   db:schema:cache:dump db:schema:dump db:schema:load db:seed db:setup
   db:structure:dump db:version doc:app log:clear middleware notes notes:custom
-  rails:template rails:update routes secret spec spec:controllers spec:helpers
-  spec:models spec:rcov stats test test:all test:all:db test:recent test:single
+  rails:template rails:update routes secret spec spec:features spec:requests
+  spec:controllers spec:helpers spec:models spec:views spec:routing
+  spec:rcov stats test test:all test:all:db test:recent test:single
   test:uncommitted time:zones:all tmp:clear tmp:create |.each do |task|
 
     define_method("test_agent_wont_autostart_if_top_level_rake_task_is_#{task}") do

data/test/new_relic/agent/commands/agent_command_router_test.rb

@@ -3,6 +3,8 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','data_container_tests'))
+
 require 'new_relic/agent/commands/agent_command_router'
 require 'new_relic/agent/commands/xray_session'
 
@@ -36,8 +38,9 @@ class AgentCommandRouterTest < Test::Unit::TestCase
     @service = stub
     NewRelic::Agent.agent.stubs(:service).returns(@service)
     @calls = []
+    @events = NewRelic::Agent::EventListener.new
 
-    @agent_commands = NewRelic::Agent::Commands::AgentCommandRouter.new
+    @agent_commands = NewRelic::Agent::Commands::AgentCommandRouter.new(@events)
     @agent_commands.handlers["bazzle"] = Proc.new { |args| handle_bazzle_command(args) }
     @agent_commands.handlers["boom"]   = Proc.new { |args| handle_boom_command(args) }
   end
@@ -46,6 +49,22 @@ class AgentCommandRouterTest < Test::Unit::TestCase
     agent_commands.backtrace_service.worker_thread.join if agent_commands.backtrace_service.worker_thread
   end
 
+  # Helpers for DataContainerTests
+
+  def create_container
+    @agent_commands
+  end
+
+  def max_data_items
+    1
+  end
+
+  def populate_container(container, n)
+    start_profile('duration' => 1.0)
+    advance_time(1.1)
+    agent_commands.backtrace_service.worker_thread.join if agent_commands.backtrace_service.worker_thread
+  end
+
   # General command routing
 
   def test_check_for_and_handle_agent_commands_dispatches_command
@@ -108,29 +127,27 @@ class AgentCommandRouterTest < Test::Unit::TestCase
   # Harvesting tests
 
   if NewRelic::Agent::Threading::BacktraceService.is_supported?
+    include NewRelic::BasicDataContainerTests
 
-    DISCONNECTING = true
-    NOT_DISCONNECTING = false
-
-    def test_harvest_data_to_send_not_started
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
-      assert_equal({}, result)
+    def test_harvest_not_started
+      result = agent_commands.harvest!
+      assert_equal([], result)
     end
 
-    def test_harvest_data_to_send_with_profile_in_progress
+    def test_harvest_with_profile_in_progress
       start_profile('duration' => 1.0)
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
-      assert_equal({}, result)
+      result = agent_commands.harvest!
+      assert_equal([], result)
     end
 
-    def test_harvest_data_to_send_with_profile_completed
+    def test_harvest_with_profile_completed
       start_profile('duration' => 1.0)
 
       advance_time(1.1)
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
+      result = agent_commands.harvest!
 
-      assert_not_nil result[:profile_data]
+      assert_not_empty result
     end
 
     def test_can_stop_multiple_times_safely
@@ -139,8 +156,8 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       advance_time(1.1)
       agent_commands.thread_profiler_session.stop(true)
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
-      assert_not_nil result[:profile_data]
+      result = agent_commands.harvest!
+      assert_not_empty result
     end
 
     def test_transmits_after_forced_stop
@@ -148,34 +165,36 @@ class AgentCommandRouterTest < Test::Unit::TestCase
 
       agent_commands.thread_profiler_session.stop(true)
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
-      assert_not_nil result[:profile_data]
+      result = agent_commands.harvest!
+      assert_not_empty result
     end
 
-    def test_harvest_data_to_send_with_no_profile_disconnecting
-      result = agent_commands.harvest_data_to_send(DISCONNECTING)
-      assert_nil result[:profile_data]
+    def test_harvest_following_before_shutdown_with_no_profile
+      @events.notify(:before_shutdown)
+      result = agent_commands.harvest!
+      assert_empty result
     end
 
-    def test_harvest_data_to_send_with_profile_in_progress_but_disconnecting
+    def test_harvest_following_before_shutdown_with_active_profile
       start_profile('duration' => 1.0)
 
-      result = agent_commands.harvest_data_to_send(DISCONNECTING)
-      assert_not_nil result[:profile_data]
+      @events.notify(:before_shutdown)
+      result = agent_commands.harvest!
+      assert_not_empty result
     end
 
-    def test_harvest_data_to_send_with_xray_sessions_in_progress
+    def test_harvest_with_xray_sessions_in_progress
       start_xray_session(123)
       start_xray_session(456)
 
       sample_on_profiles
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
+      result = agent_commands.harvest!
 
-      assert_equal 2, result[:profile_data].length
+      assert_equal 2, result.length
     end
 
-    def test_harvest_data_to_send_with_xray_sessions_and_thread_profile_in_progress
+    def test_harvest_with_xray_sessions_and_thread_profile_in_progress
       start_xray_session(123)
       start_xray_session(456)
 
@@ -183,12 +202,12 @@ class AgentCommandRouterTest < Test::Unit::TestCase
 
       sample_on_profiles
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
+      result = agent_commands.harvest!
 
-      assert_equal 2, result[:profile_data].length
+      assert_equal 2, result.length
     end
 
-    def test_harvest_data_to_send_with_xray_sessions_and_completed_thread_profile
+    def test_harvest_with_xray_sessions_and_completed_thread_profile
       start_xray_session(123)
       start_xray_session(456)
 
@@ -197,9 +216,9 @@ class AgentCommandRouterTest < Test::Unit::TestCase
       sample_on_profiles
       advance_time(1.1)
 
-      result = agent_commands.harvest_data_to_send(NOT_DISCONNECTING)
+      result = agent_commands.harvest!
 
-      assert_equal 3, result[:profile_data].length
+      assert_equal 3, result.length
     end
 
   end

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

@@ -35,8 +35,14 @@ module NewRelic::Agent::Configuration
       NewRelic::Control.instance.local_env.stubs(:discovered_dispatcher).returns(:unicorn)
 
       @default_source.keys.each do |key|
-        default_value_class = get_config_value_class(fetch_config_value(key))
-        assert_equal @defaults[key][:type], default_value_class, "Config setting #{key} does not have the correct type."
+        actual_type = get_config_value_class(fetch_config_value(key))
+        expected_type = @defaults[key][:type]
+
+        if @defaults[key][:allow_nil]
+          assert [NilClass, expected_type].include?(actual_type), "Default value for #{key} should be NilClass or #{expected_type}, is #{actual_type}."
+        else
+          assert_equal expected_type, actual_type, "Default value for #{key} should be #{expected_type}, is #{actual_type}."
+        end
       end
     end
 

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

@@ -10,7 +10,9 @@ require 'new_relic/agent/threading/backtrace_service'
 module NewRelic::Agent::Configuration
   class ManagerTest < Test::Unit::TestCase
     def setup
-      @manager = NewRelic::Agent::Configuration::Manager.new
+      # Defaults look up against the shared config, so reset and use it
+      NewRelic::Agent.reset_config
+      @manager = NewRelic::Agent.config
     end
 
     def test_should_use_indifferent_access
@@ -102,6 +104,8 @@ module NewRelic::Agent::Configuration
       manager.apply_config({:license_key => 'wrong'}, 1)
 
       assert_equal 'right', manager['license_key']
+    ensure
+      ENV.delete('NEWRELIC_LICENSE_KEY')
     end
 
     def test_config_values_should_be_memoized

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

@@ -0,0 +1,57 @@
+# encoding: utf-8
+# This file is distributed under New Relic's license terms.
+# See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
+
+require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','test_helper'))
+
+class OrphanedConfigTest < Test::Unit::TestCase
+  include NewRelic::TestHelpers::FileSearching
+
+  def setup
+    @default_keys = ::NewRelic::Agent::Configuration::DEFAULTS.keys
+  end
+
+  def test_all_agent_config_keys_are_declared_in_default_source
+    non_test_files = all_rb_files.reject { |filename| filename.include? 'test.rb' }
+
+    non_test_files.each do |file|
+      lines = File.read(file).split("\n")
+
+      lines.each_with_index do |line, index|
+        config_match = line.match(/Agent\.config\[:['"]?([a-z\._]+)['"]?\]/)
+        next unless config_match
+
+        config_keys = config_match.captures.map do |key|
+          key.gsub("'", "").to_sym
+        end
+
+        config_keys.each do |key|
+          msg = "#{file}:#{index} - Configuration key #{key} is not described in default_source.rb.\n"
+          assert @default_keys.include?(key), msg
+        end
+      end
+    end
+  end
+
+  def test_all_default_source_config_keys_are_used_in_the_agent
+    non_test_files = all_rb_files.reject { |filename| filename.include? 'test.rb' }
+
+    non_test_files.each do |file|
+      lines = File.read(file).split("\n")
+
+      lines.each_with_index do |line, index|
+        captures = []
+        captures << line.scan(/Agent\.config\[:['"]?([a-z\._]+)['"]?\]/)
+        captures << line.scan(/register_callback\(:['"]?([a-z\._]+)['"]?\)/)
+
+        next if captures.empty?
+
+        captures.flatten.map do |key|
+          @default_keys.delete key.gsub("'", "").to_sym
+        end
+      end
+    end
+
+    assert_empty @default_keys
+  end
+end

data/test/new_relic/agent/cross_app_monitor_test.rb

@@ -40,7 +40,7 @@ module NewRelic::Agent
       }
 
       NewRelic::Agent.config.apply_config( @config )
-      @monitor.register_event_listeners
+      @monitor.on_finished_configuring
       NewRelic::Agent::TransactionState.get.request_guid = TRANSACTION_GUID
     end
 
@@ -101,19 +101,21 @@ module NewRelic::Agent
     end
 
     def test_doesnt_add_header_if_no_id_on_agent
-      # Since a +nil+ will make it fall back to the config installed in setup,
-      # we need to remove that first in order to test the no-id case
-      newconfig = @config.merge( :cross_process_id => nil )
-      NewRelic::Agent.config.remove_config( @config )
-
-      with_config( newconfig ) do
+      with_config( :cross_process_id => '' ) do
         when_request_runs
         assert_nil response_app_data
       end
     end
 
     def test_doesnt_add_header_if_config_disabled
-      with_config(:"cross_application_tracer.enabled" => false) do
+      with_config(:"cross_application_tracer.enabled" => false, :cross_application_tracing => false) do
+        when_request_runs
+        assert_nil response_app_data
+      end
+    end
+
+    def test_doesnt_add_header_if_missing_encoding_key
+      with_config( :encoding_key => '' ) do
         when_request_runs
         assert_nil response_app_data
       end
@@ -178,24 +180,6 @@ module NewRelic::Agent
       when_request_runs(for_id(''))
     end
 
-    def test_decoding_blank
-      assert_equal "",
-        NewRelic::Agent::CrossAppMonitor::EncodingFunctions.decode_with_key( 'querty', "" )
-    end
-
-    def test_encode_with_nil_uses_empty_key
-      assert_equal "querty",
-        NewRelic::Agent::CrossAppMonitor::EncodingFunctions.encode_with_key( nil, 'querty' )
-    end
-
-    def test_encoding_functions_can_roundtrip_utf8_text
-      str = 'Анастасі́я Олексі́ївна Каме́нських'
-      encoded = NewRelic::Agent::CrossAppMonitor::EncodingFunctions.obfuscate_with_key( 'potap', str )
-      decoded = NewRelic::Agent::CrossAppMonitor::EncodingFunctions.decode_with_key( 'potap', encoded )
-      decoded.force_encoding( 'utf-8' ) if decoded.respond_to?( :force_encoding )
-      assert_equal str, decoded
-    end
-
     def test_setting_response_headers_freezes_transaction_name
       in_transaction do
         assert !NewRelic::Agent::Transaction.current.name_frozen?

data/test/new_relic/agent/database_test.rb

@@ -214,4 +214,36 @@ class NewRelic::Agent::DatabaseTest < Test::Unit::TestCase
     result = NewRelic::Agent::Database.obfuscate_sql("SELECT * FROM \"table\" WHERE \"col\" = 'value'")
     assert_equal expected, result
   end
+
+  def test_capture_query_short_query
+    query = 'a query'
+    assert_equal(query, NewRelic::Agent::Database.capture_query(query))
+  end
+
+  def test_capture_query_long_query
+    query = 'a' * NewRelic::Agent::Database::MAX_QUERY_LENGTH
+    truncated_query = NewRelic::Agent::Database.capture_query(query)
+    assert_equal('a' * (NewRelic::Agent::Database::MAX_QUERY_LENGTH - 3) + '...', truncated_query)
+  end
+
+  INVALID_UTF8_STRING = (''.respond_to?(:force_encoding) ? "\x80".force_encoding('UTF-8') : "\x80")
+
+  def test_capture_query_mis_encoded
+    query = INVALID_UTF8_STRING
+    original_encoding = encoding_from_string(query)
+    expected_query = INVALID_UTF8_STRING.dup
+    expected_query.force_encoding('ASCII-8BIT') if expected_query.respond_to?(:force_encoding)
+    captured = NewRelic::Agent::Database.capture_query(query)
+    assert_equal(original_encoding, encoding_from_string(query)) # input query encoding should remain untouched
+    assert_equal(expected_query, captured)
+  end
+
+  # Ruby 1.8 doesn't have String#encoding
+  def encoding_from_string(str)
+    if str.respond_to?(:encoding)
+      str.encoding
+    else
+      nil
+    end
+  end
 end