newrelic_rpm 3.18.1.330 → 4.0.0.332

data/test/multiverse/script/runner

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'fileutils'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'multiverse', 'environment'))
+require File.expand_path '../../multiverse/lib/multiverse/environment', __FILE__
 
 Multiverse::Runner.run ARGV[0].to_s

data/test/multiverse/suites/active_record/Envfile

@@ -1,11 +1,8 @@
 boilerplate_gems = <<-BOILERPLATE
   gem 'rack'
-  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 
   if RUBY_PLATFORM == 'java'
     gem "activerecord-jdbcmysql-adapter"
-  elsif RUBY_VERSION <= '1.9.3'
-    gem 'mysql'
   else
     gem 'mysql2', '~> 0.3.20'
   end
@@ -19,7 +16,7 @@ if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
   RB
 end
 
-if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
+if RUBY_VERSION < '2.4.0'
   gemfile <<-RB
     gem 'activerecord', '~> 4.2.0'
     gem 'minitest', '~> 5.2.3'
@@ -60,28 +57,4 @@ if RUBY_VERSION < '2.2.0'
   RB
 end
 
-# We pull in Rails on the older verions because ActiveRecord didn't have all
-# the tasks we need for setup, and there are some TestUnit vs Minitest oddities
-#
-# JRuby testing with 1.7 on Rails 2.x has issues and was already excluded in
-# test:env
-if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
-gemfile <<-RB
-  gem 'rails', '~> 2.3.18'
-  #{boilerplate_gems}
-RB
-
-gemfile <<-RB
-  gem "rails", "~> 2.2.3"
-  #{boilerplate_gems}
-RB
-end
-
-if RUBY_VERSION < '1.9.2'
-gemfile <<-RB
-  gem "rails", "~> 2.1.2"
-  #{boilerplate_gems}
-RB
-end
-
 # vim: ft=ruby

data/test/multiverse/suites/active_record/active_record_test.rb

@@ -28,9 +28,9 @@ class ActiveRecordInstrumentationTest < Minitest::Test
 
     def active_record_version
       if defined?(::ActiveRecord::VERSION::MINOR)
-        NewRelic::VersionNumber.new(::ActiveRecord::VERSION::STRING)
+        Gem::Version.new(::ActiveRecord::VERSION::STRING)
       else
-        NewRelic::VersionNumber.new("2.1.0")  # Can't tell between 2.1 and 2.2. Meh.
+        Gem::Version.new("2.1.0")  # Can't tell between 2.1 and 2.2. Meh.
       end
     end
   end
@@ -59,7 +59,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
   end
 
-  if active_record_version >= NewRelic::VersionNumber.new('3.2.0')
+  if active_record_version >= Gem::Version.new('3.2.0')
     def test_metrics_for_pluck
       in_web_transaction do
         Order.pluck(:id)
@@ -69,7 +69,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
     end
   end
 
-  if active_record_version >= NewRelic::VersionNumber.new('4.0.0')
+  if active_record_version >= Gem::Version.new('4.0.0')
     def test_metrics_for_ids
       in_web_transaction do
         Order.ids
@@ -222,7 +222,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
   end
 
   # delete and touch did not exist in AR 2.2
-  if active_record_version >= NewRelic::VersionNumber.new('3.0.0')
+  if active_record_version >= Gem::Version.new('3.0.0')
     def test_metrics_for_delete
       in_web_transaction do
         order = Order.create("name" => "burt")
@@ -321,7 +321,7 @@ class ActiveRecordInstrumentationTest < Minitest::Test
   end
 
   # update & update! didn't become public until 4.0
-  if active_record_version >= NewRelic::VersionNumber.new('4.0.0')
+  if active_record_version >= Gem::Version.new('4.0.0')
     def test_metrics_for_update
       in_web_transaction do
         order = Order.create(:name => "wendy")

data/test/multiverse/suites/active_record/config/database.rb

@@ -10,12 +10,11 @@ DependencyDetection.detect!
 
 db_dir = File.expand_path('../../db', __FILE__)
 config_dir = File.expand_path(File.dirname(__FILE__))
-ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' # MRI 1.8.7 doesn't define RUBY_ENGINE
 
 if defined?(ActiveRecord::VERSION)
-  ENV['DATABASE_NAME'] = "multiverse_activerecord_#{ActiveRecord::VERSION::STRING}_#{RUBY_VERSION}_#{ruby_engine}".gsub(".", "_")
+  ENV['DATABASE_NAME'] = "multiverse_activerecord_#{ActiveRecord::VERSION::STRING}_#{RUBY_VERSION}_#{RUBY_ENGINE}".gsub(".", "_")
 else
-  ENV['DATABASE_NAME'] = "multiverse_activerecord_2_x_#{ENV["MULTIVERSE_ENV"]}_#{RUBY_VERSION}_#{ruby_engine}".gsub(".", "_")
+  ENV['DATABASE_NAME'] = "multiverse_activerecord_2_x_#{ENV["MULTIVERSE_ENV"]}_#{RUBY_VERSION}_#{RUBY_ENGINE}".gsub(".", "_")
 end
 
 config_raw = File.read(File.join(config_dir, 'database.yml'))

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

@@ -2,8 +2,6 @@ mysql: &mysql
   adapter: <%=
     if defined?(JRuby)
       'jdbcmysql'
-    elsif RUBY_VERSION <= '1.9.3'
-      'mysql'
     else
       'mysql2'
     end %>

data/test/multiverse/suites/activemerchant/Envfile

@@ -4,15 +4,8 @@ gemfile <<-RB
   gem 'activemerchant', '~>1.43.1'
   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'
-    gem 'i18n', '~>0.6.11'
-  else
-    gem 'activesupport', '~>4.0.4'
-    gem 'nokogiri', '~>1.6.1'
-  end
+  gem 'activesupport', '~>4.0.4'
+  gem 'nokogiri', '~>1.6.1'
 
   # Need to load newrelic_rpm after ActiveMerchant Gateways are required
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
@@ -23,15 +16,8 @@ gemfile <<-RB
   gem 'active_utils', '2.2.3'
   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'
-    gem 'i18n', '~>0.6.11'
-  else
-    gem 'activesupport', '~>4.0.4'
-    gem 'nokogiri', '~>1.5.11'
-  end
+  gem 'activesupport', '~>4.0.4'
+  gem 'nokogiri', '~>1.5.11'
 
   # Need to load newrelic_rpm after ActiveMerchant Gateways are required
   gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')

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

@@ -2,25 +2,19 @@
 # This file is distributed under New Relic's license terms.
 # See https://github.com/newrelic/rpm/blob/master/LICENSE for complete details.
 
-if RUBY_VERSION >= '1.9'
-
 class EncodingHandlingTest < Minitest::Test
   include MultiverseHelpers
 
   setup_and_teardown_agent
 
-  # We're hitting a Rubinius bug when running this test there:
-  # https://github.com/rubinius/rubinius/issues/2899
-  unless NewRelic::LanguageSupport.rubinius?
-    def test_handles_mis_encoded_database_queries
-      with_config(:'transaction_tracer.transaction_threshold' => 0.0,
-        :'transaction_tracer.record_sql' => :raw) do
-        in_transaction do
-          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)
+  def test_handles_mis_encoded_database_queries
+    with_config(:'transaction_tracer.transaction_threshold' => 0.0,
+      :'transaction_tracer.record_sql' => :raw) do
+      in_transaction do
+        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
   end
 
@@ -126,5 +120,3 @@ class EncodingHandlingTest < Minitest::Test
     bad_string.force_encoding('ISO-8859-1').encode('UTF-8')
   end
 end
-
-end

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

@@ -20,13 +20,7 @@ class ErrorEventsTest < Minitest::Test
     assert_equal "RuntimeError", intrinsics["error.class"]
     assert_equal "Big Controller", intrinsics["error.message"]
     assert_equal "TransactionError", intrinsics["type"]
-    if RUBY_VERSION == '1.8.7'
-      # 1.8 + JSON is finicky about comparing floats.
-      # If the timestamps are within 0.001 seconds, it's Good Enough.
-      assert_in_delta(txn.payload[:duration], intrinsics["duration"], 0.001)
-    else
-      assert_equal txn.payload[:duration], intrinsics["duration"]
-    end
+    assert_equal txn.payload[:duration], intrinsics["duration"]
   end
 
   def test_records_supportability_metrics

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

@@ -23,15 +23,8 @@ class HarvestTimestampsTest < Minitest::Test
     metric_data_post = $collector.calls_for('metric_data').first
     start_ts, end_ts = metric_data_post[1..2]
 
-    if RUBY_VERSION == '1.8.7'
-      # 1.8 + JSON is finicky about comparing floats.
-      # If the timestamps are within 0.001 seconds, it's Good Enough.
-      assert_in_delta(t1.to_f, start_ts, 0.001)
-      assert_in_delta(t2.to_f, end_ts, 0.001)
-    else
-      assert_equal(t1.to_f, start_ts)
-      assert_equal(t2.to_f, end_ts)
-    end
+    assert_equal(t1.to_f, start_ts)
+    assert_equal(t2.to_f, end_ts)
   end
 
   def test_start_timestamp_maintained_on_harvest_failure
@@ -50,17 +43,8 @@ class HarvestTimestampsTest < Minitest::Test
     trigger_metric_data_post
     second_post = last_metric_data_post
 
-    if RUBY_VERSION == '1.8.7'
-      # 1.8 + JSON is finicky about comparing floats.
-      # If the timestamps are within 0.001 seconds, it's Good Enough.
-      assert_in_delta(t0, first_post[1], 0.001)
-      assert_in_delta(t1, first_post[2], 0.001)
-      assert_in_delta(t0, second_post[1], 0.001)
-      assert_in_delta(t2, second_post[2], 0.001)
-    else
-      assert_equal([t0, t1], first_post[1..2])
-      assert_equal([t0, t2], second_post[1..2])
-    end
+    assert_equal([t0, t1], first_post[1..2])
+    assert_equal([t0, t2], second_post[1..2])
   end
 
   def trigger_metric_data_post

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

@@ -73,7 +73,7 @@ class LabelsTest < Minitest::Test
         ENV['NEW_RELIC_LABELS'] = nil
       end
     end
-  end unless RUBY_VERSION < '1.9'
+  end
 
   def assert_connect_had_labels(expected)
     result = $collector.calls_for('connect').last['labels']

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

@@ -36,20 +36,15 @@ class MarshalingTest < Minitest::Test
     expected = expected_sample.to_collector_array(encoder)
     expected = NewRelic::Agent::EncodingNormalizer.normalize_object(expected)
 
-    if RUBY_VERSION == '1.8.7'
-      # 1.8 + JSON is finicky about comparing floats.
-      # If the timestamps are within 0.001 seconds, it's Good Enough.
-      assert_in_delta(expected[4][0], actual[4][0], 0.001)
-      actual[4][0] = expected[4][0]
-    end
     assert_equal(expected, actual)
   end
 
   def test_metric_data_marshalling
-    stats = NewRelic::Agent.instance.stats_engine.get_stats_no_scope('Custom/test/method')
-    stats.record_data_point(1.0)
-    stats.record_data_point(2.0, 1.0)
-    expected = [ 2, 3.0, 2.0, 1.0, 2.0, 5.0 ]
+    metric = 'Custom/test/method'
+    NewRelic::Agent.record_metric metric, 1.0
+    NewRelic::Agent.record_metric metric, 2.0
+
+    expected = [ 2, 3.0, 3.0, 1.0, 2.0, 5.0 ]
 
     agent.service.connect
     agent.send(:harvest_and_send_timeslice_data)

data/test/multiverse/suites/agent_only/script/public_api_when_disabled.rb

@@ -48,21 +48,10 @@ NewRelic::Agent.set_sql_obfuscator do
 end
 
 NewRelic::Agent.browser_timing_header
-NewRelic::Agent.browser_timing_footer
 
 NewRelic::Agent.add_custom_attributes(:custom => "attributes")
-NewRelic::Agent.add_custom_parameters(:custom => "parameters")
-NewRelic::Agent.add_request_parameters(:request => "parameters")
-NewRelic::Agent.set_user_attributes(:user => "attributes")
 
-NewRelic::Agent.get_stats("Foo/Bar")
-NewRelic::Agent.get_stats_no_scope("Foo/Bar")
-NewRelic::Agent.reset_stats
 NewRelic::Agent.drop_buffered_data
 
-NewRelic::Agent.abort_transaction!
-
 NewRelic::Agent.after_fork(options={})
 NewRelic::Agent.shutdown(options={})
-
-NewRelic::Agent::Deprecator.deprecate("SomeClass#old_method")

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

@@ -97,11 +97,11 @@ class StartUpTest < Minitest::Test
   end
 
   def jruby_9000
-    defined?(JRUBY_VERSION) && NewRelic::VersionNumber.new(JRUBY_VERSION) >= "9.0.0"
+    defined?(JRUBY_VERSION) && Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new("9.0.0")
   end
 
   def bundler_rubygem_conflicts?
-    NewRelic::VersionNumber.new(Gem::VERSION) == "2.6.6" and
-      NewRelic::VersionNumber.new(Bundler::VERSION) == "1.12.5"
+    Gem::Version.new(Gem::VERSION) == Gem::Version.new("2.6.6") and
+      Gem::Version.new(Bundler::VERSION) == Gem::Version.new("1.12.5")
   end
 end

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

@@ -38,7 +38,7 @@ class SyntheticsTest < Minitest::Test
 
     return nil if synthetics_payload.empty?
 
-    encoded_synthetics_payload   = ::NewRelic::JSONWrapper.dump(synthetics_payload)
+    encoded_synthetics_payload   = ::JSON.dump(synthetics_payload)
     obfuscated_synthetics_header = ::NewRelic::Agent::Obfuscator.new(synthetics_key).obfuscate(encoded_synthetics_payload)
 
     assert_equal(test['inputObfuscatedHeader']['X-NewRelic-Synthetics'], obfuscated_synthetics_header)

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

@@ -5,8 +5,6 @@
 # https://newrelic.atlassian.net/wiki/display/eng/Agent+Thread+Profiling
 # https://newrelic.atlassian.net/browse/RUBY-917
 
-if RUBY_VERSION >= '1.9'
-
 require 'thread'
 
 class ThreadProfilingTest < Minitest::Test
@@ -137,4 +135,3 @@ class ThreadProfilingTest < Minitest::Test
   end
 
 end
-end

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

@@ -5,8 +5,6 @@
 # https://newrelic.atlassian.net/wiki/display/eng/Agent+Thread+Profiling
 # https://newrelic.atlassian.net/browse/RUBY-917
 
-if RUBY_VERSION >= '1.9'
-
 require 'rack/test'
 require './testing_app'
 
@@ -196,4 +194,3 @@ class XraySessionsTest < Minitest::Test
   end
 
 end
-end

data/test/multiverse/suites/capistrano/Envfile

@@ -1,12 +1,10 @@
-suite_condition("Capistrano 3 not supported in 1.8.7 and flaky on JRuby") do
-  RUBY_VERSION != '1.8.7' && RUBY_PLATFORM != 'java'
+suite_condition("Capistrano 3 flaky on JRuby") do
+  RUBY_PLATFORM != 'java'
 end
 
 boilerplate = <<-BOILERPLATE
   gem 'sshkit', '~> 1.8.1'
   gem 'rack'
-  gem 'net-ssh', '2.9.2' if RUBY_VERSION <= '1.9.3'
-  gem 'i18n', '< 0.7.0' if RUBY_VERSION < '1.9.3'
 BOILERPLATE
 
 gemfile <<-RB

data/test/multiverse/suites/capistrano2/Envfile

@@ -5,8 +5,4 @@ end
 gemfile <<-RB
   gem 'capistrano', '~>2.15.5'
   gem 'rack'
-  if RUBY_VERSION <= '1.9.3'
-    gem 'highline', '1.6.21'
-    gem 'net-ssh', '2.9.2'
-  end
 RB

data/test/multiverse/suites/curb/Envfile

@@ -2,21 +2,17 @@ suite_condition("Curb is not useful on JRuby") do
   RUBY_PLATFORM != 'java'
 end
 
-# There appears to be a bug in later curbs (> 0.8.6) that manifests in hangs of
-# this suite when run on Ruby 1.8.7 or REE, so don't run against that version
-# on those Rubies.
-curb_version_spec = RUBY_VERSION == "1.8.7" ? '0.8.5' : '~>0.8.8'
 gemfile <<-RB
-  gem 'curb', '#{curb_version_spec}'
+  gem 'curb', '~> 0.8.8'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 
   # We try translating URIs through Addressable if it's there, so test with it.
-  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
+  gem 'addressable', :require => 'addressable/uri'
 RB
 
 gemfile <<-RB
-  gem 'curb', '#{curb_version_spec}'
+  gem 'curb', '~> 0.8.8'
   gem 'rack'
   gem 'json', :platforms => [:rbx, :mri_18]
 RB

data/test/multiverse/suites/datamapper/Envfile

@@ -13,7 +13,7 @@ RB
 gemfile <<-RB
   gem 'datamapper', '~> 1.2.0', :require => 'data_mapper'
   gem 'dm-ar-finders', '~> 1.2.0'
-  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
+  gem 'addressable', :require => 'addressable/uri'
   #{adapter_gems}
 RB
 
@@ -28,7 +28,7 @@ RB
 gemfile <<-RB
   gem 'datamapper', '~> 1.0.2'
   gem 'dm-ar-finders', '~> 1.0.2'
-  gem 'addressable', '2.3.8', :require => 'addressable/uri' # addressable >= 2.4.0 does not support Ruby 1.8.7
+  gem 'addressable', :require => 'addressable/uri'
   #{adapter_gems}
 RB
 end

data/test/multiverse/suites/datamapper/datamapper_test.rb

@@ -367,13 +367,13 @@ class DataMapperTest < Minitest::Test
   def test_should_not_bomb_out_if_a_query_is_in_an_invalid_encoding
     db = DummyConnection.new
     q = "select ICS95095010000000000083320000BS01030000004100+\xFF00000000000000000"
-    q.force_encoding 'UTF-8' if RUBY_VERSION >= '1.9'
+    q.force_encoding 'UTF-8'
 
     msg = mock
     msg.stubs(:duration).returns(1)
     msg.stubs(:query).returns(q)
 
-    assert_equal false, msg.query.valid_encoding? if RUBY_VERSION >= '1.9'
+    assert_equal false, msg.query.valid_encoding?
     db.send(:log, msg)
   end