ddtrace 0.43.0 → 0.48.0

data/.simplecov

@@ -1,13 +1,22 @@
+# 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.
 # When running `rake spec:test_name`, the test process doesn't have access to the
 # rake task process, so we have come up with unique values ourselves.
-# 
+#
 # The current approach is to combine the ruby engine (ruby-2.7,jruby-9.2),
 # program name (rspec/test), command line arguments (--pattern spec/**/*_spec.rb),
 # and the loaded gemset.

data/Appraisals

@@ -39,7 +39,10 @@ elsif Gem::Version.new('2.0.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
+      gem 'safe_yaml' # Required for makara, as YAML.safe_load is not available in Ruby 2.0
     end
 
     appraise 'rails32-postgres' do
@@ -86,6 +89,8 @@ elsif Gem::Version.new('2.0.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
@@ -97,6 +102,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'rspec', '>= 3.0.0'
+      gem 'safe_yaml' # Required for makara, as YAML.safe_load is not available in Ruby 2.0
       gem 'sequel', '~> 4.0', '< 4.37'
       gem 'sidekiq', '~> 3.5.4'
       gem 'sinatra', '1.4.5'
@@ -105,6 +111,10 @@ elsif Gem::Version.new('2.0.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.1.0') <= Gem::Version.new(RUBY_VERSION) \
       && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
@@ -135,7 +145,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
@@ -209,6 +221,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
@@ -230,6 +244,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')
@@ -260,6 +278,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
 
@@ -334,6 +353,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
@@ -341,6 +361,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
@@ -349,6 +370,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
@@ -357,6 +379,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
@@ -366,6 +389,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
@@ -385,12 +409,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'
@@ -410,6 +437,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')
@@ -440,6 +471,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
 
@@ -575,15 +607,18 @@ 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'
@@ -607,6 +642,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')
@@ -678,15 +717,18 @@ 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'
@@ -710,6 +752,10 @@ 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')
@@ -719,6 +765,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -727,6 +774,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -736,6 +784,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -745,6 +794,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -755,6 +805,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -763,6 +814,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -771,6 +823,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -780,6 +833,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -789,6 +843,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -799,6 +854,45 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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
@@ -829,16 +923,20 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     gem 'excon'
     gem 'faraday'
     gem 'grape'
-    gem 'graphql'
+    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', '< 0.5', platform: :ruby
-    gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+    gem 'mysql2', '< 1', platform: :ruby
+    gem 'activerecord-jdbcmysql-adapter', '>= 60.2', platform: :jruby
     gem 'pg', platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    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'
@@ -854,6 +952,7 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
     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'
@@ -862,6 +961,10 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
   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'
@@ -943,6 +1046,36 @@ elsif Gem::Version.new('2.6.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'
@@ -971,14 +1104,17 @@ 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'
@@ -1002,12 +1138,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
@@ -1048,7 +1189,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
@@ -1087,6 +1228,36 @@ 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'
@@ -1114,14 +1285,17 @@ 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'
@@ -1145,5 +1319,101 @@ 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' # Pending 3.0 support by transient protobuf dependency https://github.com/protocolbuffers/protobuf/issues/7922
+    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