newrelic_rpm 3.8.1.221 → 3.9.0.229

data/test/config/newrelic.yml

@@ -42,7 +42,6 @@ test:
 
   error_collector:
     enabled: true
-    capture_source: true
 
 development:
   host: the.wrong.host

data/test/environments/norails/Gemfile

@@ -17,4 +17,4 @@ end
 
 gem "newrelic_rpm", :path => "../../.."
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails21/Gemfile

@@ -21,4 +21,4 @@ else
   gem "sqlite3-ruby", "1.2.5"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails22/Gemfile

@@ -21,4 +21,4 @@ else
   gem "sqlite3"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails23/Gemfile

@@ -20,4 +20,4 @@ else
   gem "sqlite3-ruby", "1.2.5"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails30/Gemfile

@@ -19,4 +19,4 @@ else
   gem "sqlite3-ruby"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails31/Gemfile

@@ -19,4 +19,4 @@ else
   gem "sqlite3-ruby"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails32/Gemfile

@@ -21,4 +21,4 @@ platforms :ruby, :rbx do
   gem "sqlite3"
 end
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails40/Gemfile

@@ -41,4 +41,4 @@ end
 
 gem "newrelic_rpm", :path => "../../.."
 
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/environments/rails41/Gemfile

@@ -32,4 +32,4 @@ platforms :rbx do
 end
 
 gem "newrelic_rpm", :path => "../../.."
-gem 'pry'
+gem 'pry', '~> 0.9.12'

data/test/multiverse/lib/multiverse/runner.rb

@@ -46,6 +46,18 @@ module Multiverse
     end
 
     def run(filter="", opts={})
+      execute_suites(filter, opts) do |suite|
+        suite.execute
+      end
+    end
+
+    def prime(filter="", opts={})
+      execute_suites(filter, opts) do |suite|
+        suite.prime
+      end
+    end
+
+    def execute_suites(filter, opts)
       Dir.new(SUITES_DIRECTORY).entries.each do |dir|
         full_path = File.join(SUITES_DIRECTORY, dir)
 
@@ -55,7 +67,7 @@ module Multiverse
 
         begin
           suite = Suite.new(full_path, opts)
-          suite.execute
+          yield suite
         rescue => e
           puts red("Error when trying to run suite in #{full_path.inspect}")
           puts

data/test/multiverse/lib/multiverse/suite.rb

@@ -69,7 +69,7 @@ module Multiverse
     end
 
     # load the environment for this suite after we've forked
-    def load_dependencies(gemfile_text, env_index)
+    def load_dependencies(gemfile_text, env_index, should_print=true)
       ENV["BUNDLE_GEMFILE"] = "Gemfile.#{env_index}"
       clean_gemfiles(env_index)
       begin
@@ -82,7 +82,7 @@ module Multiverse
         generate_gemfile(gemfile_text, env_index, false)
         bundle
       end
-      print_environment
+      print_environment if should_print
     end
 
     def bundle
@@ -108,7 +108,8 @@ module Multiverse
         f.puts "  gem 'mocha', '0.14.0', :require => false"
 
         if debug
-          f.puts "  gem 'pry'"
+          # Pry 0.10.0 breaks compatibility with Ruby 1.8.7 :(
+          f.puts "  gem 'pry', '~> 0.9.12'"
         end
       end
       puts yellow("Gemfile.#{env_index} set to:") if verbose?
@@ -175,6 +176,19 @@ module Multiverse
       ENV['SERIALIZE'] || debug
     end
 
+    def prime
+      ENV["VERBOSE"]= "1"
+      puts yellow("\nPriming #{directory.inspect}")
+      @environments = nil
+
+      environments.each_with_index do |gemfile_text, env_index|
+        puts yellow("... for Envfile entry #{env_index}")
+        with_clean_env do
+          load_dependencies(gemfile_text, env_index, false)
+        end
+      end
+    end
+
     # Load the test suite's environment and execute it.
     #
     # Normally we fork to do this, and wait for the child to exit, to avoid
@@ -295,6 +309,8 @@ module Multiverse
         test_run = ::MiniTest::Unit.new.run(options)
       end
 
+      load @after_file if @after_file
+
       if test_run
         exit(test_run)
       else
@@ -371,18 +387,19 @@ module Multiverse
     def ordered_ruby_files(directory)
       files = Dir[File.join(directory, '*.rb')]
 
-      before = files.find { |file| File.basename(file) == "before_suite.rb" }
-      after  = files.find { |file| File.basename(file) == "after_suite.rb" }
+      @before_file = files.find { |file| File.basename(file) == "before_suite.rb" }
+      @after_file  = files.find { |file| File.basename(file) == "after_suite.rb" }
 
-      files.delete(before)
-      files.delete(after)
+      files.delete(@before_file)
+      files.delete(@after_file)
 
       # Important that we filter after removing before/after so they don't get
       # tromped for not matching our pattern!
       files.select! {|file| file.include?(filter_file) } if filter_file
 
-      files.insert(0, before) if before
-      files.insert(-1, after) if after
+      # Just put before_suite.rb at the head of the list.
+      # Will explicitly load after_suite.rb after the test run
+      files.insert(0, @before_file) if @before_file
 
       files
     end

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.5
   ssl: false

data/test/multiverse/suites/activemerchant/Envfile

@@ -1,5 +1,5 @@
 gemfile <<-RB
-  gem 'activemerchant', '~>1.42.7'
+  gem 'activemerchant', '~>1.43.1'
   gem 'rack'
 
   if RUBY_VERSION <= '1.9.2'
@@ -14,3 +14,20 @@ gemfile <<-RB
   # Need to load newrelic_rpm after ActiveMerchant Gateways are required
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB
+
+gemfile <<-RB
+  gem 'activemerchant', '~>1.25.0'
+  gem 'rack'
+
+  if RUBY_VERSION <= '1.9.2'
+    # Very special versioning to keep us running on 1.8.7 versions of Ruby
+    gem 'activesupport', '~>2.3.14', :require => 'active_support'
+    gem 'nokogiri', '~>1.4.7'
+  else
+    gem 'activesupport', '~>4.0.4'
+    gem 'nokogiri', '~>1.5.11'
+  end
+
+  # Need to load newrelic_rpm after ActiveMerchant Gateways are required
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+RB

data/test/multiverse/suites/agent_only/audit_log_test.rb

@@ -87,11 +87,12 @@ class AuditLogTest < Minitest::Test
   def perform_actions
     reset_collector
 
-    NewRelic::Agent.instance.sql_sampler.on_start_transaction(nil)
+    state = NewRelic::Agent::TransactionState.tl_get
+    NewRelic::Agent.instance.sql_sampler.on_start_transaction(state, nil)
     NewRelic::Agent.instance.sql_sampler.notice_sql("select * from test",
                                  "Database/test/select",
-                                 nil, 1.5)
-    NewRelic::Agent.instance.sql_sampler.on_finishing_transaction('txn')
+                                 nil, 1.5, state)
+    NewRelic::Agent.instance.sql_sampler.on_finishing_transaction(state, 'txn')
     NewRelic::Agent.instance.send(:harvest_and_send_slowest_sql)
   end
 end

data/test/multiverse/suites/agent_only/collector_exception_handling_test.rb

@@ -46,4 +46,39 @@ class CollectorExceptionHandlingTest < Minitest::Test
     assert_equal(1, $collector.calls_for('connect').size)
     assert_equal(1, $collector.calls_for('metric_data').size)
   end
+
+  def test_should_reconnect_on_connect_exception
+    $collector.reset
+
+    payload = { 'error_type' => 'RuntimeError' }
+    $collector.stub_exception('connect', payload).once
+
+    with_config(:data_report_period => 0) do
+      worker_loop = NewRelic::Agent::WorkerLoop.new(:limit => 1)
+      NewRelic::Agent.agent.stubs(:create_worker_loop).returns(worker_loop)
+      # there's a call to sleep in connect that we want to skip
+      NewRelic::Agent.agent.stubs(:sleep)
+      NewRelic::Agent.agent.deferred_work!({})
+    end
+
+    assert_equal(2, $collector.calls_for('connect').size)
+  end
+
+  def test_should_reconnect_on_get_redirect_host_exception
+    $collector.reset
+
+    payload = { 'error_type' => 'RuntimeError' }
+    $collector.stub_exception('get_redirect_host', payload).once
+
+    with_config(:data_report_period => 0) do
+      worker_loop = NewRelic::Agent::WorkerLoop.new(:limit => 1)
+      NewRelic::Agent.agent.stubs(:create_worker_loop).returns(worker_loop)
+      # there's a call to sleep in connect that we want to skip
+      NewRelic::Agent.agent.stubs(:sleep)
+      NewRelic::Agent.agent.deferred_work!({})
+    end
+
+    assert_equal(2, $collector.calls_for('get_redirect_host').size)
+    assert_equal(1, $collector.calls_for('connect').size)
+  end
 end

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

@@ -1,7 +1,6 @@
 ---
 development:
   error_collector:
-    capture_source: true
     enabled: true
   apdex_t: 0.24
   ssl: false

data/test/multiverse/suites/agent_only/cross_application_tracing_test.rb

@@ -6,6 +6,7 @@ require 'rack/test'
 require 'fake_collector'
 require './testing_app'
 require 'multiverse_helpers'
+require 'new_relic/rack/agent_hooks'
 
 class CrossApplicationTracingTest < Minitest::Test
 

data/test/multiverse/suites/agent_only/encoding_handling_test.rb

@@ -16,7 +16,8 @@ class EncodingHandlingTest < Minitest::Test
       with_config(:'transaction_tracer.transaction_threshold' => 0.0,
         :'transaction_tracer.record_sql' => :raw) do
         in_transaction do
-          agent.transaction_sampler.notice_sql(bad_string, nil, 42)
+          state = NewRelic::Agent::TransactionState.tl_get
+          agent.transaction_sampler.notice_sql(bad_string, nil, 42, state)
         end
         assert_endpoint_received_string('transaction_sample_data', normalized_bad_string)
       end
@@ -44,7 +45,7 @@ class EncodingHandlingTest < Minitest::Test
   end
 
   def test_handles_mis_encoded_custom_params_on_analytics_events
-    in_transaction(:type => :controller) do
+    in_transaction(:category => :controller) do
       NewRelic::Agent.add_custom_parameters(:foo => bad_string)
     end
     assert_endpoint_received_string('analytic_event_data', normalized_bad_string)

data/test/multiverse/suites/agent_only/exclusive_time_test.rb

@@ -0,0 +1,178 @@
+# 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 'multiverse_helpers'
+
+class ExclusiveTimeTest < Minitest::Test
+  include MultiverseHelpers
+
+  setup_and_teardown_agent
+
+  def test_traced_node_without_metrics_dont_decrease_exclusive_time
+    traced_class = Class.new do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      include NewRelic::Agent::MethodTracer
+
+      def outer
+        advance_time 2
+        inner_a
+        inner_b
+      end
+      add_transaction_tracer :outer, :class_name => 'traced'
+
+      def inner_a
+        advance_time 5
+      end
+      add_method_tracer :inner_a, 'inner_a', :metric => false
+
+      def inner_b
+        advance_time 10
+      end
+      add_method_tracer :inner_b, 'inner_b'      
+    end
+
+    freeze_time
+    traced_class.new.outer
+
+    txn_name = 'Controller/traced/outer'
+    assert_metrics_recorded(
+      txn_name => {
+        :call_count           => 1,
+        :total_call_time      => 2 + 5 + 10,
+        :total_exclusive_time => 2 + 5
+      },
+      ['inner_b', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 10,
+        :total_exclusive_time => 10
+      })
+  end
+
+  def test_exclusive_time_should_propagate_through_nodes_that_dont_record_metrics
+    traced_class = Class.new do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      include NewRelic::Agent::MethodTracer
+
+      def outer
+        advance_time 2
+        inner_a
+      end
+      add_transaction_tracer :outer, :class_name => 'traced'
+
+      def inner_a
+        advance_time 5
+        inner_b
+      end
+      add_method_tracer :inner_a, 'inner_a', :metric => false
+
+      def inner_b
+        advance_time 10
+      end
+      add_method_tracer :inner_b, 'inner_b'
+    end
+
+    freeze_time
+    txn_name = 'Controller/traced/outer'
+
+    traced_class.new.outer
+
+    assert_metrics_recorded(
+      txn_name => {
+        :call_count           => 1,
+        :total_call_time      => 2 + 5 + 10,
+        :total_exclusive_time => 2 + 5
+      },
+      ['inner_b', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 10,
+        :total_exclusive_time => 10
+      })
+  end
+
+  def test_exclusive_time_on_unscoped_metric_should_be_zero_if_scoped_metric_matches
+    traced_class = Class.new do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      include NewRelic::Agent::MethodTracer
+
+      def outer_a
+        advance_time 2
+        outer_b
+      end
+      add_transaction_tracer :outer_a, :class_name => 'traced'
+
+      def outer_b
+        advance_time 5
+        inner
+      end
+      add_transaction_tracer :outer_b, :class_name => 'traced'
+
+      def inner
+        advance_time 10
+      end
+      add_method_tracer :inner, 'inner'
+    end
+
+    freeze_time
+    traced_class.new.outer_a
+
+    txn_name = 'Controller/traced/outer_b'
+    assert_metrics_recorded(
+       txn_name => {
+        :call_count           => 1,
+        :total_call_time      => 2 + 5 + 10,
+        :total_exclusive_time => 0
+      },
+      ['Nested/Controller/traced/outer_a', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 2 + 5 + 10,
+        :total_exclusive_time => 2
+      },
+      ['Nested/Controller/traced/outer_b', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 5 + 10,
+        :total_exclusive_time => 5
+      },
+      ['inner', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 10,
+        :total_exclusive_time => 10
+      }
+    )
+  end
+
+  def test_exclusive_time_on_unscoped_metric_should_be_non_zero_if_no_nested_transaction
+    traced_class = Class.new do
+      include NewRelic::Agent::Instrumentation::ControllerInstrumentation
+      include NewRelic::Agent::MethodTracer
+
+      def outer
+        advance_time 2
+        inner
+      end
+      add_transaction_tracer :outer, :class_name => 'traced'
+
+      def inner
+        advance_time 10
+      end
+      add_method_tracer :inner, 'inner'
+    end
+
+    freeze_time
+    traced_class.new.outer
+
+    txn_name = 'Controller/traced/outer'
+    assert_metrics_recorded(
+       txn_name => {
+        :call_count           => 1,
+        :total_call_time      => 2 + 10,
+        :total_exclusive_time => 2
+      },
+      ['inner', txn_name] => {
+        :call_count           => 1,
+        :total_call_time      => 10,
+        :total_exclusive_time => 10
+      }
+    )
+  end
+end