newrelic_rpm 3.18.1.330 → 4.0.0.332

data/test/multiverse/suites/deferred_instrumentation/sinatra_test.rb

@@ -9,7 +9,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'sinatra', 'sin
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', 'helpers', 'exceptions'))
 
 class DeferredSinatraTestApp < Sinatra::Base
-  include NewRelic::Agent::Instrumentation::Rack
   include NewRelic::TestHelpers::Exceptions
 
   configure do

data/test/multiverse/suites/delayed_job/Envfile

@@ -1,7 +1,3 @@
-suite_condition("Rubinius problems prevent these from running") do
-  (!defined?(RUBY_ENGINE) || RUBY_ENGINE != "rbx")
-end
-
 boilerplate_gems = <<-SQLITE
   gem 'rack'
   if RUBY_PLATFORM == 'java'
@@ -12,17 +8,15 @@ boilerplate_gems = <<-SQLITE
 SQLITE
 
 # delayed_job_mongoid is currently unsupported, but check that we behave
-# mongoid 3.x is only supported on Ruby 1.9.3, though
-if RUBY_VERSION >= '1.9.3'
-  gemfile <<-RB
-    gem 'delayed_job', '~> 4.0.4'
-    gem 'delayed_job_mongoid', '~> 2.1.0'
-    gem 'i18n', '~> 0.6.11'
-    #{boilerplate_gems}
-  RB
-end
+gemfile <<-RB
+  gem 'delayed_job', '~> 4.0.4'
+  gem 'delayed_job_mongoid', '~> 2.1.0'
+  gem 'i18n', '~> 0.6.11'
+  gem 'activesupport', '~> 3.2.22' if RUBY_VERSION == '2.4.0'
+  #{boilerplate_gems}
+RB
 
-if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
+if RUBY_VERSION < '2.4.0'
   gemfile <<-RB
     gem 'delayed_job', '~> 4.1.0'
     gem 'delayed_job_active_record', '~> 4.1.0'
@@ -33,7 +27,7 @@ if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
 end
 
 # delayed_job_active_record (and older baked into delayed_job) support
-if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
+if RUBY_VERSION < '2.4.0'
   dj4_with_active_record = <<-DJ
     gem 'delayed_job', '~> 4.0.4'
     gem 'delayed_job_active_record', '~> 4.0.2'
@@ -60,7 +54,7 @@ dj2_with_active_record3 = <<-DJ
   #{boilerplate_gems}
 DJ
 
-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 'i18n', '~> 0.7.0'
@@ -83,32 +77,25 @@ if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
 end
 
 if RUBY_VERSION < '2.3.0'
-[dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
-  gemfile <<-RB
-    gem 'activerecord', '~> 3.2.19'
-    gem 'i18n', '~> 0.6.11'
-    #{dj}
-  RB
+  [dj4_with_active_record, dj3_with_active_record, dj2_with_active_record3].each do |dj|
+    gemfile <<-RB
+      gem 'activerecord', '~> 3.2.19'
+      gem 'i18n', '~> 0.6.11'
+      #{dj}
+    RB
 
-  gemfile <<-RB
-    gem 'activerecord', '~> 3.1.12'
-    gem 'i18n', '~> 0.6.11'
-    #{dj}
-  RB
+    gemfile <<-RB
+      gem 'activerecord', '~> 3.1.12'
+      gem 'i18n', '~> 0.6.11'
+      #{dj}
+    RB
 
-  gemfile <<-RB
-    gem 'activerecord', '~> 3.0.20'
-    gem 'i18n', '~> 0.5.4'
-    #{dj}
-  RB
-end
+    gemfile <<-RB
+      gem 'activerecord', '~> 3.0.20'
+      gem 'i18n', '~> 0.5.4'
+      #{dj}
+    RB
+  end
 end
 
-if RUBY_VERSION <= '1.9.3'
-gemfile <<-RB
-  gem 'activerecord', '~> 2.3.18'
-  gem 'delayed_job', '~> 2.0.8'
-  gem 'i18n', '~> 0.5.4'
-  #{boilerplate_gems}
-RB
-end
+# vim: ft=ruby

data/test/multiverse/suites/excon/Envfile

@@ -9,9 +9,6 @@ else
                       0.10.0)
 end
 
-# Excon 0.10.0 doesn't seem to work on Rubinius 2.2.10
-excon_versions.delete("0.10.0") if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-
 excon_versions.each do |excon_version|
   gemfile <<-RB
     gem 'excon', '~> #{excon_version}'

data/test/multiverse/suites/grape/Envfile

@@ -1,7 +1,3 @@
-suite_condition("Grape is only supported for versions >= 1.9.3") do
-  RUBY_VERSION >= '1.9.3'
-end
-
 versions = %w(0.16.1 0.15.0 0.14.0 0.13.0 0.12.0 0.11.0 0.10.0 0.9.0 0.8.0 0.7.0 0.6.1 0.5.0 0.4.1 0.3.2 0.2.6 0.2.0 0.1.5)
 
 versions.each do |version|

data/test/multiverse/suites/grape/grape_versioning_test.rb

@@ -47,7 +47,7 @@ unless ::Grape::VERSION == '0.1.5'
     end
 
     #version from http accept header is not supported in older versions of grape
-    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
+    if Gem::Version.new(Grape::VERSION) >= Gem::Version.new('0.16.0')
       def test_version_from_accept_version_header_is_recorded_in_transaction_name
         @app_class = GrapeVersioning::ApiV4
         get '/fish', {}, 'HTTP_ACCEPT_VERSION' => 'v4'
@@ -106,7 +106,7 @@ unless ::Grape::VERSION == '0.1.5'
     #
     # defaulting with header key/empty value does not set rack.env['api.version']
     #
-    if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.5.0')
+    if Gem::Version.new(Grape::VERSION) >= Gem::Version.new('0.5.0')
       def test_default_accept_version_header_version_in_tranasaction_names
         @app_class = GrapeVersioning::DefaultAcceptVersionHeaderApi
         get "/fish", nil, 'HTTP_ACCEPT_VERSION' => ''

data/test/multiverse/suites/grape/grape_versioning_test_api.rb

@@ -46,7 +46,7 @@ unless ::Grape::VERSION == '0.1.5'
 
     class ApiV4 < Grape::API
       #version from http accept header is not supported in older versions of grape
-      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
+      if Gem::Version.new(Grape::VERSION) >= Gem::Version.new('0.16.0')
         version ['v4', 'v5'], :using => :accept_version_header
       end
 
@@ -61,7 +61,7 @@ unless ::Grape::VERSION == '0.1.5'
 
     class CascadingAPI < Grape::API
       #version from http accept header is not supported in older versions of grape
-      if NewRelic::VersionNumber.new(Grape::VERSION) >= NewRelic::VersionNumber.new('0.16.0')
+      if Gem::Version.new(Grape::VERSION) >= Gem::Version.new('0.16.0')
         version 'v5', :using => :accept_version_header
       end
 

data/test/multiverse/suites/json/Envfile

@@ -1,21 +1,13 @@
 after_2_0_0  = [ '~> 2.0.2' ]
 before_2_4_0 = [ '< 1.8.5' ]
 before_2_2_0 = [ '~> 1.7.7', '~> 1.6.8', '~> 1.5.5' ]
-before_2_0_0 = [ '~> 1.4.6', '~> 1.2.4', '~> 1.1.9' ]
-before_1_9_2 = [ '1.1.2' ]
 
 json_gems = []
 json_gems += after_2_0_0  if RUBY_VERSION >= '2.0.0'
 json_gems += before_2_4_0 if RUBY_VERSION < '2.4.0'
 json_gems += before_2_2_0 if RUBY_VERSION < '2.2.0'
-json_gems += before_2_0_0 if RUBY_VERSION < '2.0.0'
-json_gems += before_1_9_2 if RUBY_VERSION < '1.9.2'
 
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
-  json_gems.delete('~> 1.7.7')
-end
-
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+if RUBY_ENGINE == "jruby"
   json_gems.delete('~> 1.2.4')
   json_gems.delete('~> 1.1.9')
 end

data/test/multiverse/suites/marshalling/Envfile

@@ -1,12 +1,3 @@
 gemfile <<-RB
   gem 'rack'
 RB
-
-# On Ruby 1.8.7 we need to explicitly run with the JSON gem to get JSON
-# serialization. Otherwise first env will run with pruby.
-if RUBY_VERSION < "1.9"
-gemfile <<-RB
-  gem 'json'
-  gem 'rack'
-RB
-end

data/test/multiverse/suites/memcached/Envfile

@@ -1,15 +1,10 @@
-dalli_versions = %w(1.0.5)
-dalli_versions += %w(2.7.2 2.6.4 2.2.1) if RUBY_VERSION >= "1.9.3"
-
-dalli_versions.each do |version|
+%w(1.0.5 2.7.2 2.6.4 2.2.1).each do |version|
   gemfile <<-RB
     gem 'dalli', '~> #{version}'
   RB
 end
 
-memcache_client_versions = %w(1.8.5 1.5.0)
-
-memcache_client_versions.each do |version|
+%w(1.8.5 1.5.0).each do |version|
   gemfile <<-RB
     gem 'memcache-client', '~> #{version}', :require => 'memcache'
     # version lockdown for ZenTest that cooperates with all Rubies
@@ -18,22 +13,9 @@ memcache_client_versions.each do |version|
   RB
 end
 
-
-if RUBY_VERSION == "1.8.7"
-  memcached_client_versions = ['1.4.1']
-elsif RUBY_VERSION > "1.9.3"
-  memcached_client_versions = ['1.8.0']
-else
-  memcached_client_versions = %w(1.8.0 1.4.1)
-end
-
-if RUBY_PLATFORM == 'java'
-  memcached_client_versions = []
-end
-
-memcached_client_versions.each do |version|
+unless RUBY_PLATFORM == 'java'
   gemfile <<-RB
-    gem 'memcached', '~> #{version}'
+    gem 'memcached', '~> 1.8.0'
   RB
 end
 
@@ -42,7 +24,7 @@ def memcache_running?
   require 'socket'
     TCPSocket.new('localhost', 11211)
     true
-  rescue => e
+  rescue
     false
   end
 end

data/test/multiverse/suites/mongo/Envfile

@@ -1,14 +1,12 @@
-if RUBY_VERSION >= '1.9.3'
-  gemfile <<-RB
-    gem 'mongo', '~>2.2.0'
-  RB
-  gemfile <<-RB
-    gem 'mongo', '~>2.1.0'
-  RB
-  gemfile <<-RB
-    gem 'mongo', '~>2.0.1'
-  RB
-end
+gemfile <<-RB
+  gem 'mongo', '~>2.2.0'
+RB
+gemfile <<-RB
+  gem 'mongo', '~>2.1.0'
+RB
+gemfile <<-RB
+  gem 'mongo', '~>2.0.1'
+RB
 
 gemfile <<-RB
   gem 'mongo', '1.10.0'

data/test/multiverse/suites/padrino/Envfile

@@ -1,25 +1,19 @@
-if RUBY_VERSION >= '1.9.3' # padrino v0.12.0 dropped support for ruby 1.8.7 and requres ruby 1.9.3 or greater
 gemfile <<-RB
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.13.0'
   gem 'rack-test', :require => 'rack/test'
 RB
-end
 
-if RUBY_VERSION > '1.8.7' # padrino-core 0.11.0 requires http_router 0.11.0 which has syntax errors in 1.8.7.
 gemfile <<-RB
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.11.0'
   gem 'rack-test', :require => 'rack/test'
-  gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 RB
-end
 
 gemfile <<-RB
   gem 'activesupport', '~> 3'
   gem 'padrino', '~> 0.10.0'
   gem 'rack-test', :require => 'rack/test'
-  gem 'i18n', '< 0.7' if RUBY_VERSION < '1.9.3' # i18n >= 0.7.0 only works on Ruby 1.9.3 and newer
 RB
 
 # vim: ft=ruby

data/test/multiverse/suites/rack/http_response_code_test.rb

@@ -7,7 +7,6 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/rack/error_collector'
 
 class HttpResponseCodeTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/rack/rack_auto_instrumentation_test.rb

@@ -7,7 +7,6 @@ if NewRelic::Agent::Instrumentation::RackHelpers.version_supported? && defined?
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/rack/error_collector'
 
 class RackAutoInstrumentationTest < Minitest::Test
   include MultiverseHelpers
@@ -32,7 +31,6 @@ class RackAutoInstrumentationTest < Minitest::Test
       end
       use NewRelic::Rack::BrowserMonitoring
       use NewRelic::Rack::AgentHooks
-      use NewRelic::Rack::ErrorCollector
       run ExampleApp.new
     end
   end
@@ -62,20 +60,19 @@ class RackAutoInstrumentationTest < Minitest::Test
     with_config(:disable_middleware_instrumentation => true) do
       get '/'
     end
+
     assert_metrics_recorded_exclusive(
       [
         "Apdex",
         "ApdexAll",
         "HttpDispatcher",
         "Middleware/all",
-        "Apdex/Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
-        "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
-        "Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
+        "Apdex/Middleware/Rack/NewRelic::Rack::AgentHooks/call",
+        "Controller/Middleware/Rack/NewRelic::Rack::AgentHooks/call",
         "Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call",
         "Middleware/Rack/NewRelic::Rack::AgentHooks/call",
-        ["Middleware/Rack/NewRelic::Rack::ErrorCollector/call",    "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
-        ["Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call", "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
-        ["Middleware/Rack/NewRelic::Rack::AgentHooks/call",        "Controller/Middleware/Rack/NewRelic::Rack::ErrorCollector/call"],
+        ["Middleware/Rack/NewRelic::Rack::AgentHooks/call",    "Controller/Middleware/Rack/NewRelic::Rack::AgentHooks/call"],
+        ["Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call", "Controller/Middleware/Rack/NewRelic::Rack::AgentHooks/call"]
       ],
       :ignore_filter => /^Supportability/
     )
@@ -94,11 +91,9 @@ class RackAutoInstrumentationTest < Minitest::Test
         "Controller/Rack/ExampleApp/call",
         "Middleware/Rack/MiddlewareOne/call",
         "Middleware/Rack/MiddlewareTwo/call",
-        "Middleware/Rack/NewRelic::Rack::ErrorCollector/call",
         "Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call",
         "Middleware/Rack/NewRelic::Rack::AgentHooks/call",
         "Nested/Controller/Rack/ExampleApp/call",
-        ["Middleware/Rack/NewRelic::Rack::ErrorCollector/call",    "Controller/Rack/ExampleApp/call"],
         ["Middleware/Rack/NewRelic::Rack::BrowserMonitoring/call", "Controller/Rack/ExampleApp/call"],
         ["Middleware/Rack/NewRelic::Rack::AgentHooks/call",        "Controller/Rack/ExampleApp/call"],
         ["Middleware/Rack/MiddlewareOne/call", "Controller/Rack/ExampleApp/call"],

data/test/multiverse/suites/rack/rack_cascade_test.rb

@@ -7,7 +7,6 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/rack/error_collector'
 
 class RackCascadeTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/rack/rack_env_mutation_test.rb

@@ -6,7 +6,6 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/rack/error_collector'
 
 class RackEnvMutationTest < Minitest::Test
   attr_accessor :inner_app

data/test/multiverse/suites/rack/response_content_type_test.rb

@@ -7,7 +7,6 @@ if NewRelic::Agent::Instrumentation::RackHelpers.rack_version_supported?
 require File.join(File.dirname(__FILE__), 'example_app')
 require 'new_relic/rack/browser_monitoring'
 require 'new_relic/rack/agent_hooks'
-require 'new_relic/rack/error_collector'
 
 class HttpResponseContentTypeTest < Minitest::Test
   include MultiverseHelpers

data/test/multiverse/suites/rails/Envfile

@@ -6,7 +6,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 'rails', '~>4.2.1'
     gem 'haml', :require => false
@@ -28,15 +28,12 @@ if RUBY_VERSION >= '1.9.3' && RUBY_VERSION < '2.4.0'
     gem 'rails', '~>4.0.13'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
   RB
-end
 
-if RUBY_VERSION < '2.4.0'
   gemfile <<-RB
     gem 'rails', '~>3.2.22.2'
     gem 'i18n', '~>0.6.11'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
     gem 'minitest_tu_shim', :require => false
-    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 
   gemfile <<-RB
@@ -45,7 +42,6 @@ if RUBY_VERSION < '2.4.0'
     gem 'sinatra', '~> 1.4.5'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
     gem 'minitest_tu_shim', :require => false
-    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 
   gemfile <<-RB
@@ -53,26 +49,12 @@ if RUBY_VERSION < '2.4.0'
     gem 'i18n', '~>0.6.11'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
     gem 'minitest_tu_shim', :require => false
-    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 
   gemfile <<-RB
     gem 'rails', '~>3.0.20'
     gem 'haml', '4.0.2'   # Getting load issues with haml 4.0.3
     gem 'minitest_tu_shim', :require => false
-    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
-  RB
-end
-
-if RUBY_VERSION <= '1.9.3' && (!defined?(RUBY_ENGINE) || RUBY_ENGINE != 'jruby')
-  gemfile <<-RB
-    gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')
-    gem 'rails', '~> 2.3.18'
-    gem 'haml', '~> 3.1.0'   # last haml version that supports Rails 2
-    gem 'minitest_tu_shim', :require => false
-    gem 'sqlite3'
-    gem 'i18n', '0.6.11'
-    gem 'rack-cache', '< 1.3' if RUBY_VERSION < '1.9.3' # rack-cache 1.3.0 only supports >= 1.9.3
   RB
 end