newrelic_rpm 3.17.2.327 → 3.18.0.329

data/test/multiverse/suites/sidekiq/Envfile

@@ -3,7 +3,7 @@ suite_condition("SideKiq requires MRI 1.9.3 or JRuby 1.6 in 1.9 mode") do
 end
 
 # Sidekiq 3.x does not support MRI 1.9.x
-if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
+if (RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.4.0') || (RUBY_PLATFORM == 'java')
   gemfile <<-RB
     gem 'json'
     gem 'sidekiq', '~> 3.4.2'
@@ -11,7 +11,9 @@ if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
 
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
   RB
+end
 
+if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
   gemfile <<-RB
     gem 'json'
     gem 'sidekiq', '~> 4.0.0'
@@ -20,7 +22,7 @@ if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
   RB
 end
 
-if RUBY_VERSION >= '2.0.0' && RUBY_PLATFORM != 'java'
+if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
   # We skip testing Sidekiq 3.5.3 on JRuby due to an error in Sidekiq's shutdown:
   # https://github.com/mperham/sidekiq/issues/2703
   gemfile <<-RB
@@ -47,3 +49,5 @@ gemfile <<-RB
   gem 'rack'
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/sinatra/Envfile

@@ -23,3 +23,5 @@ gemfile <<-RB
   gem 'sinatra',   '~> 1.2.9'
   gem 'rack-test', :require => 'rack/test'
 RB
+
+# vim: ft=ruby

data/test/multiverse/suites/typhoeus/Envfile

@@ -32,38 +32,40 @@ gemfile <<-RB
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
-gemfile <<-RB
-  # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
-  gem 'ethon', '0.5.11'
+if RUBY_VERSION < '2.4.0'
+  gemfile <<-RB
+    # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
+    gem 'ethon', '0.5.11'
 
-  # ethon 0.5.11 requires mime-types ~> 1.18
-  # normally, this wouldn't be a problem, but
-  # we have other checks to work around other
-  # mime-type dependency issues, so we need
-  # to specify it here.
-  gem 'mime-types', '~> 1.18'
+    # ethon 0.5.11 requires mime-types ~> 1.18
+    # normally, this wouldn't be a problem, but
+    # we have other checks to work around other
+    # mime-type dependency issues, so we need
+    # to specify it here.
+    gem 'mime-types', '~> 1.18'
 
-  gem 'typhoeus', '~> 0.5.4'
-  gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
-RB
+    gem 'typhoeus', '~> 0.5.4'
+    gem 'rack'
+    gem 'json', :platforms => [:rbx, :mri_18]
+  RB
 
-# Earliest supported version
-gemfile <<-RB
-  # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
-  gem 'ethon', '0.5.11'
+  # Earliest supported version
+  gemfile <<-RB
+    # Compatibility issues with ethon 0.5.12 https://github.com/typhoeus/ethon/issues/51
+    gem 'ethon', '0.5.11'
 
-  # ethon 0.5.11 requires mime-types ~> 1.18
-  # normally, this wouldn't be a problem, but
-  # we have other checks to work around other
-  # mime-type dependency issues, so we need
-  # to specify it here.
-  gem 'mime-types', '~> 1.18'
+    # ethon 0.5.11 requires mime-types ~> 1.18
+    # normally, this wouldn't be a problem, but
+    # we have other checks to work around other
+    # mime-type dependency issues, so we need
+    # to specify it here.
+    gem 'mime-types', '~> 1.18'
 
-  gem 'typhoeus', '0.5.3'
-  gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
-RB
+    gem 'typhoeus', '0.5.3'
+    gem 'rack'
+    gem 'json', :platforms => [:rbx, :mri_18]
+  RB
+end
 
 # Prior to supported versions
 gemfile <<-RB
@@ -81,3 +83,5 @@ gemfile <<-RB
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB
+
+# vim: ft=ruby

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# This file is distributed under New Relic"s license terms.
+# This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require "typhoeus"
@@ -103,7 +103,7 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
 
     def test_request_succeeds_even_if_tracing_doesnt
       in_transaction("test") do
-        ::NewRelic::Agent::CrossAppTracing.stubs(:start_trace).raises("Booom")
+        ::NewRelic::Agent::CrossAppTracing.stubs(:cross_app_enabled?).raises("Booom")
         res = get_response
 
         assert_match %r/<head>/i, body(res)
@@ -124,7 +124,8 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
 
     if CURRENT_TYPHOEUS_VERSION >= SUPPORTS_URI_OBJECT_VERSION
       def test_get_with_uri
-        res = get_response(default_uri)
+        res = nil
+        in_transaction { res = get_response(default_uri) }
         assert_match %r/<head>/i, body(res)
         assert_externals_recorded_for("localhost", "GET")
       end

data/test/multiverse/suites/yajl/Envfile

@@ -1,5 +1,5 @@
-suite_condition("Yajl not supported for JRuby") do
-  RUBY_PLATFORM != 'java'
+suite_condition("Yajl not supported for JRuby or 2.4") do
+  RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.4.0'
 end
 
 gemfile <<-RB
@@ -11,3 +11,5 @@ gemfile <<-RB
   gem 'rack'
   gem 'yajl-ruby', '~> 1.1.0'
 RB
+
+# vim: ft=ruby

data/test/new_relic/agent/datastores_test.rb

@@ -56,16 +56,6 @@ class NewRelic::Agent::DatastoresTest < Minitest::Test
     assert_metrics("find", "Other")
   end
 
-  def test_outside_transaction
-    MyFirstDatabase.new.find
-    assert_metrics_recorded([
-                            "Datastore/operation/MyFirstDatabase/find",
-                            "Datastore/MyFirstDatabase/allOther",
-                            "Datastore/MyFirstDatabase/all",
-                            "Datastore/allOther",
-                            "Datastore/all"])
-  end
-
   def test_separate_operation_name
     in_background_transaction("txn") do
       MyFirstDatabase.new.save

data/test/new_relic/agent/instrumentation/action_cable_subscriber_test.rb

@@ -98,7 +98,7 @@ module NewRelic
           refute_nil(find_node_with_name(sample, metric_name), "Expected trace to have node with name: #{metric_name}")
         end
 
-        def test_records_unscoped_metrics_but_does_not_create_trace_for_transmit_outside_of_active_txn
+        def test_does_not_record_unscoped_metrics_nor_create_trace_for_transmit_outside_of_active_txn
           @subscriber.start('transmit.action_cable', :id, payload_for_transmit)
           advance_time(1.0)
           @subscriber.finish('transmit.action_cable', :id, payload_for_transmit)
@@ -106,7 +106,7 @@ module NewRelic
           sample = NewRelic::Agent.instance.transaction_sampler.last_sample
 
           assert_nil sample, "Did not expect a transaction to be created for transmit"
-          assert_metrics_recorded ['Ruby/ActionCable/TestChannel/transmit']
+          refute_metrics_recorded ['Ruby/ActionCable/TestChannel/transmit']
         end
 
         def payload_for_perform_action action = 'test_action'

data/test/new_relic/agent/instrumentation/action_view_subscriber_test.rb

@@ -19,106 +19,105 @@ class NewRelic::Agent::Instrumentation::ActionViewSubscriberTest < Minitest::Tes
 
   def test_records_metrics_for_simple_template
     params = { :identifier => '/root/app/views/model/index.html.erb' }
-
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
-
-    @subscriber.start('render_template.action_view', :id, params)
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => 'model/index')
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => 'model/index')
-    @subscriber.finish('render_template.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_template.action_view', :id, params)
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => 'model/index')
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => 'model/index')
+      @subscriber.finish('render_template.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/model/index.html.erb/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_file
     params = { :identifier => '/root/something.txt' }
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
-
-    @subscriber.start('render_template.action_view', :id, params)
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => nil)
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => nil)
-    @subscriber.finish('render_template.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_template.action_view', :id, params)
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => nil)
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => nil)
+      @subscriber.finish('render_template.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/file/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_inline
     params = { :identifier => 'inline template' }
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
-
-    @subscriber.start('render_template.action_view', :id, params)
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => nil)
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => nil)
-    @subscriber.finish('render_template.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_template.action_view', :id, params)
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => nil)
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => nil)
+      @subscriber.finish('render_template.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/inline template/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_text
     params = { :identifier => 'text template' }
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0 + 2)
-
-    @subscriber.start('render_template.action_view', :id, params)
-    @subscriber.finish('render_template.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_template.action_view', :id, params)
+      advance_time 2.0
+      @subscriber.finish('render_template.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/text template/Rendering' => expected)
   end
 
   def test_records_metrics_for_simple_partial
     params = { :identifier => '/root/app/views/model/_form.html.erb' }
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
-
-    @subscriber.start('render_partial.action_view', :id, params)
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => 'model/_form')
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => 'model/_form')
-    @subscriber.finish('render_partial.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_partial.action_view', :id, params)
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => 'model/_form')
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => 'model/_form')
+      @subscriber.finish('render_partial.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/model/_form.html.erb/Partial' => expected)
   end
 
   def test_records_metrics_for_simple_collection
     params = { :identifier => '/root/app/views/model/_user.html.erb' }
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0, t0 + 2, t0 + 2)
-
-    @subscriber.start('render_collection.action_view', :id, params)
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => 'model/_user')
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => 'model/_user')
-    @subscriber.finish('render_collection.action_view', :id, params)
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('render_collection.action_view', :id, params)
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => 'model/_user')
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => 'model/_user')
+      @subscriber.finish('render_collection.action_view', :id, params)
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/model/_user.html.erb/Partial' => expected)
   end
 
   def test_records_metrics_for_layout
-    t0 = Time.now
-    Time.stubs(:now).returns(t0, t0 + 2)
-
-    @subscriber.start('!render_template.action_view', :id,
-                      :virtual_path => 'layouts/application')
-    @subscriber.finish('!render_template.action_view', :id,
-                       :virtual_path => 'layouts/application')
-
+    freeze_time
+    in_transaction do
+      @subscriber.start('!render_template.action_view', :id,
+                        :virtual_path => 'layouts/application')
+      advance_time 2.0
+      @subscriber.finish('!render_template.action_view', :id,
+                         :virtual_path => 'layouts/application')
+    end
     expected = { :call_count => 1, :total_call_time => 2.0 }
     assert_metrics_recorded('View/layouts/application/Rendering' => expected)
   end

data/test/new_relic/agent/instrumentation/active_record_subscriber_test.rb

@@ -33,7 +33,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
   def test_records_metrics_for_simple_find
     freeze_time
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     metric_name = 'Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
     assert_metrics_recorded(
@@ -56,7 +56,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     config = { :adapter => "mysql", :host => "jonan.gummy_planet", :port => 3306 }
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_recorded('Datastore/instance/MySQL/jonan.gummy_planet/3306')
   end
@@ -65,14 +65,14 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     config = { :adapter => "mysql", :host => "jonan.gummy_planet", :port => "" }
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_recorded('Datastore/instance/MySQL/jonan.gummy_planet/unknown')
 
     config = { :adapter => "mysql", :host => "", :port => 3306 }
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_recorded('Datastore/instance/MySQL/unknown/3306')
   end
@@ -81,7 +81,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     config = { :adapter => "JonanDB", :host => "jonan.gummy_planet" }
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_not_recorded('Datastore/instance/JonanDB/jonan.gummy_planet/default')
   end
@@ -91,7 +91,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
       config = { :host => "jonan.gummy_planet" }
       @subscriber.stubs(:active_record_config).returns(config)
 
-      simulate_query(2)
+      in_transaction('test_txn') { simulate_query(2) }
 
       assert_metrics_not_recorded('Datastore/instance/ActiveRecord/jonan.gummy_planet/default')
     end
@@ -101,7 +101,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     config = { :adapter => "", :host => "" }
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query(2)
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_not_recorded('Datastore/instance/unknown/unknown')
   end
@@ -124,7 +124,7 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
     config = {:adapter => 'mysql', :host => "127.0.0.1"}
     @subscriber.stubs(:active_record_config).returns(config)
 
-    simulate_query
+    in_transaction('test_txn') { simulate_query(2) }
 
     assert_metrics_recorded("Datastore/instance/MySQL/unknown/unknown")
   end
@@ -132,7 +132,9 @@ class NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest < Minitest::T
   def test_records_nothing_if_tracing_disabled
     freeze_time
 
-    NewRelic::Agent.disable_all_tracing { simulate_query(2) }
+    in_transaction('test_txn') do
+      NewRelic::Agent.disable_all_tracing { simulate_query(2) }
+    end
 
     metric_name = 'Datastore/statement/ActiveRecord/NewRelic::Agent::Instrumentation::ActiveRecordSubscriberTest::Order/find'
     assert_metrics_not_recorded([metric_name])

data/test/new_relic/agent/instrumentation/instance_identification_test.rb

@@ -121,14 +121,15 @@ module NewRelic
               NewRelic::Agent.drop_buffered_data
               NewRelic::Agent::Hostname.stubs(:get).returns(test['system_hostname'])
 
-              config = convert_test_case_to_config test
-
-              product, operation, collection = ActiveRecordHelper.product_operation_collection_for "Blog Find", nil , config[:adapter]
-              host = ActiveRecordHelper::InstanceIdentification.host(config)
-              port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(config)
-
-              segment = NewRelic::Agent::Transaction.start_datastore_segment product, operation, collection, host, port_path_or_id
-              segment.finish
+              in_transaction do
+                config = convert_test_case_to_config test
+                product, operation, collection = ActiveRecordHelper.product_operation_collection_for "Blog Find", nil , config[:adapter]
+                host = ActiveRecordHelper::InstanceIdentification.host(config)
+                port_path_or_id = ActiveRecordHelper::InstanceIdentification.port_path_or_id(config)
+
+                segment = NewRelic::Agent::Transaction.start_datastore_segment product, operation, collection, host, port_path_or_id
+                segment.finish
+              end
 
               assert_metrics_recorded test['expected_instance_metric']
             end