newrelic_rpm 3.18.1.330 → 4.0.0.332

data/test/new_relic/agent/stats_engine/metric_stats_test.rb

@@ -162,34 +162,32 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     ])
   end
 
-  unless NewRelic::LanguageSupport.rubinius? # Routine segfaults with rbx, see RUBY-1507
-    def test_record_scoped_and_unscoped_metrics_is_thread_safe
-      threads = []
-      nthreads = 25
-      iterations = 100
-
-      nthreads.times do |tid|
-        threads << Thread.new do
-          iterations.times do
-            in_transaction('txn') do
-              @engine.tl_record_scoped_and_unscoped_metrics('m1', ['m3'], 1)
-              @engine.tl_record_scoped_and_unscoped_metrics('m2', ['m4'], 1)
-            end
+  def test_record_scoped_and_unscoped_metrics_is_thread_safe
+    threads = []
+    nthreads = 25
+    iterations = 100
+
+    nthreads.times do |tid|
+      threads << Thread.new do
+        iterations.times do
+          in_transaction('txn') do
+            @engine.tl_record_scoped_and_unscoped_metrics('m1', ['m3'], 1)
+            @engine.tl_record_scoped_and_unscoped_metrics('m2', ['m4'], 1)
           end
         end
       end
-      threads.each { |t| t.join }
-
-      expected = { :call_count => nthreads * iterations }
-      assert_metrics_recorded(
-        'm1'          => expected,
-        'm2'          => expected,
-        ['m1', 'txn'] => expected,
-        ['m2', 'txn'] => expected,
-        'm3'          => expected,
-        'm4'          => expected
-      )
     end
+    threads.each { |t| t.join }
+
+    expected = { :call_count => nthreads * iterations }
+    assert_metrics_recorded(
+      'm1'          => expected,
+      'm2'          => expected,
+      ['m1', 'txn'] => expected,
+      ['m2', 'txn'] => expected,
+      'm3'          => expected,
+      'm4'          => expected
+    )
   end
 
   def test_record_scoped_and_unscoped_metrics_records_unscoped_if_not_in_txn
@@ -206,41 +204,22 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     )
   end
 
-  def test_get_no_scope
-    s1 = @engine.get_stats "a"
-    s2 = @engine.get_stats "a"
-    s3 = @engine.get_stats "b"
-
-    refute_nil s1
-    refute_nil s2
-    refute_nil s3
-
-    assert s1 == s2
-    refute_same(s1, s3)
-  end
-
   def test_harvest
     @engine.clear_stats
-    s1 = @engine.get_stats "a"
-    s2 = @engine.get_stats "c"
 
-    s1.trace_call 10
-    s2.trace_call 1
-    s2.trace_call 3
+    @engine.tl_record_unscoped_metrics "a", 10
+    @engine.tl_record_unscoped_metrics "c", 1
+    @engine.tl_record_unscoped_metrics "c", 3
 
-    assert_equal 1, @engine.get_stats("a").call_count
-    assert_equal 10, @engine.get_stats("a").total_call_time
-
-    assert_equal 2, @engine.get_stats("c").call_count
-    assert_equal 4, @engine.get_stats("c").total_call_time
+    assert_metrics_recorded({
+      "a" => {:call_count => 1, :total_call_time => 10},
+      "c" => {:call_count => 2, :total_call_time => 4}
+    })
 
     harvested = @engine.harvest!.to_h
 
     # after harvest, all the metrics should be reset
-    assert_equal 0, @engine.get_stats("a").call_count
-    assert_equal 0, @engine.get_stats("a").total_call_time
-    assert_equal 0, @engine.get_stats("c").call_count
-    assert_equal 0, @engine.get_stats("c").total_call_time
+    refute_metrics_recorded %w(a c)
 
     spec_a = NewRelic::MetricSpec.new('a')
 
@@ -258,9 +237,9 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
     rules_engine = NewRelic::Agent::RulesEngine.new([rule])
 
     @engine.metric_rules = rules_engine
-    @engine.get_stats_no_scope('Custom/foo/1/bar/22').record_data_point(1)
-    @engine.get_stats_no_scope('Custom/foo/3/bar/44').record_data_point(1)
-    @engine.get_stats_no_scope('Custom/foo/5/bar/66').record_data_point(1)
+    @engine.tl_record_unscoped_metrics('Custom/foo/1/bar/22', 1)
+    @engine.tl_record_unscoped_metrics('Custom/foo/3/bar/44', 1)
+    @engine.tl_record_unscoped_metrics('Custom/foo/5/bar/66', 1)
 
     harvested = @engine.harvest!.to_h
 
@@ -290,16 +269,15 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
   end
 
   def test_harvest_with_merge
-    s = @engine.get_stats "a"
-    s.trace_call 1
-    assert_equal 1, @engine.get_stats("a").call_count
+    @engine.tl_record_unscoped_metrics "a", 1
+    assert_metrics_recorded "a" => {:call_count => 1, :total_call_time => 1}
 
     harvest = @engine.harvest!
 
-    s = @engine.get_stats "a"
-    assert_equal 0, s.call_count
-    s.trace_call 2
-    assert_equal 1, s.call_count
+    assert_metrics_not_recorded "a"
+
+    @engine.tl_record_unscoped_metrics "a", 2
+    assert_metrics_recorded "a" => {:call_count => 1, :total_call_time => 2}
 
     # this should merge the contents of the previous harvest,
     # so the stats for metric "a" should have 2 data points
@@ -311,7 +289,7 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
   end
 
   def test_merge_merges
-    @engine.get_stats("foo").record_data_point(1)
+    @engine.tl_record_unscoped_metrics "foo", 1
 
     other_stats_hash = NewRelic::Agent::StatsHash.new()
     other_stats_hash.record(NewRelic::MetricSpec.new('foo'), 1)
@@ -319,10 +297,10 @@ class NewRelic::Agent::MetricStatsTest < Minitest::Test
 
     @engine.merge!(other_stats_hash)
 
-    foo_stats = @engine.get_stats('foo')
-    bar_stats = @engine.get_stats('bar')
-    assert_equal(2, foo_stats.call_count)
-    assert_equal(1, bar_stats.call_count)
+    assert_metrics_recorded ({
+      'foo' => {:call_count => 2},
+      'bar' => {:call_count => 1}
+    })
   end
 
   def test_harvest_adds_harvested_at_time

data/test/new_relic/agent/stats_test.rb

@@ -168,18 +168,16 @@ class NewRelic::Agent::StatsTest < Minitest::Test
     assert_equal(42, chained_stats.total_call_time)
   end
 
-  if RUBY_VERSION >= '1.9'
-    def test_to_json_enforces_float_values
-      s1 = NewRelic::Agent::Stats.new
-      s1.trace_call 3.to_r
-      s1.trace_call 7.to_r
+  def test_to_json_enforces_float_values
+    s1 = NewRelic::Agent::Stats.new
+    s1.trace_call 3.to_r
+    s1.trace_call 7.to_r
 
-      assert_equal 3.0, JSON.load(s1.to_json)['min_call_time']
-    end
+    assert_equal 3.0, JSON.load(s1.to_json)['min_call_time']
   end
 
   private
-  def validate (stats, count, total, min, max, exclusive = nil)
+  def validate(stats, count, total, min, max, exclusive = nil)
     assert_equal count, stats.call_count
     assert_equal total, stats.total_call_time
     assert_equal min,   stats.min_call_time

data/test/new_relic/agent/synthetics_event_buffer_test.rb

@@ -3,7 +3,7 @@
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','test_helper'))
-require 'test/new_relic/agent/event_buffer_test_cases'
+require 'new_relic/agent/event_buffer_test_cases'
 require 'new_relic/agent/synthetics_event_buffer'
 
 module NewRelic::Agent

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

@@ -118,12 +118,8 @@ class AttributesTest < Minitest::Test
 
     custom_attributes = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_TRACER)
     result = custom_attributes["key"]
-    if RUBY_VERSION >= "1.9.3"
-      assert result.valid_encoding?
-      assert result.bytesize < NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT
-    else
-      assert_equal NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT, result.bytesize
-    end
+    assert result.valid_encoding?
+    assert result.bytesize < NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT
   end
 
   def test_truncates_multibyte_symbol
@@ -135,12 +131,8 @@ class AttributesTest < Minitest::Test
 
     custom_attributes = attributes.custom_attributes_for(AttributeFilter::DST_TRANSACTION_TRACER)
     result = custom_attributes["key"]
-    if RUBY_VERSION >= "1.9.3"
-      assert result.valid_encoding?
-      assert result.bytesize < NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT
-    else
-      assert_equal NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT, result.bytesize
-    end
+    assert result.valid_encoding?
+    assert result.bytesize < NewRelic::Agent::Transaction::Attributes::VALUE_LIMIT
   end
 
   def test_limits_key_length

data/test/new_relic/agent/transaction_test.rb

@@ -680,13 +680,6 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
     end
   end
 
-  def test_user_attributes_alias_to_custom_parameters
-    in_transaction('user_attributes') do |txn|
-      txn.set_user_attributes(:set_instance => :set_instance)
-      assert_has_custom_attribute(txn, "set_instance")
-    end
-  end
-
   def test_notice_error_in_current_transaction_saves_it_for_finishing
     in_transaction('failing') do |txn|
       NewRelic::Agent::Transaction.notice_error("")
@@ -885,11 +878,10 @@ class NewRelic::Agent::TransactionTest < Minitest::Test
   end
 
   def with_java_classes_loaded
-    # class_variable_set is private on 1.8.7 :(
-    ::NewRelic::Agent::Transaction.send(:class_variable_set, :@@java_classes_loaded, true)
+    ::NewRelic::Agent::Transaction.class_variable_set :@@java_classes_loaded, true
     yield
   ensure
-    ::NewRelic::Agent::Transaction.send(:class_variable_set, :@@java_classes_loaded, false)
+    ::NewRelic::Agent::Transaction.class_variable_set :@@java_classes_loaded, false
   end
 
   def test_cpu_burn_normal

data/test/new_relic/agent/utilization_data_test.rb

@@ -7,6 +7,22 @@ require 'new_relic/agent/utilization_data'
 
 module NewRelic::Agent
   class UtilizationDataTest < Minitest::Test
+
+    # recurses through hashes and arrays and symbolizes keys
+    def self.symbolize_keys_in_object(object)
+      case object
+      when Hash
+        object.inject({}) do |memo, (k, v)|
+          memo[k.to_sym] = symbolize_keys_in_object(v)
+          memo
+        end
+      when Array
+        object.map {|o| symbolize_keys_in_object(o)}
+      else
+        object
+      end
+    end
+
     def setup
       stub_aws_info
     end
@@ -170,7 +186,7 @@ module NewRelic::Agent
 
     load_cross_agent_test("utilization/utilization_json").each do |test_case|
 
-      test_case = HashExtensions.symbolize_keys_in_object test_case
+      test_case = NewRelic::Agent::UtilizationDataTest.symbolize_keys_in_object test_case
       define_method("test_#{test_case[:testname]}".tr(" ", "_")) do
         setup_cross_agent_test_stubs test_case
         # This is a little bit ugly, but TravisCI runs these tests in a docker environment,

data/test/new_relic/agent/vm/mri_vm_test.rb

@@ -5,7 +5,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__),'..', '..','..','test_helper'))
 require 'new_relic/agent/vm/mri_vm'
 
-unless NewRelic::LanguageSupport.jruby? || NewRelic::LanguageSupport.rubinius?
+unless NewRelic::LanguageSupport.jruby?
   module NewRelic
     module Agent
       module VM
@@ -15,12 +15,10 @@ unless NewRelic::LanguageSupport.jruby? || NewRelic::LanguageSupport.rubinius?
             @vm = MriVM.new
           end
 
-          unless RUBY_VERSION < '1.9.2'
-            def test_gather_gc_time_sets_gc_total_time_if_gc_profiler_is_enabled
-              NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(true)
-              @vm.gather_gc_time(@snap)
-              refute_nil @snap.gc_total_time
-            end
+          def test_gather_gc_time_sets_gc_total_time_if_gc_profiler_is_enabled
+            NewRelic::LanguageSupport.stubs(:gc_profiler_enabled?).returns(true)
+            @vm.gather_gc_time(@snap)
+            refute_nil @snap.gc_total_time
           end
 
           def test_gather_gc_time_does_not_set_gc_total_time_if_gc_profiler_is_disabled

data/test/new_relic/agent_test.rb

@@ -63,12 +63,6 @@ module NewRelic
       NewRelic::Agent.after_fork
     end
 
-    def test_reset_stats
-      mock_agent = mocked_agent
-      mock_agent.expects(:drop_buffered_data)
-      NewRelic::Agent.reset_stats
-    end
-
     def test_manual_start_default
       mock_control = mocked_control
       mock_control.expects(:init_plugin).with({:agent_enabled => true, :sync_startup => true})
@@ -100,23 +94,6 @@ module NewRelic
       NewRelic::Agent.shutdown
     end
 
-    def test_get_stats
-      agent = mocked_agent
-      mock_stats_engine = mock('stats_engine')
-      agent.expects(:stats_engine).returns(mock_stats_engine)
-      mock_stats_engine.expects(:get_stats).with('Custom/test/metric', false)
-      NewRelic::Agent.get_stats('Custom/test/metric')
-    end
-
-    # note that this is the same as get_stats above, they're just aliases
-    def test_get_stats_no_scope
-      agent = mocked_agent
-      mock_stats_engine = mock('stats_engine')
-      agent.expects(:stats_engine).returns(mock_stats_engine)
-      mock_stats_engine.expects(:get_stats).with('Custom/test/metric', false)
-      NewRelic::Agent.get_stats_no_scope('Custom/test/metric')
-    end
-
     def test_agent_logs_warning_when_not_started
       with_unstarted_agent do
         expects_logging(:warn, includes("hasn't been started"))
@@ -137,11 +114,6 @@ module NewRelic
       NewRelic::Agent.instance_eval { @agent = old_agent }
     end
 
-    def test_abort_transaction_bang
-      NewRelic::Agent::Transaction.expects(:abort_transaction!)
-      NewRelic::Agent.abort_transaction!
-    end
-
     def test_is_transaction_traced_true
       NewRelic::Agent::TransactionState.tl_get.record_tt = true
       assert_equal(true, NewRelic::Agent.tl_is_transaction_traced?, 'should be true since the thread local is set')
@@ -420,21 +392,6 @@ module NewRelic
       end
     end
 
-    def test_add_custom_parameters_deprecated
-      NewRelic::Agent::Deprecator.expects(:deprecate)
-      NewRelic::Agent.add_custom_parameters(:is => "bunk")
-    end
-
-    def test_add_request_parameters_deprecated
-      NewRelic::Agent::Deprecator.expects(:deprecate)
-      NewRelic::Agent.add_request_parameters(:is => "bunk")
-    end
-
-    def test_set_user_attributes_deprecated
-      NewRelic::Agent::Deprecator.expects(:deprecate)
-      NewRelic::Agent.set_user_attributes(:is => "bunk")
-    end
-
     def test_modules_and_classes_return_name_properly
       valid = [Module, Class]
       stack = [NewRelic]

data/test/new_relic/coerce_test.rb

@@ -16,9 +16,7 @@ class CoerceTest < Minitest::Test
     assert_equal 1, int(Rational(1, 1))
     assert_equal 0, int("invalid")
     assert_equal 0, int(nil)
-
-    # http://ruby-doc.org/core-1.8.7/Symbol.html#method-i-to_i
-    assert_equal 0, int(:wat) unless RUBY_VERSION < '1.9'
+    assert_equal 0, int(:wat)
   end
 
   def test_int_coerce_logs

data/test/new_relic/fake_collector.rb

@@ -10,7 +10,7 @@ require 'timeout'
 require 'ostruct'
 require 'fake_server'
 
-require 'json' if RUBY_VERSION >= '1.9'
+require 'json'
 
 module NewRelic
   class FakeCollector < FakeServer
@@ -117,7 +117,7 @@ module NewRelic
         if @mock.keys.include? method
           status, body = @mock[method].evaluate
           res.status = status
-          res.write ::NewRelic::JSONWrapper.dump(body)
+          res.write ::JSON.dump(body)
         else
           res.status = 500
           res.write "Method not found"
@@ -129,7 +129,7 @@ module NewRelic
           raw_body = req.body.read
           raw_body = Zlib::Inflate.inflate(raw_body) if req.env["HTTP_CONTENT_ENCODING"] == "deflate"
 
-          body = ::NewRelic::JSONWrapper.load(raw_body)
+          body = ::JSON.load(raw_body)
         rescue
           body = "UNABLE TO DECODE BODY: #{raw_body}"
 

data/test/new_relic/fake_external_server.rb

@@ -6,7 +6,7 @@ require 'rack'
 require 'new_relic/fake_server'
 require 'new_relic/rack/agent_hooks'
 
-require 'json' if RUBY_VERSION >= '1.9'
+require 'json'
 
 module NewRelic
   class FakeExternalServer < FakeServer

data/test/new_relic/fake_server.rb

@@ -8,7 +8,7 @@ require 'rack'
 require 'rack/handler'
 require 'timeout'
 
-require 'json' if RUBY_VERSION >= '1.9'
+require 'json'
 
 module NewRelic
   class FakeServer

data/test/new_relic/http_client_test_cases.rb

@@ -437,7 +437,7 @@ module HttpClientTestCases
   # https://newrelic.atlassian.net/browse/RUBY-1244
   def test_failure_in_our_start_code_still_records_externals
     # Fake a failure in our start-up code...
-    NewRelic::JSONWrapper.stubs(:dump).raises("Boom!")
+    ::JSON.stubs(:dump).raises("Boom!")
 
     with_config(:"cross_application_tracer.enabled" => true) do
       in_transaction { get_response }
@@ -449,7 +449,7 @@ module HttpClientTestCases
   # https://newrelic.atlassian.net/browse/RUBY-1244
   def test_failure_to_add_tt_node_doesnt_append_params_to_wrong_node
     # Fake a failure in our start-up code...
-    NewRelic::JSONWrapper.stubs(:dump).raises("Boom!")
+    ::JSON.stubs(:dump).raises("Boom!")
 
     in_transaction do
       with_config(:"cross_application_tracer.enabled" => true) do
@@ -606,7 +606,7 @@ module HttpClientTestCases
 
   def decode_payload(payload)
     obfuscator = NewRelic::Agent::Obfuscator.new('gringletoes')
-    NewRelic::JSONWrapper.load(obfuscator.deobfuscate(payload))
+    ::JSON.load(obfuscator.deobfuscate(payload))
   end
 
   def set_explicit_transaction_name(name)