ddtrace 0.40.0 → 0.50.0

data/.simplecov

@@ -1,7 +1,16 @@
+# Enable branch coverage reporting.
+# SimpleCov only supports branch coverage in
+# Ruby >= 2.5.
+SimpleCov.enable_coverage :branch if RUBY_VERSION >= '2.5.0'
+
+# Categorize SimpleCov report, for easier reading
 SimpleCov.add_group 'contrib', '/lib/ddtrace/contrib'
 SimpleCov.add_group 'transport', '/lib/ddtrace/transport'
 SimpleCov.add_group 'spec', '/spec/'
 
+# Exclude code not maintained by this project
+SimpleCov.add_filter %r{/vendor/}
+
 SimpleCov.coverage_dir ENV.fetch('COVERAGE_DIR', 'coverage')
 
 # Each test run requires its own unique command_name.

data/Appraisals

@@ -2,103 +2,14 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ddtrace/version'
 
+def self.gem_cucumber(version)
+  appraise "cucumber#{version}" do
+    gem 'cucumber', ">=#{version}.0.0", "<#{version + 1}.0.0"
+  end
+end
+
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new(Datadog::VERSION::MINIMUM_RUBY_VERSION)
   raise NotImplementedError, "Ruby versions < #{Datadog::VERSION::MINIMUM_RUBY_VERSION} are not supported!"
-elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'lograge', '< 0.4'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'concurrent-ruby'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'ethon'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'http'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client'
-      gem 'resque', '< 2.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '~> 3.5.4'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3', '~> 1.3.6'
-      gem 'sucker_punch'
-      gem 'timers', '< 4.2'
-      gem 'typhoeus'
-    end
-  end
 elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
   if RUBY_PLATFORM != 'java'
@@ -128,7 +39,9 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-mysql-adapter', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
+      gem 'sqlite3', '~> 1.3.5'
       gem 'lograge', '< 0.4'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
     end
 
     appraise 'rails32-postgres' do
@@ -202,6 +115,8 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
       gem 'mongo', '< 2.5'
       gem 'mysql2', '0.3.21', platform: :ruby
       gem 'pg', '< 1.0', platform: :ruby
@@ -213,6 +128,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel', '~> 4.0', '< 4.37'
       gem 'shoryuken'
       gem 'sidekiq', '~> 3.5.4'
@@ -222,6 +138,10 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'timers', '< 4.2'
       gem 'typhoeus'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
@@ -252,6 +172,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-mysql-adapter', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
+      gem 'sqlite3', '~> 1.3.5'
       gem 'lograge', '< 0.4'
     end
 
@@ -326,6 +247,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres' do
@@ -333,6 +255,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis' do
@@ -341,6 +264,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -349,6 +273,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -358,6 +283,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activejob'
       gem 'sprockets', '< 4'
       gem 'lograge'
+      gem 'mimemagic', '0.3.9' # Pinned until https://github.com/mimemagicrb/mimemagic/issues/142 is resolved.
     end
 
     appraise 'contrib' do
@@ -377,12 +303,15 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'faraday'
       gem 'grape'
-      gem 'graphql', '< 1.9.4'
-      gem 'grpc', '~> 1.21.0' # Last version to support Ruby < 2.3
+      gem 'graphql', '>= 1.12.0'
+      gem 'grpc', '~> 1.19.0' # Last version to support Ruby < 2.3 & google-protobuf < 3.7
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara', '< 0.5.0' # >= 0.5.0 contain Ruby 2.3+ syntax
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'qless'
       gem 'racecar', '>= 0.3.5'
       gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
       gem 'rack-test'
@@ -391,6 +320,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -401,6 +331,10 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'typhoeus'
       gem 'que', '>= 1.0.0.beta2'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
@@ -431,6 +365,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-mysql-adapter', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'rack-cache', '1.7.1'
+      gem 'sqlite3', '~> 1.3.5'
       gem 'lograge', '< 0.4'
     end
 
@@ -539,6 +474,18 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'lograge'
     end
 
+    appraise 'resque2-redis3' do
+      gem 'redis', '< 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    appraise 'resque2-redis4' do
+      gem 'redis', '>= 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    (3..4).each { |v| gem_cucumber(v) }
+
     appraise 'contrib' do
       gem 'actionpack'
       gem 'actionview'
@@ -554,23 +501,27 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'faraday'
       gem 'grape'
-      gem 'graphql'
+      gem 'graphql', '>= 1.12.0'
       gem 'grpc'
       gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
+      gem 'qless'
       gem 'racecar', '>= 0.3.5'
       gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
       gem 'rest-client'
-      gem 'resque', '< 2.0'
+      gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -585,6 +536,10 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
@@ -628,6 +583,18 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'lograge'
     end
 
+    appraise 'resque2-redis3' do
+      gem 'redis', '< 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    appraise 'resque2-redis4' do
+      gem 'redis', '>= 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    (3..4).each { |v| gem_cucumber(v) }
+
     appraise 'contrib' do
       gem 'actionpack'
       gem 'actionview'
@@ -635,6 +602,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord', '< 5.1.5'
       gem 'aws-sdk'
       gem 'concurrent-ruby'
+      gem 'cucumber'
       gem 'dalli'
       gem 'delayed_job'
       gem 'delayed_job_active_record'
@@ -643,23 +611,27 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'faraday'
       gem 'grape'
-      gem 'graphql'
+      gem 'graphql', '>= 1.12.0'
       gem 'grpc'
       gem 'google-protobuf', '~> 3.11.0' # Last version to support Ruby < 2.5
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
+      gem 'qless'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
       gem 'rest-client'
-      gem 'resque', '< 2.0'
+      gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -674,13 +646,225 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
 elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
+  appraise 'rails5-mysql2' do
+    gem 'rails', '~> 5.2.1'
+    gem 'mysql2', '< 1', platform: :ruby
+    gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails5-postgres' do
+    gem 'rails', '~> 5.2.1'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails5-postgres-redis' do
+    gem 'rails', '~> 5.2.1'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    gem 'redis', '>= 4.0.1'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails5-postgres-redis-activesupport' do
+    gem 'rails', '~> 5.2.1'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    gem 'redis', '>= 4.0.1'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails5-postgres-sidekiq' do
+    gem 'rails', '~> 5.2.1'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    gem 'sidekiq'
+    gem 'activejob'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-mysql2' do
+    gem 'rails', '~> 6.0.0'
+    gem 'mysql2', '< 1', platform: :ruby
+    gem 'activerecord-jdbcmysql-adapter', '>= 60', platform: :jruby # try remove >= 60
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-postgres' do
+    gem 'rails', '~> 6.0.0'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-postgres-redis' do
+    gem 'rails', '~> 6.0.0'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
+    gem 'redis', '>= 4.0.1'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-postgres-redis-activesupport' do
+    gem 'rails', '~> 6.0.0'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
+    gem 'redis', '>= 4.0.1'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails6-postgres-sidekiq' do
+    gem 'rails', '~> 6.0.0'
+    gem 'pg', '< 1.0', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
+    gem 'sidekiq'
+    gem 'activejob'
+    gem 'sprockets', '< 4'
+    gem 'lograge'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails61-mysql2' do
+    gem 'rails', '~> 6.1.0'
+    gem 'mysql2', '~> 0.5', platform: :ruby
+    gem 'activerecord-jdbcmysql-adapter', '>= 61', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails61-postgres' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 61', platform: :jruby
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails61-postgres-redis' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 61', platform: :jruby
+    gem 'redis', '>= 4.2.5'
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'rails61-postgres-sidekiq' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 61', platform: :jruby
+    gem 'sidekiq', '>= 6.1.2'
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+  end
+
+  appraise 'resque2-redis3' do
+    gem 'redis', '< 4.0'
+    gem 'resque', '>= 2.0'
+  end
+
+  appraise 'resque2-redis4' do
+    gem 'redis', '>= 4.0'
+    gem 'resque', '>= 2.0'
+  end
+
+  (3..5).each { |v| gem_cucumber(v) }
+
+  appraise 'contrib' do
+    gem 'actionpack'
+    gem 'actionview'
+    gem 'active_model_serializers', '>= 0.10.0'
+    gem 'activerecord'
+    gem 'aws-sdk'
+    gem 'concurrent-ruby'
+    gem 'cucumber'
+    gem 'dalli'
+    gem 'delayed_job'
+    gem 'delayed_job_active_record'
+    gem 'elasticsearch-transport'
+    gem 'ethon'
+    gem 'excon'
+    gem 'faraday'
+    gem 'grape'
+    gem 'graphql', '>= 1.12.0'
+    gem 'grpc', platform: :ruby
+    gem 'hiredis'
+    gem 'http'
+    gem 'httpclient'
+    gem 'i18n', '1.8.7', platform: :jruby # Removal pending: https://github.com/ruby-i18n/i18n/issues/555#issuecomment-772112169
+    gem 'makara'
+    gem 'mongo', '>= 2.8.0'
+    gem 'mysql2', '< 1', platform: :ruby
+    gem 'activerecord-jdbcmysql-adapter', '>= 60.2', platform: :jruby
+    gem 'pg', platform: :ruby
+    gem 'activerecord-jdbcpostgresql-adapter', '>= 60.2', platform: :jruby
+    gem 'presto-client', '>=  0.5.14'
+    gem 'qless', (RUBY_PLATFORM == 'java' ? '0.10.0' : '>= 0') # Newer releases require `rusage`, which is not available for JRuby
+    gem 'racecar', '>= 0.3.5'
+    gem 'rack'
+    gem 'rack-test'
+    gem 'rake', '>= 12.3'
+    gem 'redis', '< 4.0'
+    gem 'rest-client'
+    gem 'resque'
+    gem 'ruby-kafka', '>= 0.7.10'
+    gem 'rspec', '>= 3.0.0'
+    gem 'sequel'
+    gem 'shoryuken'
+    gem 'sidekiq'
+    gem 'sinatra'
+    gem 'sneakers', '>= 2.12.0'
+    gem 'sqlite3', '~> 1.4.1', platform: :ruby
+    gem 'jdbc-sqlite3', '>= 3.28', platform: :jruby
+    gem 'sucker_punch'
+    gem 'typhoeus'
+    gem 'que', '>= 1.0.0.beta2'
+  end
+
+  appraise 'contrib-old' do
+    gem 'faraday', '0.17'
+  end
+
+  appraise 'core-old' do
+    gem 'dogstatsd-ruby', '~> 4'
+  end
+elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
+  if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 1', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -688,7 +872,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -696,7 +879,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-redis' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
@@ -705,7 +887,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-redis-activesupport' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
@@ -714,7 +895,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails5-postgres-sidekiq' do
       gem 'rails', '~> 5.2.1'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
@@ -724,7 +904,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
       gem 'mysql2', '< 1', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', '>= 60', platform: :jruby # try remove >= 60
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -732,7 +911,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-postgres' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -740,7 +918,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-postgres-redis' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
@@ -749,7 +926,6 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-postgres-redis-activesupport' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
       gem 'lograge'
@@ -758,140 +934,53 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'rails6-postgres-sidekiq' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 60', platform: :jruby
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
 
-    appraise 'contrib' do
-      gem 'actionpack'
-      gem 'actionview'
-      gem 'active_model_serializers', '>= 0.10.0'
-      gem 'activerecord'
-      gem 'aws-sdk'
-      gem 'concurrent-ruby'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'ethon'
-      gem 'excon'
-      gem 'faraday'
-      gem 'grape'
-      gem 'graphql'
-      gem 'grpc', platform: :ruby
-      gem 'hiredis'
-      gem 'http'
-      gem 'mongo', '>= 2.8.0'
-      gem 'mysql2', '< 0.5', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'pg', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'presto-client', '>=  0.5.14'
-      gem 'racecar', '>= 0.3.5'
-      gem 'rack'
-      gem 'rack-test'
-      gem 'rake', '>= 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client'
-      gem 'resque', '< 2.0'
-      gem 'ruby-kafka', '>= 0.7.10'
-      gem 'sequel'
-      gem 'shoryuken'
-      gem 'sidekiq'
-      gem 'sinatra'
-      gem 'sneakers', '>= 2.12.0'
-      gem 'sqlite3', '~> 1.4.1', platform: :ruby
-      gem 'sucker_punch'
-      gem 'typhoeus'
-      gem 'que', '>= 1.0.0.beta2'
-    end
-
-    appraise 'contrib-old' do
-      gem 'faraday', '0.17'
-    end
-elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails5-mysql2' do
-      gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 1', platform: :ruby
-      gem 'sprockets', '< 4'
-      gem 'lograge'
-    end
-
-    appraise 'rails5-postgres' do
-      gem 'rails', '~> 5.2.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'sprockets', '< 4'
-      gem 'lograge'
-    end
-
-    appraise 'rails5-postgres-redis' do
-      gem 'rails', '~> 5.2.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-      gem 'lograge'
-    end
-
-    appraise 'rails5-postgres-redis-activesupport' do
-      gem 'rails', '~> 5.2.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis', '>= 4.0.1'
+    appraise 'rails61-mysql2' do
+      gem 'rails', '~> 6.1.0'
+      gem 'mysql2', '~> 0.5', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
-    appraise 'rails5-postgres-sidekiq' do
-      gem 'rails', '~> 5.2.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'sidekiq'
-      gem 'activejob'
+    appraise 'rails61-postgres' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
-    appraise 'rails6-mysql2' do
-      gem 'rails', '~> 6.0.0'
-      gem 'mysql2', '< 1', platform: :ruby
+    appraise 'rails61-postgres-redis' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'redis', '>= 4.2.5'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
-    appraise 'rails6-postgres' do
-      gem 'rails', '~> 6.0.0'
-      gem 'pg', '< 1.0', platform: :ruby
+    appraise 'rails61-postgres-sidekiq' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'sidekiq', '>= 6.1.2'
       gem 'sprockets', '< 4'
-      gem 'lograge'
+      gem 'lograge', '~> 0.11'
     end
 
-    appraise 'rails6-postgres-redis' do
-      gem 'rails', '~> 6.0.0'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-      gem 'lograge'
+    appraise 'resque2-redis3' do
+      gem 'redis', '< 4.0'
+      gem 'resque', '>= 2.0'
     end
 
-    appraise 'rails6-postgres-redis-activesupport' do
-      gem 'rails', '~> 6.0.0'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-      gem 'lograge'
+    appraise 'resque2-redis4' do
+      gem 'redis', '>= 4.0'
+      gem 'resque', '>= 2.0'
     end
 
-    appraise 'rails6-postgres-sidekiq' do
-      gem 'rails', '~> 6.0.0'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'sidekiq'
-      gem 'activejob'
-      gem 'sprockets', '< 4'
-      gem 'lograge'
-    end
+    (3..5).each { |v| gem_cucumber(v) }
 
     appraise 'contrib' do
       gem 'actionpack'
@@ -900,6 +989,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord'
       gem 'aws-sdk'
       gem 'concurrent-ruby'
+      gem 'cucumber'
       gem 'dalli'
       gem 'delayed_job'
       gem 'delayed_job_active_record'
@@ -908,22 +998,26 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'faraday'
       gem 'grape'
-      gem 'graphql'
+      gem 'graphql', '>= 1.12.0'
       gem 'grpc'
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
+      gem 'qless'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
       gem 'rest-client'
-      gem 'resque', '< 2.0'
+      gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -938,12 +1032,17 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
   end
-elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
+elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
   if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -984,7 +1083,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
-      gem 'mysql2', '< 0.6', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
       gem 'lograge'
     end
@@ -1023,6 +1122,48 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'lograge'
     end
 
+    appraise 'rails61-mysql2' do
+      gem 'rails', '~> 6.1.0'
+      gem 'mysql2', '~> 0.5', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails61-postgres' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'sprockets', '< 4'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails61-postgres-redis' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'redis', '>= 4.2.5'
+      gem 'sprockets', '< 4'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'rails61-postgres-sidekiq' do
+      gem 'rails', '~> 6.1.0'
+      gem 'pg', '>= 1.1', platform: :ruby
+      gem 'sidekiq', '>= 6.1.2'
+      gem 'sprockets', '< 4'
+      gem 'lograge', '~> 0.11'
+    end
+
+    appraise 'resque2-redis3' do
+      gem 'redis', '< 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    appraise 'resque2-redis4' do
+      gem 'redis', '>= 4.0'
+      gem 'resque', '>= 2.0'
+    end
+
+    (3..5).each { |v| gem_cucumber(v) }
+
     appraise 'contrib' do
       gem 'actionpack'
       gem 'actionview'
@@ -1030,6 +1171,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'activerecord'
       gem 'aws-sdk'
       gem 'concurrent-ruby'
+      gem 'cucumber'
       gem 'dalli'
       gem 'delayed_job'
       gem 'delayed_job_active_record'
@@ -1037,22 +1179,26 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'ethon'
       gem 'excon'
       gem 'grape'
-      gem 'graphql'
+      gem 'graphql', '>= 1.12.0'
       gem 'grpc'
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
+      gem 'makara'
       gem 'mongo', '>= 2.8.0'
-      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'mysql2', '< 1', platform: :ruby
       gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
+      gem 'qless'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
       gem 'rest-client'
-      gem 'resque', '< 2.0'
+      gem 'resque'
       gem 'ruby-kafka', '>= 0.7.10'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel'
       gem 'shoryuken'
       gem 'sidekiq'
@@ -1067,5 +1213,111 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
     appraise 'contrib-old' do
       gem 'faraday', '0.17'
     end
+
+    appraise 'core-old' do
+      gem 'dogstatsd-ruby', '~> 4'
+    end
+  end
+elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
+  appraise 'rails61-mysql2' do
+    gem 'rails', '~> 6.1.0'
+    gem 'mysql2', '~> 0.5', platform: :ruby
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+  end
+
+  appraise 'rails61-postgres' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+  end
+
+  appraise 'rails61-postgres-redis' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'redis', '>= 4.2.5'
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+  end
+
+  appraise 'rails61-postgres-sidekiq' do
+    gem 'rails', '~> 6.1.0'
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'sidekiq', '>= 6.1.2'
+    gem 'sprockets', '< 4'
+    gem 'lograge', '~> 0.11'
+  end
+
+  appraise 'resque2-redis3' do
+    gem 'redis', '< 4.0'
+    gem 'resque', '>= 2.0'
+  end
+
+  appraise 'resque2-redis4' do
+    gem 'redis', '>= 4.0'
+    gem 'resque', '>= 2.0'
+  end
+
+  (3..5).each { |v| gem_cucumber(v) }
+
+  appraise 'contrib' do
+    gem 'actionpack'
+    gem 'actionview'
+    gem 'active_model_serializers', '>= 0.10.0'
+    gem 'activerecord'
+    gem 'aws-sdk'
+    gem 'concurrent-ruby'
+    gem 'cucumber'
+    gem 'dalli'
+    gem 'delayed_job'
+    gem 'delayed_job_active_record'
+    gem 'elasticsearch-transport'
+    gem 'ethon'
+    gem 'excon'
+    gem 'grape'
+    gem 'graphql', '>= 1.12.0'
+    gem 'grpc', '>= 1.38.0' # Minimum version with Ruby 3.0 support
+    gem 'hiredis'
+    gem 'http'
+    gem 'httpclient'
+    gem 'makara', '>= 0.6.0.pre' # Ruby 3 requires >= 0.6.0, which is currently in pre-release: https://rubygems.org/gems/makara/versions
+    gem 'mongo', '>= 2.8.0'
+    gem 'mysql2', '>= 0.5.3', platform: :ruby
+    gem 'pg', '>= 1.1', platform: :ruby
+    gem 'presto-client', '>=  0.5.14'
+    gem 'qless'
+    # gem 'racecar', '>= 0.3.5' # Pending release of our fix: https://github.com/appsignal/rdkafka-ruby/pull/144
+    gem 'rack'
+    gem 'rack-test'
+    gem 'rake', '>= 12.3'
+    gem 'redis', '< 4.0'
+    gem 'rest-client'
+    gem 'resque'
+    gem 'ruby-kafka', '>= 0.7.10'
+    gem 'rspec', '>= 3.0.0'
+    gem 'sequel'
+    gem 'shoryuken'
+    gem 'sidekiq'
+    gem 'sinatra'
+    gem 'sneakers', '>= 2.12.0'
+    gem 'sqlite3', '>= 1.4.2'
+    gem 'sucker_punch'
+    gem 'typhoeus'
+    gem 'que', '>= 1.0.0.beta2'
   end
+
+  appraise 'core-old' do
+    gem 'dogstatsd-ruby', '~> 4'
+  end
+end
+
+ruby_runtime = if defined?(RUBY_ENGINE_VERSION)
+                 "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
+               else
+                 "#{RUBY_ENGINE}-#{RUBY_VERSION}" # For Ruby < 2.3
+               end
+
+appraisals.each do |appraisal|
+  appraisal.name.prepend("#{ruby_runtime}-")
 end