ddtrace 0.43.0 → 0.45.0

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
-# Add debugger for pry that's compatible with 0.10.4
-gem 'pry-nav', git: 'https://github.com/nixme/pry-nav.git', branch: 'master'
+if RUBY_VERSION >= '3.0.0'
+  gem 'webrick', '>= 1.7.0' # No longer bundled by default since Ruby 3.0
+end
+
 # This file was generated by Appraisal

data/README.md

@@ -1,6 +1,7 @@
 # Datadog Trace Client
 
 [![CircleCI](https://circleci.com/gh/DataDog/dd-trace-rb/tree/master.svg?style=svg&circle-token=b0bd5ef866ec7f7b018f48731bb495f2d1372cc1)](https://circleci.com/gh/DataDog/dd-trace-rb/tree/master)
+[![codecov](https://codecov.io/gh/DataDog/dd-trace-rb/branch/master/graph/badge.svg)](https://app.codecov.io/gh/DataDog/dd-trace-rb/branch/master)
 
 ``ddtrace`` is Datadog’s tracing client for Ruby. It is used to trace requests as they flow across web servers,
 databases and microservices so that developers have great visiblity into bottlenecks and troublesome requests.

data/Rakefile

@@ -17,7 +17,8 @@ namespace :spec do
 
   RSpec::Core::RakeTask.new(:main) do |t, args|
     t.pattern = 'spec/**/*_spec.rb'
-    t.exclude_pattern = 'spec/**/{contrib,benchmark,redis,opentracer,opentelemetry}/**/*_spec.rb'
+    t.exclude_pattern = 'spec/**/{contrib,benchmark,redis,opentracer,opentelemetry,auto_instrument}/**/*_spec.rb,'\
+                        ' spec/**/auto_instrument_spec.rb'
     t.rspec_opts = args.to_a.join(' ')
   end
 
@@ -38,7 +39,7 @@ namespace :spec do
 
   RSpec::Core::RakeTask.new(:rails) do |t, args|
     t.pattern = 'spec/ddtrace/contrib/rails/**/*_spec.rb'
-    t.exclude_pattern = 'spec/ddtrace/contrib/rails/**/*{active_job,disable_env,redis_cache}*_spec.rb'
+    t.exclude_pattern = 'spec/ddtrace/contrib/rails/**/*{active_job,disable_env,redis_cache,auto_instrument}*_spec.rb'
     t.rspec_opts = args.to_a.join(' ')
   end
 
@@ -57,6 +58,16 @@ namespace :spec do
     t.rspec_opts = args.to_a.join(' ')
   end
 
+  RSpec::Core::RakeTask.new(:railsautoinstrument) do |t, args|
+    t.pattern = 'spec/ddtrace/contrib/rails/**/*auto_instrument*_spec.rb'
+    t.rspec_opts = args.to_a.join(' ')
+  end
+
+  RSpec::Core::RakeTask.new(:autoinstrument) do |t, args|
+    t.pattern = 'spec/ddtrace/auto_instrument_spec.rb'
+    t.rspec_opts = args.to_a.join(' ')
+  end
+
   RSpec::Core::RakeTask.new(:contrib) do |t, args|
     contrib_paths = [
       'analytics',
@@ -96,11 +107,13 @@ namespace :spec do
     :graphql,
     :grpc,
     :http,
+    :httpclient,
     :httprb,
     :kafka,
     :mongodb,
     :mysql2,
     :presto,
+    :qless,
     :que,
     :racecar,
     :rack,
@@ -219,6 +232,7 @@ task :ci do
       declare 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib-old rake spec:active_record'
       declare 'bundle exec appraisal contrib-old rake spec:active_support'
+      declare 'bundle exec appraisal contrib-old rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib-old rake spec:aws'
       declare 'bundle exec appraisal contrib-old rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib-old rake spec:dalli'
@@ -228,6 +242,7 @@ task :ci do
       declare 'bundle exec appraisal contrib-old rake spec:excon'
       declare 'bundle exec appraisal contrib-old rake spec:faraday'
       declare 'bundle exec appraisal contrib-old rake spec:http'
+      declare 'bundle exec appraisal contrib-old rake spec:httpclient'
       declare 'bundle exec appraisal contrib-old rake spec:httprb'
       declare 'bundle exec appraisal contrib-old rake spec:mongodb'
       declare 'bundle exec appraisal contrib-old rake spec:mysql2'
@@ -245,10 +260,12 @@ task :ci do
       # Rails minitests
       declare 'bundle exec appraisal rails30-postgres rake test:rails'
       declare 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails30-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails32-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails32-postgres rake test:rails'
       declare 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails32-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails30-postgres rake spec:rails'
       declare 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -274,6 +291,7 @@ task :ci do
       declare 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib-old rake spec:active_record'
       declare 'bundle exec appraisal contrib-old rake spec:active_support'
+      declare 'bundle exec appraisal contrib-old rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib-old rake spec:aws'
       declare 'bundle exec appraisal contrib-old rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib-old rake spec:dalli'
@@ -283,6 +301,7 @@ task :ci do
       declare 'bundle exec appraisal contrib-old rake spec:excon'
       declare 'bundle exec appraisal contrib-old rake spec:faraday'
       declare 'bundle exec appraisal contrib-old rake spec:http'
+      declare 'bundle exec appraisal contrib-old rake spec:httpclient'
       declare 'bundle exec appraisal contrib-old rake spec:httprb'
       declare 'bundle exec appraisal contrib-old rake spec:kafka'
       declare 'bundle exec appraisal contrib-old rake spec:mongodb'
@@ -302,14 +321,17 @@ task :ci do
       # Rails minitests
       declare 'bundle exec appraisal rails30-postgres rake test:rails'
       declare 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails30-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails32-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails32-postgres rake test:rails'
       declare 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails32-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails4-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails4-postgres rake test:rails'
       declare 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails4-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails30-postgres rake spec:rails'
       declare 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -338,6 +360,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib rake spec:active_record'
       declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib rake spec:aws'
       declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib rake spec:dalli'
@@ -350,11 +373,13 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:graphql'
       declare 'bundle exec appraisal contrib rake spec:grpc'
       declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
       declare 'bundle exec appraisal contrib rake spec:httprb'
       declare 'bundle exec appraisal contrib rake spec:kafka'
       declare 'bundle exec appraisal contrib rake spec:mongodb'
       declare 'bundle exec appraisal contrib rake spec:mysql2'
       declare 'bundle exec appraisal contrib rake spec:presto'
+      declare 'bundle exec appraisal contrib rake spec:qless'
       declare 'bundle exec appraisal contrib rake spec:que'
       declare 'bundle exec appraisal contrib rake spec:racecar'
       declare 'bundle exec appraisal contrib rake spec:rack'
@@ -373,14 +398,17 @@ task :ci do
       # Rails minitests
       declare 'bundle exec appraisal rails30-postgres rake test:rails'
       declare 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails30-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails32-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails32-postgres rake test:rails'
       declare 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails32-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails4-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails4-postgres rake test:rails'
       declare 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails4-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails4-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails5-postgres rake test:rails'
@@ -388,6 +416,7 @@ task :ci do
       declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails30-postgres rake spec:rails'
       declare 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -413,6 +442,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib rake spec:active_record'
       declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib rake spec:aws'
       declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib rake spec:dalli'
@@ -425,6 +455,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:graphql'
       declare 'bundle exec appraisal contrib rake spec:grpc'
       declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
       declare 'bundle exec appraisal contrib rake spec:httprb'
       declare 'bundle exec appraisal contrib rake spec:kafka'
       declare 'bundle exec appraisal contrib rake spec:mongodb'
@@ -450,14 +481,17 @@ task :ci do
       # Rails minitests
       declare 'bundle exec appraisal rails30-postgres rake test:rails'
       declare 'bundle exec appraisal rails30-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails30-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails32-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails32-postgres rake test:rails'
       declare 'bundle exec appraisal rails32-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails32-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails32-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails4-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails4-postgres rake test:rails'
       declare 'bundle exec appraisal rails4-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails4-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails4-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails4-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails5-postgres rake test:rails'
@@ -465,6 +499,7 @@ task :ci do
       declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails30-postgres rake spec:rails'
       declare 'bundle exec appraisal rails32-mysql2 rake spec:rails'
@@ -495,6 +530,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib rake spec:active_record'
       declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib rake spec:aws'
       declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib rake spec:dalli'
@@ -507,6 +543,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:graphql'
       declare 'bundle exec appraisal contrib rake spec:grpc'
       declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
       declare 'bundle exec appraisal contrib rake spec:httprb'
       declare 'bundle exec appraisal contrib rake spec:kafka'
       declare 'bundle exec appraisal contrib rake spec:mongodb'
@@ -537,6 +574,7 @@ task :ci do
       declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       declare 'bundle exec appraisal rails5-postgres rake spec:rails'
@@ -564,6 +602,7 @@ task :ci do
     declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
     declare 'bundle exec appraisal contrib rake spec:active_record'
     declare 'bundle exec appraisal contrib rake spec:active_support'
+    declare 'bundle exec appraisal contrib rake spec:autoinstrument'
     declare 'bundle exec appraisal contrib rake spec:aws'
     declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
     declare 'bundle exec appraisal contrib rake spec:cucumber'
@@ -577,11 +616,13 @@ task :ci do
     declare 'bundle exec appraisal contrib rake spec:graphql'
     declare 'bundle exec appraisal contrib rake spec:grpc' if RUBY_PLATFORM != 'java' # protobuf not supported
     declare 'bundle exec appraisal contrib rake spec:http'
+    declare 'bundle exec appraisal contrib rake spec:httpclient'
     declare 'bundle exec appraisal contrib rake spec:httprb'
     declare 'bundle exec appraisal contrib rake spec:kafka'
     declare 'bundle exec appraisal contrib rake spec:mongodb'
     declare 'bundle exec appraisal contrib rake spec:mysql2' if RUBY_PLATFORM != 'java' # built-in jdbc is used instead
     declare 'bundle exec appraisal contrib rake spec:presto'
+    declare 'bundle exec appraisal contrib rake spec:qless'
     declare 'bundle exec appraisal contrib rake spec:que'
     declare 'bundle exec appraisal contrib rake spec:racecar'
     declare 'bundle exec appraisal contrib rake spec:rack'
@@ -607,19 +648,29 @@ task :ci do
     declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
     declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
     declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+    declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
     declare 'bundle exec appraisal rails6-mysql2 rake test:rails'
     declare 'bundle exec appraisal rails6-postgres rake test:rails'
     declare 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
     declare 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
     declare 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
     declare 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
+    declare 'bundle exec appraisal rails6-postgres rake spec:railsautoinstrument'
     # Rails specs
     declare 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
     declare 'bundle exec appraisal rails5-mysql2 rake spec:rails'
     declare 'bundle exec appraisal rails5-postgres rake spec:rails'
-    # declare 'bundle exec appraisal rails6-mysql2 rake spec:action_cable' # TODO: Hangs CI jobs... fix and re-enable.
+    declare 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
     declare 'bundle exec appraisal rails6-mysql2 rake spec:rails'
     declare 'bundle exec appraisal rails6-postgres rake spec:rails'
+    declare 'bundle exec appraisal rails61-mysql2 rake spec:action_cable'
+    declare 'bundle exec appraisal rails61-mysql2 rake spec:rails'
+    declare 'bundle exec appraisal rails61-mysql2 rake test:rails'
+    declare 'bundle exec appraisal rails61-postgres rake spec:rails'
+    declare 'bundle exec appraisal rails61-postgres rake spec:railsdisableenv'
+    declare 'bundle exec appraisal rails61-postgres rake test:rails'
+    declare 'bundle exec appraisal rails61-postgres-redis rake spec:railsredis'
+    declare 'bundle exec appraisal rails61-postgres-sidekiq rake spec:railsactivejob'
 
     # explicitly test resque-2x compatability
     declare 'bundle exec appraisal resque2-redis3 rake spec:resque'
@@ -646,6 +697,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib rake spec:active_record'
       declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib rake spec:aws'
       declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib rake spec:cucumber'
@@ -659,11 +711,13 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:graphql'
       declare 'bundle exec appraisal contrib rake spec:grpc'
       declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
       declare 'bundle exec appraisal contrib rake spec:httprb'
       declare 'bundle exec appraisal contrib rake spec:kafka'
       declare 'bundle exec appraisal contrib rake spec:mongodb'
       declare 'bundle exec appraisal contrib rake spec:mysql2'
       declare 'bundle exec appraisal contrib rake spec:presto'
+      declare 'bundle exec appraisal contrib rake spec:qless'
       declare 'bundle exec appraisal contrib rake spec:que'
       declare 'bundle exec appraisal contrib rake spec:racecar'
       declare 'bundle exec appraisal contrib rake spec:rack'
@@ -679,6 +733,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:sneakers'
       declare 'bundle exec appraisal contrib rake spec:sucker_punch'
       declare 'bundle exec appraisal contrib rake spec:suite'
+
       # Contrib specs with old gem versions
       declare 'bundle exec appraisal contrib-old rake spec:faraday'
       # Rails minitests
@@ -689,19 +744,29 @@ task :ci do
       declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails6-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails6-postgres rake test:rails'
       declare 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails6-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
       declare 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       declare 'bundle exec appraisal rails5-postgres rake spec:rails'
-      # declare 'bundle exec appraisal rails6-mysql2 rake spec:action_cable' # TODO: Hangs CI jobs... fix and re-enable.
+      declare 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
       declare 'bundle exec appraisal rails6-mysql2 rake spec:rails'
       declare 'bundle exec appraisal rails6-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:action_cable'
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:rails'
+      declare 'bundle exec appraisal rails61-mysql2 rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails61-postgres rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres-redis rake spec:railsredis'
+      declare 'bundle exec appraisal rails61-postgres-sidekiq rake spec:railsactivejob'
 
       # explicitly test resque-2x compatability
       declare 'bundle exec appraisal resque2-redis3 rake spec:resque'
@@ -712,7 +777,8 @@ task :ci do
       declare 'bundle exec appraisal cucumber4 rake spec:cucumber'
       declare 'bundle exec appraisal cucumber5 rake spec:cucumber'
     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')
     # Main library
     declare 'bundle exec rake test:main'
     declare 'bundle exec rake spec:main'
@@ -728,6 +794,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
       declare 'bundle exec appraisal contrib rake spec:active_record'
       declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:autoinstrument'
       declare 'bundle exec appraisal contrib rake spec:aws'
       declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
       declare 'bundle exec appraisal contrib rake spec:cucumber'
@@ -741,11 +808,13 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:graphql'
       declare 'bundle exec appraisal contrib rake spec:grpc'
       declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
       declare 'bundle exec appraisal contrib rake spec:httprb'
       declare 'bundle exec appraisal contrib rake spec:kafka'
       declare 'bundle exec appraisal contrib rake spec:mongodb'
       declare 'bundle exec appraisal contrib rake spec:mysql2'
       declare 'bundle exec appraisal contrib rake spec:presto'
+      declare 'bundle exec appraisal contrib rake spec:qless'
       declare 'bundle exec appraisal contrib rake spec:que'
       declare 'bundle exec appraisal contrib rake spec:racecar'
       declare 'bundle exec appraisal contrib rake spec:rack'
@@ -761,6 +830,7 @@ task :ci do
       declare 'bundle exec appraisal contrib rake spec:sneakers'
       declare 'bundle exec appraisal contrib rake spec:sucker_punch'
       declare 'bundle exec appraisal contrib rake spec:suite'
+
       # Contrib specs with old gem versions
       declare 'bundle exec appraisal contrib-old rake spec:faraday'
       # Rails minitests
@@ -771,17 +841,99 @@ task :ci do
       declare 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails5-postgres rake spec:railsautoinstrument'
       declare 'bundle exec appraisal rails6-mysql2 rake test:rails'
       declare 'bundle exec appraisal rails6-postgres rake test:rails'
       declare 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
       declare 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
       declare 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
       declare 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails6-postgres rake spec:railsautoinstrument'
       # Rails specs
       declare 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       declare 'bundle exec appraisal rails5-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
       declare 'bundle exec appraisal rails6-mysql2 rake spec:rails'
       declare 'bundle exec appraisal rails6-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:action_cable'
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:rails'
+      declare 'bundle exec appraisal rails61-mysql2 rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails61-postgres rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres-redis rake spec:railsredis'
+      declare 'bundle exec appraisal rails61-postgres-sidekiq rake spec:railsactivejob'
+
+      # explicitly test resque-2x compatability
+      declare 'bundle exec appraisal resque2-redis3 rake spec:resque'
+      declare 'bundle exec appraisal resque2-redis4 rake spec:resque'
+
+      # explicitly test cucumber compatibility
+      declare 'bundle exec appraisal cucumber3 rake spec:cucumber'
+      declare 'bundle exec appraisal cucumber4 rake spec:cucumber'
+      declare 'bundle exec appraisal cucumber5 rake spec:cucumber'
+    end
+  elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
+    # Main library
+    declare 'bundle exec rake test:main'
+    declare 'bundle exec rake spec:main'
+    declare 'bundle exec rake spec:contrib'
+    declare 'bundle exec rake spec:opentracer'
+    declare 'bundle exec rake spec:opentelemetry'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      # Contrib specs
+      declare 'bundle exec appraisal contrib rake spec:action_pack'
+      declare 'bundle exec appraisal contrib rake spec:action_view'
+      declare 'bundle exec appraisal contrib rake spec:active_model_serializers'
+      declare 'bundle exec appraisal contrib rake spec:active_record'
+      declare 'bundle exec appraisal contrib rake spec:active_support'
+      declare 'bundle exec appraisal contrib rake spec:aws'
+      declare 'bundle exec appraisal contrib rake spec:concurrent_ruby'
+      declare 'bundle exec appraisal contrib rake spec:cucumber'
+      declare 'bundle exec appraisal contrib rake spec:dalli'
+      declare 'bundle exec appraisal contrib rake spec:delayed_job'
+      declare 'bundle exec appraisal contrib rake spec:elasticsearch'
+      declare 'bundle exec appraisal contrib rake spec:ethon'
+      declare 'bundle exec appraisal contrib rake spec:excon'
+      declare 'bundle exec appraisal contrib rake spec:faraday'
+      declare 'bundle exec appraisal contrib rake spec:grape'
+      declare 'bundle exec appraisal contrib rake spec:graphql'
+      # declare 'bundle exec appraisal contrib rake spec:grpc' # Pending https://github.com/protocolbuffers/protobuf/issues/7922
+      declare 'bundle exec appraisal contrib rake spec:http'
+      declare 'bundle exec appraisal contrib rake spec:httpclient'
+      declare 'bundle exec appraisal contrib rake spec:httprb'
+      declare 'bundle exec appraisal contrib rake spec:kafka'
+      declare 'bundle exec appraisal contrib rake spec:mongodb'
+      declare 'bundle exec appraisal contrib rake spec:mysql2'
+      declare 'bundle exec appraisal contrib rake spec:presto'
+      declare 'bundle exec appraisal contrib rake spec:qless'
+      declare 'bundle exec appraisal contrib rake spec:que'
+      # declare 'bundle exec appraisal contrib rake spec:racecar' # Pending release of our fix: https://github.com/appsignal/rdkafka-ruby/pull/144
+      declare 'bundle exec appraisal contrib rake spec:rack'
+      declare 'bundle exec appraisal contrib rake spec:rake'
+      declare 'bundle exec appraisal contrib rake spec:redis'
+      declare 'bundle exec appraisal contrib rake spec:resque'
+      declare 'bundle exec appraisal contrib rake spec:rest_client'
+      declare 'bundle exec appraisal contrib rake spec:rspec'
+      declare 'bundle exec appraisal contrib rake spec:sequel'
+      declare 'bundle exec appraisal contrib rake spec:shoryuken'
+      declare 'bundle exec appraisal contrib rake spec:sidekiq'
+      declare 'bundle exec appraisal contrib rake spec:sinatra'
+      declare 'bundle exec appraisal contrib rake spec:sneakers'
+      declare 'bundle exec appraisal contrib rake spec:sucker_punch'
+      declare 'bundle exec appraisal contrib rake spec:suite'
+
+      # Rails
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:action_cable'
+      declare 'bundle exec appraisal rails61-mysql2 rake spec:rails'
+      declare 'bundle exec appraisal rails61-mysql2 rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:rails'
+      declare 'bundle exec appraisal rails61-postgres rake spec:railsdisableenv'
+      declare 'bundle exec appraisal rails61-postgres rake test:rails'
+      declare 'bundle exec appraisal rails61-postgres-redis rake spec:railsredis'
+      declare 'bundle exec appraisal rails61-postgres-sidekiq rake spec:railsactivejob'
 
       # explicitly test resque-2x compatability
       declare 'bundle exec appraisal resque2-redis3 rake spec:resque'
@@ -805,7 +957,13 @@ namespace :coverage do
 
     SimpleCov.collate resultset_files do
       coverage_dir "#{ENV.fetch('COVERAGE_DIR', 'coverage')}/report"
-      formatter SimpleCov::Formatter::HTMLFormatter
+      if ENV['CI'] == 'true'
+        require 'codecov'
+        formatter SimpleCov::Formatter::MultiFormatter.new([SimpleCov::Formatter::HTMLFormatter,
+                                                            SimpleCov::Formatter::Codecov])
+      else
+        formatter SimpleCov::Formatter::HTMLFormatter
+      end
     end
   end
 
@@ -824,4 +982,12 @@ namespace :coverage do
   end
 end
 
+namespace :changelog do
+  task :format do
+    require 'pimpmychangelog'
+
+    PimpMyChangelog::CLI.run!
+  end
+end
+
 task default: :test