newrelic_rpm 3.6.5.130 → 3.6.6.147

data/test/new_relic/agent/stats_test.rb

@@ -2,7 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-ENV['SKIP_RAILS'] = 'true'
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..', 'test_helper'))
 
 class NewRelic::Agent::StatsTest < Test::Unit::TestCase

data/test/new_relic/agent/thread_profiler_test.rb

@@ -439,7 +439,7 @@ class ThreadProfileTest < ThreadedTest
     10.times { @profile.aggregate(trace, @profile.traces[:other]) }
 
     trace = [
-      "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py:489:in `__bootstrap'", 
+      "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py:489:in `__bootstrap'",
       "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py:512:in `__bootstrap_inner'",
       "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/threading.py:480:in `run'",
       "thread_profiler.py:76:in `_profiler_loop'",
@@ -457,14 +457,14 @@ class ThreadProfileTest < ThreadedTest
     @profile.instance_variable_set(:@sample_count, 2)
 
     build_well_known_trace
- 
+
     expected = [[
-          -1, 
-          1350403938892.524, 
-          1350403939904.375, 
-          10, 
+          -1,
+          1350403938892.524,
+          1350403939904.375,
+          10,
           WELL_KNOWN_TRACE_ENCODED,
-          2, 
+          2,
           0
       ]]
 

data/test/new_relic/agent/threaded_test.rb

@@ -44,7 +44,7 @@ class FakeThread
   end
 
   def self.bucket_thread(thread, _)
-    thread[:bucket] 
+    thread[:bucket]
   end
 
   def self.scrub_backtrace(thread, _)
@@ -66,4 +66,3 @@ class FakeThread
   def join
   end
 end
-

data/test/new_relic/agent/transaction/pop_test.rb

@@ -93,4 +93,3 @@ class NewRelic::Agent::Transaction::PopTest < Test::Unit::TestCase
     current_stack_metric
   end
 end
-

data/test/{multiverse/suites/agent_only/test_trace_transaction_with_punctuation.rb → new_relic/agent/transaction_interrobang_test.rb}

@@ -2,12 +2,10 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-
 require 'test/unit'
 require 'newrelic_rpm'
 require 'new_relic/agent/instrumentation/controller_instrumentation'
 
-
 class TransactionInterrobangTest < Test::Unit::TestCase
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation
 
@@ -23,13 +21,13 @@ class TransactionInterrobangTest < Test::Unit::TestCase
   add_transaction_tracer :mutate!
 
   def test_alias_method_ending_in_question_mark
-    assert_respond_to self,:interrogate?
+    assert_respond_to self, :interrogate?
     assert_respond_to self, :interrogate_with_newrelic_transaction_trace?
     assert_equal "say what?", interrogate?
   end
 
   def test_aliase_method_ending_in_exclamation_makr
-    assert_respond_to self,:mutate!
+    assert_respond_to self, :mutate!
     assert_respond_to self, :mutate_with_newrelic_transaction_trace!
     assert_equal "oh yeah!",mutate!
   end

data/test/new_relic/agent/transaction_sample_builder_test.rb

@@ -206,6 +206,19 @@ class NewRelic::Agent::TransationSampleBuilderTest < Test::Unit::TestCase
     end
   end
 
+  def test_attaching_params_doesnt_raise_when_segments_are_limited
+    with_config(:'transaction_tracer.limit_segments' => 5) do
+      6.times { |i| build_segment "s#{i}" }
+      # now we should have a placeholder segment
+      build_segment "this-should-be-truncated" do
+        assert_nothing_raised do
+          @builder.current_segment['eggs'] = 'ham'
+          @builder.current_segment.params.merge!('foo' => 'bar')
+        end
+      end
+    end
+  end
+
   def test_finish_trace_records_threshold
     NewRelic::Agent::TransactionInfo.get.stubs(:transaction_trace_threshold) \
       .returns(2.0)

data/test/new_relic/agent/transaction_test.rb

@@ -183,24 +183,26 @@ class NewRelic::Agent::TransactionTest < Test::Unit::TestCase
   end
 
   def test_end_fires_a_transaction_finished_event
-    name, duration = nil
+    name, timestamp, duration = nil
     NewRelic::Agent.subscribe(:transaction_finished) do |*args|
-      name     = args.shift
-      duration = args.shift
+      name, timestamp, duration = *args
     end
 
+    start_time = freeze_time
     NewRelic::Agent::Transaction.start(:controller)
+    advance_time(5)
     NewRelic::Agent.set_transaction_name('foo/1/bar/22')
     NewRelic::Agent::Transaction.freeze_name
     NewRelic::Agent::Transaction.stop('txn')
 
     assert_equal 'Controller/foo/1/bar/22', name
-    assert_kind_of Float, duration
+    assert_equal start_time.to_f, timestamp
+    assert_equal 5.0, duration
   end
 
   def test_end_fires_a_transaction_finished_event_with_overview_metrics
     options = nil
-    NewRelic::Agent.subscribe(:transaction_finished) do |_, _, opts|
+    NewRelic::Agent.subscribe(:transaction_finished) do |_, _, _, opts|
       options = opts
     end
 

data/test/new_relic/agent/worker_loop_test.rb

@@ -2,7 +2,6 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-ENV['SKIP_RAILS'] = 'true'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
 
 class NewRelic::Agent::WorkerLoopTest < Test::Unit::TestCase

data/test/new_relic/agent_test.rb

@@ -64,33 +64,6 @@ module NewRelic
       NewRelic::Agent.after_fork
     end
 
-    if NewRelic::LanguageSupport.can_fork? &&
-        !NewRelic::LanguageSupport.using_version?('1.9.1')
-      def test_timeslice_harvest_with_after_fork_report_to_channel
-        with_config(:agent_enabled => true, :monitor_mode => true) do
-          NewRelic::Agent.shutdown # make sure the agent is not already started
-          NewRelic::Agent.manual_start(:license_key => ('1234567890' * 4),
-                                       :start_channel_listener => true)
-
-          metric = 'Custom/test/method'
-          NewRelic::Agent.record_metric(metric, 1.0)
-
-          NewRelic::Agent::PipeChannelManager.listener.close_all_pipes
-          NewRelic::Agent.register_report_channel(:agent_test) # before fork
-          pid = Process.fork do
-            NewRelic::Agent.after_fork(:report_to_channel => :agent_test)
-            NewRelic::Agent.record_metric(metric, 2.0)
-          end
-          Process.wait(pid)
-          NewRelic::Agent::PipeChannelManager.listener.stop
-
-          assert_metrics_recorded({
-            metric => { :call_count => 2, :total_call_time => 3.0 }
-          })
-        end
-      end
-    end
-
     def test_reset_stats
       mock_agent = mocked_agent
       mock_agent.expects(:reset_stats)

data/test/new_relic/collection_helper_test.rb

@@ -101,12 +101,12 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
   end
   class MyEnumerable
     include Enumerable
-    
+
     def each
       yield "1"
     end
   end
-  
+
   def test_object
     assert_equal ["foo", '#<OpenStruct>'], normalize_params(['foo', OpenStruct.new('z'=>'q')])
   end
@@ -115,7 +115,7 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
     clean_trace = strip_nr_from_backtrace(mock_backtrace)
     assert_equal(0, clean_trace.grep(/newrelic_rpm/).size,
                  "should remove all instances of new relic from backtrace but got: #{clean_trace.join("\n")}")
-    assert_equal(0, clean_trace.grep(/trace/).size, 
+    assert_equal(0, clean_trace.grep(/trace/).size,
                      "should remove trace method tags from method names but got: #{clean_trace.join("\n")}")
     assert((clean_trace.grep(/find/).size >= 3),
                "should see at least three frames with 'find' in them: \n#{clean_trace.join("\n")}")
@@ -130,22 +130,22 @@ class NewRelic::CollectionHelperTest < Test::Unit::TestCase
                    "should not remove trace method tags from method names but got: #{clean_trace.join("\n")}")
     end
   end
-  
-  private 
+
+  private
   def mock_backtrace
     [
-   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one_without_trace'}, 
-   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one'}, 
-   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1603:in `find_from_ids'}, 
-   %q{./test/new_relic/collection_helper_test.rb:112:in `test_strip_stackdump'}, 
-   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `__send__'}, 
-   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `run'}, 
-   %q{/home/app/test/unit/testsuite.rb:34:in `run'}, 
-   %q{/home/app/test/unit/testsuite.rb:33:in `each'}, 
-   %q{/home/app/test/unit/testsuite.rb:33:in `run'}, 
-   %q{/home/app/test/unit/testsuite.rb:34:in `run'}, 
-   %q{/home/app/test/unit/testsuite.rb:33:in `each'}, 
-   %q{/home/app/test/unit/testsuite.rb:33:in `run'}, 
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one_without_trace'},
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1620:in `find_one'},
+   %q{/home/app/gems/activerecord-2.3.12/lib/active_record/base.rb:1603:in `find_from_ids'},
+   %q{./test/new_relic/collection_helper_test.rb:112:in `test_strip_stackdump'},
+   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `__send__'},
+   %q{/home/app/gems/mocha-0.9.8/lib/mocha/integration/test_unit/ruby_version_186_and_above.rb:19:in `run'},
+   %q{/home/app/test/unit/testsuite.rb:34:in `run'},
+   %q{/home/app/test/unit/testsuite.rb:33:in `each'},
+   %q{/home/app/test/unit/testsuite.rb:33:in `run'},
+   %q{/home/app/test/unit/testsuite.rb:34:in `run'},
+   %q{/home/app/test/unit/testsuite.rb:33:in `each'},
+   %q{/home/app/test/unit/testsuite.rb:33:in `run'},
    %q{/home/app/test/unit/ui/testrunnermediator.rb:46:in `run_suite'}
    ]
   end

data/test/new_relic/control/class_methods_test.rb

@@ -36,7 +36,7 @@ class NewRelic::Control::ClassMethodsTest < Test::Unit::TestCase
       @base.load_framework_class(type)
     end
   end
-  
+
   def test_load_framework_class_missing
     # this is used to allow other people to insert frameworks without
     # having the file in our agent, i.e. define your own

data/test/new_relic/control_test.rb

@@ -54,13 +54,13 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_resolve_ip_for_localhost
-    with_config(:ssl => false, :verify_certificate => false) do
+    with_config(:ssl => false) do
       assert_equal nil, control.send(:convert_to_ip_address, 'localhost')
     end
   end
 
   def test_resolve_ip_for_non_existent_domain
-    with_config(:ssl => false, :verify_certificate => false) do
+    with_config(:ssl => false) do
       Resolv.stubs(:getaddress).raises(Resolv::ResolvError)
       IPSocket.stubs(:getaddress).raises(SocketError)
       assert_equal nil, control.send(:convert_to_ip_address, 'q1239988737.us')
@@ -68,17 +68,17 @@ class NewRelic::ControlTest < Test::Unit::TestCase
   end
 
   def test_resolves_valid_ip
-    with_config(:ssl => false, :verify_certificate => false) do
+    with_config(:ssl => false) do
       Resolv.stubs(:getaddress).with('collector.newrelic.com').returns('204.93.223.153')
       assert_equal '204.93.223.153', control.send(:convert_to_ip_address, 'collector.newrelic.com')
     end
   end
 
   def test_do_not_resolve_if_we_need_to_verify_a_cert
-    with_config(:ssl => false, :verify_certificate => false) do
+    with_config(:ssl => false) do
       assert_equal nil, control.send(:convert_to_ip_address, 'localhost')
     end
-    with_config(:ssl => true, :verify_certificate => true) do
+    with_config(:ssl => true) do
       assert_equal 'localhost', control.send(:convert_to_ip_address, 'localhost')
     end
   end
@@ -120,7 +120,7 @@ class NewRelic::ControlTest < Test::Unit::TestCase
     Object.instance_eval { remove_const :Resolv}
     Object.instance_eval {remove_const:'IPSocket' }
 
-    with_config(:ssl => false, :verify_certificate => false) do
+    with_config(:ssl => false) do
       assert_equal(nil, control.send(:convert_to_ip_address, 'collector.newrelic.com'), "DNS is down, should be no IP for server")
     end
 

data/test/new_relic/dependency_detection_test.rb

@@ -96,4 +96,32 @@ class DependencyDetectionTest < Test::Unit::TestCase
     assert !executed
   end
 
+
+  def test_exception_during_depends_on_check_doesnt_propagate
+    DependencyDetection.defer do
+      named :something_exceptional
+      depends_on { raise "Oops" }
+    end
+
+    DependencyDetection.detect!
+
+    assert_falsy( DependencyDetection.items.first.executed )
+  end
+
+
+  def test_exception_during_execution_doesnt_propagate
+    ran_second_block = false
+
+    DependencyDetection.defer do
+      named :something_exceptional
+      executes { raise "Ack!" }
+      executes { ran_second_block = true }
+    end
+
+    DependencyDetection.detect!
+
+    assert_truthy( DependencyDetection.items.first.executed )
+    assert_falsy( ran_second_block )
+  end
+
 end

data/test/new_relic/evil_server.rb

@@ -53,4 +53,3 @@ module NewRelic
     end
   end
 end
-

data/test/new_relic/fake_collector.rb

@@ -43,6 +43,10 @@ module NewRelic
       @agent_data = []
     end
 
+    def stub(method, return_value, status=200)
+      self.mock[method] = [status, {'return_value' => return_value}]
+    end
+
     def call(env)
       req = ::Rack::Request.new(env)
       res = ::Rack::Response.new
@@ -121,7 +125,7 @@ module NewRelic
         when 'connect'
           ConnectPost.new(opts)
         when 'metric_data'
-          AgentPost.new(opts)
+          MetricDataPost.new(opts)
         when 'profile_data'
           ProfileDataPost.new(opts)
         when 'sql_trace_data'
@@ -145,6 +149,21 @@ module NewRelic
       end
     end
 
+
+    class MetricDataPost < AgentPost
+      def initialize(opts={})
+        super
+      end
+
+      def metrics
+        @body[3]
+      end
+
+      def metric_names
+        metrics.map {|m| m[0]["name"] }
+      end
+    end
+
     class ConnectPost < AgentPost
       def initialize(opts={})
         super
@@ -347,4 +366,3 @@ if $0 == __FILE__
     end
   end
 end
-

data/test/new_relic/fake_server.rb

@@ -51,7 +51,6 @@ module NewRelic
     def run( port=nil )
       return if @thread && @thread.alive?
       @server.listen( @options[:BindAddress], port ) if port
-      @server.listen( @options[:BindAddress], fallback_port ) if fallback_port
       @thread = Thread.new( &self.method(:run_server) )
       return @thread
     end
@@ -82,16 +81,5 @@ module NewRelic
     end
     alias_method :determine_port, :port
 
-
-    #######
-    private
-    #######
-
-    # Return the port that will be the default if the collector hasn't been
-    # created.
-    def fallback_port
-      30_000 + ($$ % 10_000)
-    end
-
   end
 end

data/test/new_relic/http_client_test_cases.rb

@@ -6,32 +6,32 @@ require "newrelic_rpm"
 require "fake_external_server"
 require "evil_server"
 require 'mocha'
+require 'multiverse_helpers'
 
 module HttpClientTestCases
   include NewRelic::Agent::Instrumentation::ControllerInstrumentation,
           NewRelic::Agent::CrossAppMonitor::EncodingFunctions,
-          NewRelic::Agent::CrossAppTracing
+          NewRelic::Agent::CrossAppTracing,
+          MultiverseHelpers
 
   TRANSACTION_GUID = 'BEC1BC64675138B9'
 
   $fake_server = NewRelic::FakeExternalServer.new
   $fake_secure_server = NewRelic::FakeSecureExternalServer.new
 
-  def setup
-    $fake_server.reset
-    $fake_server.run
-
-    $fake_secure_server.reset
-    $fake_secure_server.run
-
-    NewRelic::Agent.manual_start(
+  setup_and_teardown_agent(
       :"cross_application_tracer.enabled" => false,
       :cross_process_id                   => "269975#22824",
       :encoding_key                       => "gringletoes",
       :trusted_account_ids                => [269975]
     )
 
-    NewRelic::Agent.instance.reset_stats
+  def after_setup
+    $fake_server.reset
+    $fake_server.run
+
+    $fake_secure_server.reset
+    $fake_secure_server.run
 
     NewRelic::Agent.instance.events.clear
     NewRelic::Agent.instance.cross_app_monitor.register_event_listeners
@@ -46,12 +46,6 @@ module HttpClientTestCases
     NewRelic::Agent::TransactionInfo.get.guid = TRANSACTION_GUID
   end
 
-  def teardown
-    NewRelic::Agent.instance.transaction_sampler.reset!
-    Thread::current[:newrelic_scope_stack] = nil
-    NewRelic::Agent.instance.stats_engine.end_transaction
-  end
-
   # Helpers to support shared tests
 
   def use_ssl
@@ -111,6 +105,11 @@ module HttpClientTestCases
     assert_nil response_instance["boo"]
   end
 
+  def test_response_wrapper_ignores_case_in_header_keys
+    res = response_instance('NAMCO' => 'digdug')
+    assert_equal 'digdug', res['namco']
+  end
+
   def test_get
     res = get_response
 
@@ -358,9 +357,7 @@ module HttpClientTestCases
       raises( NoMethodError, "undefined method `push_scope'" )
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      assert_nothing_raised do
-        res = get_response
-      end
+      res = get_response
     end
 
     assert_equal NewRelic::FakeExternalServer::STATUS_MESSAGE, body(res)
@@ -372,9 +369,7 @@ module HttpClientTestCases
       raises( NoMethodError, "undefined method `pop_scope'" )
 
     with_config(:"cross_application_tracer.enabled" => true) do
-      assert_nothing_raised do
-        res = get_response
-      end
+      res = get_response
     end
 
     assert_equal NewRelic::FakeExternalServer::STATUS_MESSAGE, body(res)
@@ -392,7 +387,7 @@ module HttpClientTestCases
       get_response
     end
 
-    assert_no_match( /undefined method `rename_scope_segment" for nil:NilClass/i,
+    refute_match( /undefined method `rename_scope_segment" for nil:NilClass/i,
                      logger.messages.flatten.map {|log| log.to_s }.join(" ") )
 
   ensure
@@ -416,7 +411,8 @@ module HttpClientTestCases
     # transaction in which the error occurs. That, coupled with the fact that
     # fixing it for old versions of Typhoeus would require large changes to
     # the instrumentation, makes us say 'meh'.
-    if client_name == 'Typhoeus' && Typhoeus::VERSION >= "0.5.4"
+    is_typhoeus = (client_name == 'Typhoeus')
+    if !is_typhoeus || (is_typhoeus && Typhoeus::VERSION >= "0.5.4")
       evil_server = NewRelic::EvilServer.new
       evil_server.start