newrelic_rpm 3.7.0.177 → 3.7.1.180

data/test/multiverse/suites/mongo/mongo_unsupported_version_test.rb

@@ -0,0 +1,36 @@
+# 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 'mongo'
+require 'newrelic_rpm'
+require 'new_relic/agent/datastores/mongo'
+require File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper')
+
+if !NewRelic::Agent::Datastores::Mongo.is_supported_version?
+
+  class NewRelic::Agent::Instrumentation::MongoInstrumentationTest < MiniTest::Unit::TestCase
+    include Mongo
+
+    def setup
+      @client = Mongo::Connection.new(ENV["MONGO_HOST"], ENV["MONGO_PORT"].to_i)
+      @database_name = 'multiverse'
+      @database = @client.db(@database_name)
+      @collection_name = 'tribbles'
+      @collection = @database.collection(@collection_name)
+
+      @tribble = {'name' => 'soterios johnson'}
+
+      NewRelic::Agent.drop_buffered_data
+    end
+
+    def teardown
+      NewRelic::Agent.drop_buffered_data
+    end
+
+    def test_records_metrics_for_insert
+      @collection.insert(@tribble)
+      assert_metrics_not_recorded(["Datastore/allWeb", "Datastore/allOther"])
+    end
+  end
+end

data/test/multiverse/suites/net_http/net_http_test.rb

@@ -4,7 +4,6 @@
 
 require "net/http"
 require "newrelic_rpm"
-require "test/unit"
 require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")
@@ -108,8 +107,7 @@ class NetHttpTest < MiniTest::Unit::TestCase
     http = create_http(default_uri)
     http.request(Net::HTTP::Get.new(default_uri.request_uri))
 
-    assert_metrics_recorded([
-      'External/localhost/Net::HTTP/GET'
-    ])
+    assert_metrics_recorded(
+      'External/localhost/Net::HTTP/GET' => { :call_count => 1 })
   end
 end

data/test/multiverse/suites/rails/Envfile

@@ -1,6 +1,6 @@
 if RUBY_VERSION >= '1.9.3'
   gemfile <<-RB
-    gem 'rails', '~>4.0.1'
+    gem 'rails', '~>4.0.2'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
 end
@@ -8,19 +8,19 @@ end
 omit_mocha!
 
 gemfile <<-RB
-  gem 'rails', '~>3.2.0'
+  gem 'rails', '~>3.2.16'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
 RB
 
 gemfile <<-RB
-  gem 'rails', '~>3.1.0'
+  gem 'rails', '~>3.1.12'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
 RB
 
 gemfile <<-RB
-  gem 'rails', '~>3.0.0'
+  gem 'rails', '~>3.0.20'
   gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   gem 'minitest_tu_shim', :require => false
 RB

data/test/multiverse/suites/rails/config/newrelic.yml

@@ -15,7 +15,7 @@ common: &default_settings
   error_collector:
     enabled: true
     capture_source: true
-    ignore_errors: IgnoredError
+    ignore_errors: NewRelic::TestHelpers::Exceptions::IgnoredError
 
 development:
   <<: *default_settings

data/test/multiverse/suites/rails/error_tracing_test.rb

@@ -6,9 +6,12 @@
 require 'rails/test_help'
 require 'fake_collector'
 require 'multiverse_helpers'
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 class ErrorController < ApplicationController
   include Rails.application.routes.url_helpers
+  include NewRelic::TestHelpers::Exceptions
+
   newrelic_ignore :only => :ignored_action
 
   def controller_error
@@ -32,11 +35,11 @@ class ErrorController < ApplicationController
   end
 
   def ignored_error
-    raise IgnoredError.new('this error should not be noticed')
+    raise NewRelic::TestHelpers::Exceptions::IgnoredError.new('this error should not be noticed')
   end
 
   def server_ignored_error
-    raise ServerIgnoredError.new('this is a server ignored error')
+    raise NewRelic::TestHelpers::Exceptions::ServerIgnoredError.new('this is a server ignored error')
   end
 
   def frozen_error
@@ -65,9 +68,6 @@ class ErrorController < ApplicationController
   end
 end
 
-class IgnoredError < StandardError; end
-class ServerIgnoredError < StandardError; end
-
 class ErrorsWithoutSSCTest < ActionDispatch::IntegrationTest
   extend Multiverse::Color
 
@@ -258,7 +258,7 @@ class ErrorsWithSSCTest < ErrorsWithoutSSCTest
     $collector.stub('connect', {
       "listen_to_server_config" => true,
       "agent_run_id" => 1,
-      "error_collector.ignore_errors" => 'IgnoredError,ServerIgnoredError',
+      "error_collector.ignore_errors" => 'NewRelic::TestHelpers::Exceptions::IgnoredError,NewRelic::TestHelpers::Exceptions::ServerIgnoredError',
       "error_collector.enabled" => true,
       "error_collector.capture_source" => true,
       "collect_errors" => true
@@ -272,7 +272,7 @@ class ErrorsWithSSCTest < ErrorsWithoutSSCTest
   def test_should_ignore_server_ignored_errors
     get '/error/server_ignored_error'
     assert(@error_collector.errors.empty?,
-           'Noticed an error that should have been ignored')
+           'Noticed an error that should have been ignored' + @error_collector.errors.join(', '))
   end
 
 end

data/test/multiverse/suites/sidekiq/Envfile

@@ -5,7 +5,7 @@ end
 gemfile <<-RB
   # Latest version
   gem 'json'
-  gem 'sidekiq', '~> 2.16.1'
+  gem 'sidekiq', '~> 2.17.0'
   gem 'rack'
 RB
 

data/test/multiverse/suites/sidekiq/sidekiq_instrumentation_test.rb

@@ -6,7 +6,6 @@
 
 require 'sidekiq'
 require 'sidekiq/testing/inline'
-require 'test/unit'
 require 'newrelic_rpm'
 require 'fake_collector'
 require 'multiverse_helpers'

data/test/multiverse/suites/sinatra/sinatra_classic_test.rb

@@ -5,6 +5,9 @@
 require 'sinatra'
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
+
+include NewRelic::TestHelpers::Exceptions
 
 configure do
   # display exceptions so we see what's going on
@@ -40,9 +43,8 @@ get '/pass' do
   "I'm not a teapot."
 end
 
-class Error < StandardError; end
-error(Error) { halt 200, 'nothing happened' }
-set(:error_condition) { |_| condition { raise Error } }
+error(NewRelic::TestHelpers::Exceptions::TestError) { halt 200, 'nothing happened' }
+set(:error_condition) { |_| condition { raise NewRelic::TestHelpers::Exceptions::TestError } }
 get('/error', :error_condition => true) { }
 
 set(:precondition_check) do |_|

data/test/multiverse/suites/sinatra/sinatra_modular_test.rb

@@ -4,8 +4,11 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), 'sinatra_test_cases'))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'agent_helper'))
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 class SinatraModularTestApp < Sinatra::Base
+  include NewRelic::TestHelpers::Exceptions
+
   configure do
     # display exceptions so we see what's going on
     disable :show_exceptions
@@ -40,9 +43,8 @@ class SinatraModularTestApp < Sinatra::Base
     "I'm not a teapot."
   end
 
-  class Error < StandardError; end
-  error(Error) { halt 200, 'nothing happened' }
-  condition { raise Error }
+  error(NewRelic::TestHelpers::Exceptions::TestError) { halt 200, 'nothing happened' }
+  condition { raise NewRelic::TestHelpers::Exceptions::TestError }
   get('/error') { }
 
   condition do

data/test/multiverse/suites/typhoeus/typhoeus_test.rb

@@ -4,7 +4,6 @@
 
 require "typhoeus"
 require "newrelic_rpm"
-require "test/unit"
 require "http_client_test_cases"
 
 require File.join(File.dirname(__FILE__), "..", "..", "..", "agent_helper")

data/test/new_relic/agent/agent_logger_test.rb

@@ -260,7 +260,15 @@ class AgentLoggerTest < Test::Unit::TestCase
     end
   end
 
-
+  def test_should_cache_hostname
+    Socket.expects(:gethostname).once.returns('cachey-mccaherson')
+    logger = create_basic_logger
+    logger.warn("one")
+    logger.warn("two")
+    logger.warn("three")
+    host_regex = /cachey-mccaherson/
+    assert_logged(host_regex, host_regex, host_regex)
+  end
 
   #
   # Helpers

data/test/new_relic/agent/agent_test.rb

@@ -7,6 +7,7 @@ require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper
 module NewRelic
   module Agent
     class AgentTest < Test::Unit::TestCase
+      include NewRelic::TestHelpers::Exceptions
 
       def setup
         super
@@ -471,8 +472,72 @@ module NewRelic
         @agent.send(:graceful_disconnect)
         assert_equal(1, before_shutdown_call_count)
       end
-    end
 
+      def test_trap_signals_for_litespeed
+        Signal.expects(:trap).with('SIGUSR1', 'IGNORE')
+        Signal.expects(:trap).with('SIGTERM', 'IGNORE')
+
+        with_config(:dispatcher => :litespeed) do
+          @agent.trap_signals_for_litespeed
+        end
+      end
+
+      def test_stop_worker_loop_runs_loop_before_exit_with_force_send_config
+        fake_loop = mock
+        fake_loop.expects(:run_task)
+        fake_loop.stubs(:stop)
+
+        @agent.instance_variable_set(:@worker_loop, fake_loop)
+
+        with_config(:force_send => true) do
+          @agent.stop_worker_loop
+        end
+      end
+
+      def test_stop_worker_loop_doesnt_run_loop_if_force_send_is_false
+        fake_loop = mock
+        fake_loop.expects(:run_task).never
+        fake_loop.stubs(:stop)
+
+        @agent.instance_variable_set(:@worker_loop, fake_loop)
+
+        with_config(:force_send => false) do
+          @agent.stop_worker_loop
+        end
+      end
+
+      def test_stop_worker_loop_stops_the_loop
+        fake_loop = mock
+        fake_loop.expects(:stop)
+
+        @agent.instance_variable_set(:@worker_loop, fake_loop)
+
+        @agent.stop_worker_loop
+      end
+
+      def test_untraced_graceful_disconnect_logs_errors
+        NewRelic::Agent.stubs(:disable_all_tracing).raises(TestError, 'test')
+        ::NewRelic::Agent.logger.expects(:error).with(is_a(TestError))
+
+        @agent.untraced_graceful_disconnect
+      end
+
+      def test_revert_to_default_configuration_removes_manual_and_server_source
+        server_config = NewRelic::Agent::Configuration::ServerSource.new({})
+        Agent.config.apply_config(server_config, 1)
+
+        config_classes = NewRelic::Agent.config.config_stack.map(&:class)
+
+        assert_includes config_classes, NewRelic::Agent::Configuration::ManualSource
+        assert_includes config_classes, NewRelic::Agent::Configuration::ServerSource
+
+        @agent.revert_to_default_configuration
+
+        config_classes = NewRelic::Agent.config.config_stack.map(&:class)
+        assert !config_classes.include?(NewRelic::Agent::Configuration::ManualSource)
+        assert !config_classes.include?(NewRelic::Agent::Configuration::ServerSource)
+      end
+    end
 
     class AgentStartingTest < Test::Unit::TestCase
       def test_no_service_if_not_monitoring

data/test/new_relic/agent/agent_test_controller.rb

@@ -11,6 +11,7 @@ class NewRelic::Agent::SuperclassController <  ActionController::Base
 end
 # This is a controller class used in testing controller instrumentation
 class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassController
+  include NewRelic::TestHelpers::Exceptions
   # filter_parameter_logging :social_security_number
 
   @@headers_to_add = nil
@@ -42,8 +43,6 @@ class NewRelic::Agent::AgentTestController < NewRelic::Agent::SuperclassControll
   def oops
     raise "error in before filter"
   end
-  class TestException < RuntimeError
-  end
 
   def rescue_action_locally(exception)
     if exception.is_a? TestException

data/test/new_relic/agent/audit_logger_test.rb

@@ -12,7 +12,6 @@ class AuditLoggerTest < Test::Unit::TestCase
 
     @uri = "http://really.notreal"
     @marshaller = NewRelic::Agent::NewRelicService::Marshaller.new
-    @hostname = 'dummyhost'
     @dummy_data = {
       'foo' => [1, 2, 3],
       'bar' => {
@@ -20,7 +19,6 @@ class AuditLoggerTest < Test::Unit::TestCase
         'jingle' => 'bells'
       }
     }
-    Socket.stubs(:gethostname).returns(@hostname)
   end
 
   def setup_fake_logger
@@ -53,11 +51,12 @@ class AuditLoggerTest < Test::Unit::TestCase
   end
 
   def test_log_formatter
-    formatter = NewRelic::Agent::AuditLogger.new.log_formatter
+    Socket.stubs(:gethostname).returns('dummyhost')
+    formatter = NewRelic::Agent::AuditLogger.new.create_log_formatter
     time = '2012-01-01 00:00:00'
     msg = 'hello'
     result = formatter.call(Logger::INFO, time, 'bleh', msg)
-    expected = "[2012-01-01 00:00:00 #{@hostname} (#{$$})] : hello\n"
+    expected = "[2012-01-01 00:00:00 dummyhost (#{$$})] : hello\n"
     assert_equal(expected, result)
   end
 
@@ -120,4 +119,13 @@ class AuditLoggerTest < Test::Unit::TestCase
       assert_log_contains_string(JSON.dump(@dummy_data))
     end
   end
+
+  def test_should_cache_hostname
+    Socket.expects(:gethostname).once.returns('cachey-mccaherson')
+    setup_fake_logger
+    3.times do
+      @logger.log_request(@uri, @dummy_data, @marshaller)
+    end
+    assert_log_contains_string('cachey-mccaherson')
+  end
 end

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

@@ -33,6 +33,10 @@ class OrphanedConfigTest < Test::Unit::TestCase
     end
   end
 
+  AGENT_CONFIG_PATTERN      = /Agent\.config\[:['"]?([a-z\._]+)['"]?\]/
+  REGISTER_CALLBACK_PATTERN = /register_callback\(:['"]?([a-z\._]+)['"]?\)/
+  NAMED_DEPENDENCY_PATTERN  = /^\s*named[ (]+\:?([a-z\._]+).*$/
+
   def test_all_default_source_config_keys_are_used_in_the_agent
     non_test_files = all_rb_files.reject { |filename| filename.include? 'test.rb' }
 
@@ -41,8 +45,9 @@ class OrphanedConfigTest < Test::Unit::TestCase
 
       lines.each_with_index do |line, index|
         captures = []
-        captures << line.scan(/Agent\.config\[:['"]?([a-z\._]+)['"]?\]/)
-        captures << line.scan(/register_callback\(:['"]?([a-z\._]+)['"]?\)/)
+        captures << line.scan(AGENT_CONFIG_PATTERN)
+        captures << line.scan(REGISTER_CALLBACK_PATTERN)
+        captures << line.scan(NAMED_DEPENDENCY_PATTERN).map(&method(:disable_name))
 
         next if captures.empty?
 
@@ -54,4 +59,8 @@ class OrphanedConfigTest < Test::Unit::TestCase
 
     assert_empty @default_keys
   end
+
+  def disable_name(names)
+    names.map { |name| "disable_#{name}" }
+  end
 end

data/test/new_relic/agent/cpu_sampler_test.rb

@@ -44,6 +44,7 @@ class NewRelic::Agent::Samplers::CpuSamplerTest < Test::Unit::TestCase
   end
 
   def set_jruby_version_constant(string)
+    Object.send(:remove_const, 'JRUBY_VERSION') if defined?(JRUBY_VERSION)
     Object.const_set('JRUBY_VERSION', string)
   end
 

data/test/new_relic/agent/cross_app_tracing_test.rb

@@ -0,0 +1,60 @@
+# 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'))
+require 'new_relic/agent/cross_app_tracing'
+
+module NewRelic
+  module Agent
+    class CrossAppTracingTest < Test::Unit::TestCase
+
+      attr_reader :segment, :request, :response
+
+      def setup
+        @segment = stub_everything
+        @request = stub_everything(:uri => URI.parse("http://newrelic.com"),
+                                   :method => "GET")
+        @response = stub_everything
+      end
+
+      def test_start_trace
+        t0, segment = CrossAppTracing.start_trace(request)
+        assert_not_nil t0
+        assert_not_nil segment
+      end
+
+      def test_start_trace_has_time_even_on_agent_failure
+        NewRelic::Agent.instance.stats_engine.stubs(:push_scope).raises("Boom!")
+        t0, segment = CrossAppTracing.start_trace(request)
+        assert_not_nil t0
+        assert_nil segment
+      end
+
+      # Since we log and swallow errors, assert on the logging to ensure these
+      # paths are cleanly accepting nils, not just smothering the exceptions.
+
+      def test_finish_trace_allows_nil_segment
+        expects_no_logging(:error)
+        CrossAppTracing.finish_trace(Time.now, nil, request, response)
+      end
+
+      def test_finish_trace_allows_nil_request
+        expects_no_logging(:error)
+        expects_pop_scope
+        CrossAppTracing.finish_trace(Time.now, segment, nil, response)
+      end
+
+      def test_finish_trace_allows_nil_response
+        expects_no_logging(:error)
+        expects_pop_scope
+        CrossAppTracing.finish_trace(Time.now, segment, request, nil)
+      end
+
+
+      def expects_pop_scope
+        NewRelic::Agent.instance.stats_engine.stubs(:pop_scope).once
+      end
+    end
+  end
+end