newrelic_rpm 3.18.1.330 → 4.0.0.332

data/test/new_relic/language_support_test.rb

@@ -5,39 +5,33 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 
 class NewRelic::LanguageSupportTest < Minitest::Test
-  include ::NewRelic::TestHelpers::RuntimeDetection
 
   def test_object_space_usable_on_jruby_with_object_space_enabled
-    return unless jruby?
+    return unless NewRelic::LanguageSupport.jruby?
     JRuby.objectspace = true
     assert_truthy NewRelic::LanguageSupport.object_space_usable?
   end
 
   def test_object_space_not_usable_on_jruby_with_object_space_disabled
-    return unless jruby?
+    return unless NewRelic::LanguageSupport.jruby?
     JRuby.objectspace = false
     assert_falsy NewRelic::LanguageSupport.object_space_usable?
   end
 
-  def test_object_space_not_usable_on_rubinius
-    return unless rubinius?
-    assert_falsy NewRelic::LanguageSupport.object_space_usable?
-  end
-
   def test_gc_profiler_unavailable_without_constant
     undefine_constant(:'GC::Profiler') do
-      assert_equal false, NewRelic::LanguageSupport.gc_profiler_usable?
+      refute NewRelic::LanguageSupport.gc_profiler_usable?
     end
   end
 
   def test_gc_profiler_unavailable_on_jruby
-    return unless jruby?
+    return unless NewRelic::LanguageSupport.jruby?
     assert_equal false, NewRelic::LanguageSupport.gc_profiler_usable?
   end
 
   def test_gc_profiler_disabled_without_constant
     undefine_constant(:'GC::Profiler') do
-      assert_equal false, NewRelic::LanguageSupport.gc_profiler_enabled?
+      refute NewRelic::LanguageSupport.gc_profiler_enabled?
     end
   end
 
@@ -66,7 +60,7 @@ class NewRelic::LanguageSupportTest < Minitest::Test
   end
 
   def test_gc_profiler_disabled_on_jruby
-    return unless defined?(::GC::Profiler) && jruby?
+    return unless defined?(::GC::Profiler) && NewRelic::LanguageSupport.jruby?
 
     ::GC::Profiler.stubs(:enabled?).returns(true)
     assert_equal false, NewRelic::LanguageSupport.gc_profiler_enabled?

data/test/new_relic/latest_changes_test.rb

@@ -6,17 +6,6 @@ require File.expand_path(File.join(__FILE__,'..','..','test_helper'))
 
 module NewRelic
   class LatestChangesTest < MiniTest::Test
-    def setup
-      # 1.8.7 returns relative paths for __FILE__. test:env environment then
-      # can't find the CHANGELOG since current dir is test app instead of gem.
-      #
-      # This doesn't impact production usage of NewRelic::LatestChanges on
-      # the gem post-installation, since that's run in our gem's context. So
-      # just fix up the pathing in the test for finding default changelog.
-      if RUBY_VERSION < '1.9.1'
-        NewRelic::LatestChanges.stubs(:default_changelog).returns(File.join(File.dirname(__FILE__), '..', '..', 'CHANGELOG.md'))
-      end
-    end
 
     def test_read_default_changelog
       result = NewRelic::LatestChanges.read

data/test/new_relic/license_test.rb

@@ -27,14 +27,9 @@ class LicenseTest < Minitest::Test
   # the source code.
   EXPECTED_LICENSE_OCCURRENCES = {
     ['/newrelic_rpm.gemspec', 'MIT'] => 1, # licenses specificiation, which includes MIT for MIT-licensed portions of code
-    ['/lib/new_relic/okjson.rb', '(c)'] => 3, # methods arguments like (c)
-    ['/lib/new_relic/okjson.rb', 'Copyright'] => 3, # okjson license info
-    ['/lib/new_relic/timer_lib.rb', '(c)'] => 1, # timer_lib license info
-    ['/lib/new_relic/timer_lib.rb', 'Copyright'] => 1, # timer_lib license info
-    ['/LICENSE', 'GPL'] => 1, # dual license info for system_timer
-    ['/LICENSE', 'MIT'] => 3,
-    ['/LICENSE', '(c)'] => 3,
-    ['/LICENSE', 'Copyright'] => 11,
+    ['/LICENSE', 'MIT'] => 2,
+    ['/LICENSE', '(c)'] => 2,
+    ['/LICENSE', 'Copyright'] => 4,
     ['/LICENSE', 'rights reserved'] => 1,
     ['/ui/views/layouts/newrelic_default.rhtml', 'rights reserved'] => 1,
     ['/ui/views/newrelic/file/javascript/jquery-1.4.2.js', 'GPL'] => 3,

data/test/new_relic/multiverse_helpers.rb

@@ -176,7 +176,7 @@ module MultiverseHelpers
     raw_attributes = @js_data["atts"]
 
     if raw_attributes
-      attributes = NewRelic::JSONWrapper.load @instrumentor.obfuscator.deobfuscate(raw_attributes)
+      attributes = ::JSON.load @instrumentor.obfuscator.deobfuscate(raw_attributes)
       @js_custom_attributes = attributes['u']
       @js_agent_attributes = attributes['a']
     end

data/test/new_relic/noticed_error_test.rb

@@ -5,6 +5,8 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..','test_helper'))
 require 'new_relic/agent/transaction/attributes'
 
+class FooError < StandardError; end
+
 class NewRelic::Agent::NoticedErrorTest < Minitest::Test
   include NewRelic::TestHelpers::Exceptions
 
@@ -173,13 +175,6 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
     end
   end
 
-  def test_handles_exception_with_nil_cause
-    e = Exception.new('Buffy FOREVER')
-    e.stubs(:cause).returns(nil)
-    error = NewRelic::NoticedError.new(@path, e, @time)
-    assert_equal(error.message.to_s, 'Buffy FOREVER')
-  end
-
   def test_handles_exception_with_nil_original_exception
     e = Exception.new('Buffy FOREVER')
     e.stubs(:original_exception).returns(nil)
@@ -187,6 +182,15 @@ class NewRelic::Agent::NoticedErrorTest < Minitest::Test
     assert_equal(error.message.to_s, 'Buffy FOREVER')
   end
 
+  if defined?(Rails) && Rails::VERSION::MAJOR < 5
+    def test_uses_original_exception_class_name
+      orig = FooError.new
+      e = mock('exception', original_exception: orig)
+      error = NewRelic::NoticedError.new(@path, e, @time)
+      assert_equal(error.exception_class_name, 'FooError')
+    end
+  end
+
   def test_intrinsics_always_get_sent
     with_config(:'error_collector.attributes.enabled' => false) do
       attributes = NewRelic::Agent::Transaction::Attributes.new(NewRelic::Agent.instance.attribute_filter)

data/test/new_relic/rack/browser_monitoring_test.rb

@@ -5,7 +5,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..',
                                    'test_helper'))
 require 'rack/test'
-require 'new_relic/agent/instrumentation/rack'
 require 'new_relic/rack/browser_monitoring'
 
 ENV['RACK_ENV'] = 'test'
@@ -48,7 +47,6 @@ EOL
 
       [200, {'Content-Type' => 'text/html'}, response]
     end
-    include NewRelic::Agent::Instrumentation::Rack
   end
 
   def app
@@ -154,7 +152,7 @@ EOL
 
   def test_with_invalid_us_ascii_encoding
     response = "<html><body>Jürgen</body></html>"
-    response.force_encoding(Encoding.find("US-ASCII")) if RUBY_VERSION >= '1.9'
+    response.force_encoding(Encoding.find("US-ASCII"))
     TestApp.next_response = Rack::Response.new(response)
 
     get '/'

data/test/nullverse/nullverse_helper.rb

@@ -7,4 +7,4 @@ unless defined?(Minitest::Test)
   Minitest::Test = MiniTest::Unit::TestCase
 end
 
-$:.unshift File.expand_path('../../lib', File.dirname(__FILE__))
+$:.unshift File.expand_path('../../../lib', __FILE__)

data/test/performance/lib/performance.rb

@@ -4,7 +4,7 @@
 
 require 'logger'
 
-$: << File.expand_path(File.dirname(__FILE__))
+$: << File.expand_path('..', __FILE__)
 
 require 'performance/platform'
 require 'performance/result'

data/test/performance/lib/performance/instrumentation/gc_stats.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class MRIGCStats < Instrumentor
-      platforms :mri_193, :mri_20, :mri_21, :mri_22, :mri_23
+      platforms :mri_20, :mri_21, :mri_22, :mri_23, :mri_24
       on_by_default
 
       def before(*)
@@ -24,11 +24,9 @@ module Performance
           :gc_runs      => @stats_after[:count] - @stats_before[:count],
           :live_objects => heap_live_after      - heap_live_before
         }
-        if RUBY_VERSION >= "2.0.0"
-          allocs_before = @stats_before[:total_allocated_objects] || @stats_before[:total_allocated_object]
-          allocs_after  = @stats_after[:total_allocated_objects]  || @stats_after[:total_allocated_object]
-          res[:allocations] = allocs_after - allocs_before
-        end
+        allocs_before = @stats_before[:total_allocated_objects] || @stats_before[:total_allocated_object]
+        allocs_after  = @stats_after[:total_allocated_objects]  || @stats_after[:total_allocated_object]
+        res[:allocations] = allocs_after - allocs_before
         res
       end
     end

data/test/performance/lib/performance/instrumentation/perf_tools.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class PerfToolsProfile < Instrumentor
-      platforms :mri_19, :mri_20, :mri_21
+      platforms :mri_20, :mri_21
 
       def self.setup
         require 'tmpdir'

data/test/performance/lib/performance/instrumentation/stackprof.rb

@@ -5,7 +5,7 @@
 module Performance
   module Instrumentation
     class StackProfProfile < Instrumentor
-      platforms :mri_21, :mri_22, :mri_23
+      platforms :mri_21, :mri_22, :mri_23, :mri_24
 
       def self.setup
         require 'tmpdir'

data/test/performance/lib/performance/platform.rb

@@ -12,22 +12,15 @@ module Performance
       defined?(JRUBY_VERSION)
     end
 
-    def ree?
-      defined?(RUBY_DESCRIPTION) && RUBY_DESCRIPTION =~ /MBARI/
-    end
-
     def match?(p)
       case p
       when :jruby   then jruby?
       when :mri     then !jruby?
-      when :ree     then !jruby? && ree?
-      when :mri_18  then !jruby? && RUBY_VERSION =~ /^1\.8\./
-      when :mri_19  then !jruby? && RUBY_VERSION =~ /^1\.9\./
-      when :mri_193 then !jruby? && RUBY_VERSION =~ /^1\.9\.3/
       when :mri_20  then !jruby? && RUBY_VERSION =~ /^2\.0\./
       when :mri_21  then !jruby? && RUBY_VERSION =~ /^2\.1\./
       when :mri_22  then !jruby? && RUBY_VERSION =~ /^2\.2\./
       when :mri_23  then !jruby? && RUBY_VERSION =~ /^2\.3\./
+      when :mri_24  then !jruby? && RUBY_VERSION =~ /^2\.4\./
       end
     end
 

data/test/performance/script/runner

@@ -8,9 +8,7 @@ require 'optparse'
 require 'rubygems'
 require 'json'
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'performance')
-
-target_versions = nil
+require File.expand_path('../../lib/performance', __FILE__)
 
 options = {}
 parser = OptionParser.new do |opts|

data/test/performance/suites/active_record.rb

@@ -2,30 +2,9 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+require 'new_relic/agent/instrumentation/active_record_helper'
 
 class ActiveRecordTest < Performance::TestCase
-  def setup
-    require 'new_relic/agent/instrumentation/active_record_helper'
-
-    ActiveRecordTest.const_set(:ActiveRecordHelper, NewRelic::Agent::Instrumentation::ActiveRecordHelper) unless defined?(ActiveRecordHelper)
-
-    if ActiveRecordHelper.respond_to?(:metrics_for)
-      @run = ActiveRecordHelper.method(:metrics_for)
-    else
-      # Mimics what was buried in the instrumentation that we replaced with
-      # calls to metrics_for in the new instrumentation. Can run against SHA
-      # 399d8ed for baselining (3.10 tags won't work since the perf testing
-      # changed on dev post 3.10)
-      @run = proc do |name, sql, adapter, *_|
-        metric = ActiveRecordHelper.metric_for_name(name) ||
-                 ActiveRecordHelper.metric_for_sql(sql)
-        remote_service_metric = ActiveRecordHelper.remote_service_metric("host", adapter)
-
-        metrics = [metric, remote_service_metric].compact
-        metrics += ActiveRecordHelper.rollup_metrics_for(metric)
-      end
-    end
-  end
 
   NAME    = "Model Load"
   SQL     = "SELECT * FROM star"
@@ -33,7 +12,7 @@ class ActiveRecordTest < Performance::TestCase
 
   def test_helper_by_name
     measure do
-      @run.call(NAME, SQL, ADAPTER)
+      NewRelic::Agent::Instrumentation::ActiveRecordHelper.product_operation_collection_for NAME, SQL, ADAPTER
     end
   end
 
@@ -41,7 +20,7 @@ class ActiveRecordTest < Performance::TestCase
 
   def test_helper_by_sql
     measure do
-      @run.call(UNKNOWN_NAME, SQL, ADAPTER)
+      NewRelic::Agent::Instrumentation::ActiveRecordHelper.product_operation_collection_for UNKNOWN_NAME, SQL, ADAPTER
     end
   end
 end

data/test/test_helper.rb

@@ -2,15 +2,15 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
+# define special constant so DefaultSource.framework can return :test
 module NewRelic; TEST = true; end unless defined? NewRelic::TEST
+
 ENV['RAILS_ENV'] = 'test'
-NEWRELIC_PLUGIN_DIR = File.expand_path(File.join(File.dirname(__FILE__),".."))
-$LOAD_PATH << '.'
-$LOAD_PATH << '../../..'
-$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"lib")
-$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"test")
-$LOAD_PATH << File.join(NEWRELIC_PLUGIN_DIR,"ui/helpers")
-$LOAD_PATH.uniq!
+
+$: << File.expand_path('../../lib', __FILE__)
+$: << File.expand_path('../../test', __FILE__)
+$: << File.expand_path('../../ui/helpers', __FILE__) # TODO remove after #1493 merges
+$:.uniq!
 
 require 'rubygems'
 require 'rake'
@@ -18,58 +18,10 @@ require 'rake'
 require 'minitest/autorun'
 require 'mocha/setup'
 
-unless defined?(Minitest::Test)
-  Minitest::Test = MiniTest::Unit::TestCase
-end
-
 require 'hometown'
 Hometown.watch(::Thread)
 
-# Set up a watcher for leaking agent threads out of tests.  It'd be nice to
-# disable the threads everywhere, but not all tests have newrelic.yml loaded to
-# us to rely on, so instead we'll just watch for it.
-class Minitest::Test
-  def before_setup
-    if self.respond_to?(:name)
-      test_method_name = self.name
-    else
-      test_method_name = self.__name__
-    end
-
-    NewRelic::Agent.logger.info("*** #{self.class}##{test_method_name} **")
-
-    @__thread_count = ruby_threads.count
-    super
-  end
-
-  def after_teardown
-    unfreeze_time
-
-    threads = ruby_threads
-    if @__thread_count != threads.count
-      backtraces = threads.map do |thread|
-        trace = Hometown.for(thread)
-        trace.backtrace.join("\n    ")
-      end.join("\n\n")
-
-      fail "Thread count changed in this test from #{@__thread_count} to #{threads.count}\n#{backtraces}"
-    end
-
-    super
-  end
-
-  # We only want to count threads that were spun up from Ruby (i.e.
-  # Thread.new) JRuby has system threads we don't care to track.
-  def ruby_threads
-    Thread.list.select { |t| Hometown.for(t) }
-  end
-end
-
-Dir.glob('test/helpers/*').each { |f| require f }
-
-Dir.glob(File.join(NEWRELIC_PLUGIN_DIR,'test/helpers/*.rb')).each do |helper|
-  require helper
-end
+Dir[File.expand_path('../helpers/*', __FILE__)].each {|f| require f.sub(/.*test\//,'')}
 
 # We can speed things up in tests that don't need to load rails.
 # You can also run the tests in a mode without rails.  Many tests
@@ -79,7 +31,7 @@ if ENV["NO_RAILS"]
   require 'newrelic_rpm'
 else
   begin
-    require 'config/environment'
+    require './config/environment'
     require 'newrelic_rpm'
   rescue LoadError
     puts "Running tests in standalone mode."
@@ -105,162 +57,3 @@ end
 # This is the public method recommended for plugin developers to share our
 # agent helpers. Use it so we don't accidentally break it.
 NewRelic::Agent.require_test_helper
-
-def default_service(stubbed_method_overrides = {})
-  service = stub
-  stubbed_method_defaults = {
-    :connect => {},
-    :shutdown => nil,
-    :agent_id= => nil,
-    :agent_id => nil,
-    :collector => stub_everything,
-    :request_timeout= =>  nil,
-    :metric_data => nil,
-    :error_data => nil,
-    :transaction_sample_data => nil,
-    :sql_trace_data => nil,
-    :get_agent_commands => [],
-    :agent_command_results => nil,
-    :analytic_event_data => nil,
-    :valid_to_marshal? => true
-  }
-
-  service.stubs(stubbed_method_defaults.merge(stubbed_method_overrides))
-
-  # When session gets called yield to the given block.
-  service.stubs(:session).yields
-  service
-end
-
-def with_verbose_logging
-  orig_logger = NewRelic::Agent.logger
-  $stderr.puts '', '---', ''
-  new_logger = NewRelic::Agent::AgentLogger.new('', Logger.new($stderr) )
-  NewRelic::Agent.logger = new_logger
-
-  with_config(:log_level => 'debug') do
-    yield
-  end
-ensure
-  NewRelic::Agent.logger = orig_logger
-end
-
-# Need to be a bit sloppy when testing against the logging--let everything
-# through, but check we (at least) get our particular message we care about
-def expects_logging(level, *with_params)
-  ::NewRelic::Agent.logger.stubs(level)
-  ::NewRelic::Agent.logger.expects(level).with(*with_params).once
-end
-
-def expects_no_logging(level)
-  ::NewRelic::Agent.logger.expects(level).never
-end
-
-# Sometimes need to test cases where we muddle with the global logger
-# If so, use this method to ensure it gets restored after we're done
-def without_logger
-  logger = ::NewRelic::Agent.logger
-  ::NewRelic::Agent.logger = nil
-  yield
-ensure
-  ::NewRelic::Agent.logger = logger
-end
-
-def fixture_tcp_socket( response )
-  # Don't actually talk to Google.
-  socket = stub("socket") do
-    stubs(:closed?).returns(false)
-    stubs(:close)
-    stubs(:setsockopt)
-
-    # Simulate a bunch of socket-ey stuff since Mocha doesn't really
-    # provide any other way to do it
-    class << self
-      attr_accessor :response, :write_checker
-    end
-
-    def self.check_write
-      self.write_checker = Proc.new
-    end
-
-    def self.write( buf )
-      self.write_checker.call( buf ) if self.write_checker
-      buf.length
-    end
-
-    def self.sysread( size, buf='' )
-      @data ||= response.to_s
-      raise EOFError if @data.empty?
-      buf.replace @data.slice!( 0, size )
-      buf
-    end
-    class << self
-      alias_method :read_nonblock, :sysread
-    end
-
-  end
-
-  socket.response = response
-  TCPSocket.stubs( :open ).returns( socket )
-
-  return socket
-end
-
-def dummy_mysql_explain_result(hash=nil)
-  hash ||= {
-    'Id' => '1',
-    'Select Type' => 'SIMPLE',
-    'Table' => 'sandwiches',
-    'Type' => 'range',
-    'Possible Keys' => 'PRIMARY',
-    'Key' => 'PRIMARY',
-    'Key Length' => '4',
-    'Ref' => '',
-    'Rows' => '1',
-    'Extra' => 'Using index'
-  }
-  explain_result = mock('explain result')
-  explain_result.stubs(:each_hash).yields(hash)
-  explain_result
-end
-
-module TransactionSampleTestHelper
-  module_function
-  def make_sql_transaction(*sql)
-    sampler = nil
-    state = NewRelic::Agent::TransactionState.tl_get
-
-    in_transaction('/path') do
-      sampler = NewRelic::Agent.instance.transaction_sampler
-      sampler.notice_push_frame(state, "a")
-      explainer = NewRelic::Agent::Instrumentation::ActiveRecord::EXPLAINER
-      sql.each {|sql_statement| sampler.notice_sql(sql_statement, {:adapter => "mysql"}, 0, state, explainer) }
-      sleep 0.02
-      yield if block_given?
-      sampler.notice_pop_frame(state, "a")
-    end
-
-    return sampler.last_sample
-  end
-
-  def run_sample_trace(path='/path')
-    sampler = nil
-    state = NewRelic::Agent::TransactionState.tl_get
-
-    request = stub(:path => path)
-
-    in_transaction("Controller/sandwiches/index", :request => request) do
-      sampler = NewRelic::Agent.instance.transaction_sampler
-      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'wheat'", {}, 0, state)
-      sampler.notice_push_frame(state, "ab")
-      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'white'", {}, 0, state)
-      yield sampler if block_given?
-      sampler.notice_pop_frame(state, "ab")
-      sampler.notice_push_frame(state, "lew")
-      sampler.notice_sql("SELECT * FROM sandwiches WHERE bread = 'french'", {}, 0, state)
-      sampler.notice_pop_frame(state, "lew")
-    end
-
-    return sampler.last_sample
-  end
-end