newrelic_rpm 3.18.1.330 → 4.0.0.332

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

@@ -8,8 +8,7 @@ require 'logger'
 require 'stringio'
 
 # ActiveJob is in Rails 4.2+, so make sure we're on an allowed version before
-# we try to load. Previously just tried to require it, but that had load issues
-# on Rubinius.
+# we try to load.
 if Rails::VERSION::STRING >= "4.2.0"
 
 require 'active_job'

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

@@ -56,11 +56,6 @@ class ErrorController < ApplicationController
     render :text => "Shoulda noticed an error"
   end
 
-  def deprecated_noticed_error
-    newrelic_notice_error(RuntimeError.new('this error should be noticed'))
-    render :text => "Shoulda noticed an error"
-  end
-
   def middleware_error
     render :text => 'everything went great'
   end
@@ -155,14 +150,6 @@ class ErrorsWithoutSSCTest < RailsMultiverseTest
                                'Controller/error/model_error')
   end
 
-  if Rails::VERSION::MAJOR < 5
-    def test_should_capture_deprecated_noticed_error_in_controller
-      get '/error/deprecated_noticed_error'
-      assert_error_reported_once('this error should be noticed',
-                                 'Controller/error/deprecated_noticed_error')
-    end
-  end
-
   def test_should_capture_noticed_error_in_controller
     get '/error/noticed_error'
     assert_error_reported_once('this error should be noticed',

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

@@ -4,20 +4,17 @@
 
 require './app'
 
-# These tests only return consistent results for REE or MRI >= 1.9.2
-if NewRelic::LanguageSupport.ree? ||
-    (RUBY_VERSION >= '1.9.2' &&
-     !NewRelic::LanguageSupport.jruby? &&
-     !NewRelic::LanguageSupport.rubinius?)
+# These tests only return consistent results MRI >= 1.9.2
+if !NewRelic::LanguageSupport.jruby?
 
 class GcController < ApplicationController
   def gc_action
     begin
       NewRelic::Agent::StatsEngine::GCProfiler.init
-      initial_gc_count = current_gc_count
+      initial_gc_count = ::GC.count
 
       Timeout.timeout(5) do
-        until current_gc_count > initial_gc_count
+        until ::GC.count > initial_gc_count
           long_string = "01234567" * 100_000
           long_string = nil
           another_long_string = "01234567" * 100_000
@@ -30,14 +27,6 @@ class GcController < ApplicationController
 
     render :text => 'ha'
   end
-
-  def current_gc_count
-    if NewRelic::LanguageSupport.ree?
-      ::GC.collections
-    elsif RUBY_VERSION >= '1.9.2'
-      ::GC.count
-    end
-  end
 end
 
 class GCRailsInstrumentationTest < ActionController::TestCase
@@ -48,7 +37,7 @@ class GCRailsInstrumentationTest < ActionController::TestCase
   setup_and_teardown_agent do
     NewRelic::Agent.drop_buffered_data
     NewRelic::Agent::StatsEngine::GCProfiler.reset
-    enable_gc_stats
+    GC::Profiler.enable
     @controller = GcController.new
   end
 
@@ -57,8 +46,13 @@ class GCRailsInstrumentationTest < ActionController::TestCase
     get :gc_action
     elapsed = Time.now.to_f - start.to_f
 
-    assert_in_range(elapsed, get_call_time('GC/Transaction/allWeb'))
-    assert_in_range(elapsed, get_call_time('GC/Transaction/allWeb', 'Controller/gc/gc_action'))
+    stats_hash = NewRelic::Agent.instance.stats_engine.reset!
+
+    gc_metric_unscoped = stats_hash[NewRelic::MetricSpec.new('GC/Transaction/allWeb')]
+    gc_metric_scoped = stats_hash[NewRelic::MetricSpec.new('GC/Transaction/allWeb', 'Controller/gc/gc_action')]
+
+    assert_in_range(elapsed, gc_metric_unscoped.total_call_time)
+    assert_in_range(elapsed, gc_metric_scoped.total_call_time)
   end
 
   def test_records_transaction_param_for_gc_activity
@@ -74,20 +68,6 @@ class GCRailsInstrumentationTest < ActionController::TestCase
     assert gc_time > 0.0, "GC Time wasn't recorded!"
     assert gc_time < duration, "GC Time #{gc_time} can't be more than elapsed #{duration}!"
   end
-
-  def get_call_time(name, scope=nil)
-    NewRelic::Agent.agent.stats_engine.
-      get_stats(name, true, false, scope).
-      total_call_time
-  end
-
-  def enable_gc_stats
-    if NewRelic::LanguageSupport.ree?
-      GC.enable_stats
-    elsif RUBY_VERSION >= '1.9.2'
-      GC::Profiler.enable
-    end
-  end
 end
 
 end

data/test/multiverse/suites/rake/Envfile

@@ -1,34 +1,27 @@
-if RUBY_VERSION >= '1.9.3'
-  gemfile <<-RB
-    gem 'rack'
-    gem 'rake', '~> 11.1.0'
-  RB
-end
+gemfile <<-RB
+  gem 'rack'
+  gem 'rake', '~> 12.0'
+RB
 
 gemfile <<-RB
   gem 'rack'
-  gem 'rake', '~> 10.4'
+  gem 'rake', '~> 11.1'
 RB
 
-# No single Rails version works everywhere, so split it up
-if RUBY_VERSION >= "1.9.3"
-  if RUBY_VERSION < '2.4.0'
-    gemfile <<-RB
-      gem 'rack'
-      gem 'rake', '~> 10.4'
-      gem 'rails', '~> 4.2.1'
-      gem 'minitest', '5.2.3'
-      gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
-    RB
-  end
-else
 gemfile <<-RB
   gem 'rack'
-  gem 'rack-cache', '1.2' # rack-cache >= 1.3.0 only works on Ruby 1.9.3 and newer
   gem 'rake', '~> 10.4'
-  gem 'rails', '~> 3.2.21'
-  gem 'i18n', '~>0.6.11'
 RB
+
+# No single Rails version works everywhere, so split it up
+if RUBY_VERSION < '2.4.0'
+  gemfile <<-RB
+    gem 'rack'
+    gem 'rake', '~> 10.4'
+    gem 'rails', '~> 4.2.1'
+    gem 'minitest', '5.2.3'
+    gem 'nokogiri', '< 1.7' if RUBY_VERSION < '2.1.0' # nokogiri 1.7.0 only supports >= 2.1.0
+  RB
 end
 
 gemfile <<-RB

data/test/multiverse/suites/redis/redis_instrumentation_test.rb

@@ -321,7 +321,7 @@ class NewRelic::Agent::Instrumentation::RedisInstrumentationTest < Minitest::Tes
   end
 
   def client
-    if NewRelic::VersionNumber.new(Redis::VERSION).major_version < 4
+    if Gem::Version.new(Redis::VERSION).segments[0] < 4
       :client
     else
       :_client

data/test/multiverse/suites/sequel/database.rb

@@ -10,9 +10,6 @@ require 'sequel'
 # DO NOT require newrelic_rpm here. Some of the tests rely on the timing of
 # when New Relic gets pulled in.
 if !defined?(DB)
-  def jruby?
-    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-  end
 
   def create_tables(db)
     db.create_table( :authors ) do
@@ -37,7 +34,7 @@ if !defined?(DB)
   end
 
   # Use an in-memory SQLite database
-  if (jruby?)
+  if (RUBY_ENGINE == 'jruby')
     DB = Sequel.connect('jdbc:sqlite::memory:')
   else
     DB = Sequel.sqlite

data/test/multiverse/suites/sidekiq/Envfile

@@ -1,28 +1,19 @@
-suite_condition("SideKiq requires MRI 1.9.3 or JRuby 1.6 in 1.9 mode") do
-  RUBY_VERSION >= '1.9.3' || (RUBY_PLATFORM == 'java' && RUBY_VERSION >= '1.9')
-end
-
-# Sidekiq 3.x does not support MRI 1.9.x
-if (RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.4.0') || (RUBY_PLATFORM == 'java')
-  gemfile <<-RB
-    gem 'json'
-    gem 'sidekiq', '~> 3.4.2'
-    gem 'rack'
+gemfile <<-RB
+  gem 'json'
+  gem 'sidekiq', '~> 3.4.2'
+  gem 'rack'
 
-    gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
-  RB
-end
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+RB
 
-if RUBY_VERSION >= '2.0.0' || (RUBY_PLATFORM == 'java')
-  gemfile <<-RB
-    gem 'json'
-    gem 'sidekiq', '~> 4.0.0'
-    gem 'rack'
-    gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
-  RB
-end
+gemfile <<-RB
+  gem 'json'
+  gem 'sidekiq', '~> 4.0.0'
+  gem 'rack'
+  gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
+RB
 
-if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.4.0' && RUBY_PLATFORM != 'java'
+if 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
@@ -42,7 +33,6 @@ RB
 
 gemfile <<-RB
   # Almost oldest supported version
-  # Having rbx issues on 2.8.0, 2.9.0 seems fine.
   gem 'json'
   gem 'sidekiq', '~> 2.9.0'
   gem 'timers', '~> 1.1.0'

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

@@ -21,7 +21,7 @@ module SinatraTestCases
       'GET /route/no_match'
     end
 
-    if NewRelic::VersionNumber.new(Sinatra::VERSION).major_version < 2
+    if Gem::Version.new(Sinatra::VERSION).segments[0] < 2
       # get /\/regex.*/
       def regex_segment
         'GET (?-mix:\/regex.*)'
@@ -188,7 +188,7 @@ module SinatraTestCases
 
     get '/pass'
 
-    expected_status = NewRelic::VersionNumber.new(Sinatra::VERSION).major_version < 2 ? 200 : 400
+    expected_status = Gem::Version.new(Sinatra::VERSION).segments[0] < 2 ? 200 : 400
 
     assert_equal expected_status, last_response.status
   end
@@ -203,7 +203,7 @@ module SinatraTestCases
   end
 
 
-  if NewRelic::VersionNumber.new(Sinatra::VERSION).major_version < 2
+  if Gem::Version.new(Sinatra::VERSION).segments[0] < 2
     def trigger_error_on_params
       Sinatra::Request.any_instance.
       stubs(:params).returns({}).

data/test/multiverse/suites/typhoeus/Envfile

@@ -1,35 +1,19 @@
-suite_condition("Typhoeus excluded on 1.8.7") do
-  # Under Ruby 1.8.7 there are periodic segfaults with Typhoeus
-  # and the Ruby agent. This predated our Typhoeus instrumentation, but given
-  # usage levels and obscurity of the issue, it isn't worth deeper digging.
-  # Just use >= 1.9
-  RUBY_VERSION > '1.8.7'
-end
-
 gemfile <<-RB
   gem 'typhoeus', '~> 0.7.1'
   gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
 
   # We try translating URIs through Addressable if it's there, so test with it.
   gem 'addressable', :require => 'addressable/uri'
-  if RUBY_VERSION < '1.9.3'
-    gem 'public_suffix', '< 1.4'
-  elsif RUBY_VERSION < '2.0'
-    gem 'public_suffix', '< 1.5'
-  end
 RB
 
 gemfile <<-RB
   gem 'typhoeus', '~> 0.7.1'
   gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 gemfile <<-RB
   gem 'typhoeus', '~> 0.6.9'
   gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 if RUBY_VERSION < '2.4.0'
@@ -46,7 +30,6 @@ if RUBY_VERSION < '2.4.0'
 
     gem 'typhoeus', '~> 0.5.4'
     gem 'rack'
-    gem 'json', :platforms => [:rbx, :mri_18]
   RB
 
   # Earliest supported version
@@ -63,7 +46,6 @@ if RUBY_VERSION < '2.4.0'
 
     gem 'typhoeus', '0.5.3'
     gem 'rack'
-    gem 'json', :platforms => [:rbx, :mri_18]
   RB
 end
 
@@ -81,7 +63,6 @@ gemfile <<-RB
 
   gem 'typhoeus', '0.5.2'
   gem 'rack'
-  gem 'json', :platforms => [:rbx, :mri_18]
 RB
 
 # vim: ft=ruby

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

@@ -11,13 +11,13 @@ if NewRelic::Agent::Instrumentation::TyphoeusTracing.is_supported_version?
   class TyphoeusTest < Minitest::Test
     include HttpClientTestCases
 
-    USE_SSL_VERIFYPEER_VERSION  = NewRelic::VersionNumber.new("0.5.0")
+    USE_SSL_VERIFYPEER_VERSION  = Gem::Version.new("0.5.0")
 
     # Starting in version 0.6.4, Typhoeus supports passing URI instances instead
     # of String URLs. Make sure we don't break that.
-    SUPPORTS_URI_OBJECT_VERSION = NewRelic::VersionNumber.new("0.6.4")
+    SUPPORTS_URI_OBJECT_VERSION = Gem::Version.new("0.6.4")
 
-    CURRENT_TYPHOEUS_VERSION = NewRelic::VersionNumber.new(Typhoeus::VERSION)
+    CURRENT_TYPHOEUS_VERSION = Gem::Version.new(Typhoeus::VERSION)
 
     def ssl_option
       if CURRENT_TYPHOEUS_VERSION >= USE_SSL_VERIFYPEER_VERSION

data/test/multiverse/suites/yajl/Envfile

@@ -2,6 +2,11 @@ suite_condition("Yajl not supported for JRuby or 2.4") do
   RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.4.0'
 end
 
+gemfile <<-RB
+  gem 'rack'
+  gem 'yajl-ruby', '~> 1.3.0', require: ['yajl', 'yajl/json_gem']
+RB
+
 gemfile <<-RB
   gem 'rack'
   gem 'yajl-ruby', '~> 1.2.1'

data/test/multiverse/suites/yajl/yajl_test.rb

@@ -12,7 +12,5 @@ class YajlTest < Minitest::Test
   include MultiverseHelpers
   include MarshallingTestCases
 
-  setup_and_teardown_agent do
-    Yajl::Encoder.expects(:encode).never
-  end
+  setup_and_teardown_agent
 end

data/test/new_relic/agent/agent/start_test.rb

@@ -89,7 +89,7 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
   private :at_exit
 
   def test_install_exit_handler_positive
-    NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
+    NewRelic::LanguageSupport.expects(:jruby?).returns(false)
     self.expects(:sinatra_classic_app?).returns(false)
     # we are overriding at_exit above, to immediately return, so we can
     # test the shutdown logic. It's somewhat unfortunate, but we can't
@@ -109,10 +109,10 @@ class NewRelic::Agent::Agent::StartTest < Minitest::Test
 
   def test_install_exit_handler_weird_ruby
     with_config(:send_data_one_exit => true) do
-      NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(false)
+      NewRelic::LanguageSupport.expects(:jruby?).returns(false)
       self.expects(:sinatra_classic_app?).returns(true)
       install_exit_handler
-      NewRelic::LanguageSupport.expects(:using_engine?).with('jruby').returns(true)
+      NewRelic::LanguageSupport.expects(:jruby?).returns(true)
       install_exit_handler
     end
   end

data/test/new_relic/agent/agent_logger_test.rb

@@ -248,8 +248,8 @@ class AgentLoggerTest < Minitest::Test
 
   def test_log_exception_gets_backtrace_for_system_stack_error
     # This facility compensates for poor SystemStackError traces on MRI.
-    # JRuby and Rubinius raise errors with good backtraces, so skip this test.
-    return if jruby? || rubinius?
+    # JRuby raises errors with good backtraces, so skip this test.
+    return if NewRelic::LanguageSupport.jruby?
 
     logger = create_basic_logger
 

data/test/new_relic/agent/agent_test.rb

@@ -205,7 +205,7 @@ module NewRelic
         nthreads.times do |tid|
           t = Thread.new do
             nmetrics.times do |mid|
-              @agent.stats_engine.get_stats("m#{mid}").record_data_point(1)
+              @agent.stats_engine.tl_record_unscoped_metrics("m#{mid}", 1)
             end
           end
           t.abort_on_exception = true
@@ -265,7 +265,7 @@ module NewRelic
 
         # This method should NOT increment error counts, since that has already
         # been counted in the child
-        assert_equal 0, @agent.stats_engine.get_stats("Errors/all").call_count
+        assert_metrics_not_recorded "Errors/all"
       end
 
       def test_harvest_and_send_analytic_event_data_merges_in_samples_on_failure

data/test/new_relic/agent/attribute_processing_test.rb

@@ -131,10 +131,9 @@ class AttributeProcessingTest < Minitest::Test
       },
       NewRelic::Agent::AttributeProcessing.flatten_and_coerce(
         {
-          # Ruby 1.8.7 doesn't have Float::NAN, INFINITY so we have to hack it
-          'nan'  => 0.0  / 0.0,
-          'inf'  => 1.0  / 0.0,
-          'ninf' => -1.0 / 0.0
+          'nan'  => Float::NAN,
+          'inf'  => Float::INFINITY,
+          'ninf' => -Float::INFINITY
         }
       )
     )

data/test/new_relic/agent/audit_logger_test.rb

@@ -130,12 +130,10 @@ class AuditLoggerTest < Minitest::Test
 
   def test_logs_json_with_json_marshaller
     marshaller_cls = NewRelic::Agent::NewRelicService::JsonMarshaller
-    if marshaller_cls.is_supported?
-      setup_fake_logger
-      json_marshaller = marshaller_cls.new
-      @logger.log_request(@uri, @dummy_data, json_marshaller)
-      assert_audit_log_contains_object(read_log_body, @dummy_data, :json)
-    end
+    setup_fake_logger
+    json_marshaller = marshaller_cls.new
+    @logger.log_request(@uri, @dummy_data, json_marshaller)
+    assert_audit_log_contains_object(read_log_body, @dummy_data, :json)
   end
 
   def test_allows_through_endpoints