ddtrace 0.40.0 → 0.45.0

data/.circleci/images/primary/Dockerfile-3.0.0

@@ -0,0 +1,73 @@
+# https://hub.docker.com/layers/ruby/library/ruby/3.0.0/images/sha256-9719b7df964602b114a5e9319bd0a3ce2d4d44ccb7ea4d1702fa1ef9742a8f84
+FROM ruby@sha256:9719b7df964602b114a5e9319bd0a3ce2d4d44ccb7ea4d1702fa1ef9742a8f84
+
+# Make apt non-interactive
+RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
+  && echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install required packages
+RUN set -ex; \
+        apt-get update; \
+        mkdir -p /usr/share/man/man1; \
+        apt-get install -y --no-install-recommends \
+            git mercurial xvfb \
+            locales sudo openssh-client ca-certificates tar gzip parallel \
+            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            tzdata rsync vim; \
+        rm -rf /var/lib/apt/lists/*;
+
+# Set timezone to UTC by default
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+
+# Set language
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+
+# Install jq
+RUN JQ_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/jq-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/jq $JQ_URL \
+  && chmod +x /usr/bin/jq \
+  && jq --version
+
+# Install Docker
+RUN set -ex \
+  && export DOCKER_VERSION=$(curl --silent --fail --retry 3 https://download.docker.com/linux/static/stable/x86_64/ | grep -o -e 'docker-[.0-9]*-ce\.tgz' | sort -r | head -n 1) \
+  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_VERSION}" \
+  && echo Docker URL: $DOCKER_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/docker.tgz "${DOCKER_URL}" \
+  && ls -lha /tmp/docker.tgz \
+  && tar -xz -C /tmp -f /tmp/docker.tgz \
+  && mv /tmp/docker/* /usr/bin \
+  && rm -rf /tmp/docker /tmp/docker.tgz \
+  && which docker \
+  && (docker version || true)
+
+# Install Docker Compose
+RUN COMPOSE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/docker-compose-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/docker-compose $COMPOSE_URL \
+  && chmod +x /usr/bin/docker-compose \
+  && docker-compose version
+
+# Install Dockerize
+RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/dockerize-latest.tar.gz" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/dockerize-linux-amd64.tar.gz $DOCKERIZE_URL \
+  && tar -C /usr/local/bin -xzvf /tmp/dockerize-linux-amd64.tar.gz \
+  && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
+  && dockerize --version
+
+# Install RubyGems
+RUN gem update --system
+RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
+
+# Upgrade RubyGems and Bundler
+RUN gem update --system
+RUN gem install bundler
+ENV BUNDLE_SILENCE_ROOT_WARNING 1
+
+RUN mkdir /app
+WORKDIR /app
+
+CMD ["/bin/sh"]

data/.github/workflows/add-milestone-to-pull-requests.yml

@@ -0,0 +1,42 @@
+name: Add milestone to pull requests
+on:
+  pull_request_target:
+    types: [closed]
+    branches:
+      - master
+
+jobs:
+  add_milestone_to_merged:
+    if: github.event.pull_request.merged && github.event.pull_request.milestone == null
+    name: Add milestone to merged pull requests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get project milestones
+        id: milestones
+        uses: actions/github-script@0.9.0
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            const list = await github.issues.listMilestonesForRepo({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open'
+            })
+            // Need to manually sort because "sort by number" isn't part of the api
+            // highest number first
+            const milestones = list.data.sort((a,b) => (b.number - a.number))
+
+            return milestones.length == 0 ? null : milestones[0].number
+      - name: Update Pull Request
+        if: steps.milestones.outputs.result != null
+        uses: actions/github-script@0.9.0
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            // Confusingly, the issues api is used because pull requests are issues
+            await github.issues.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: ${{ github.event.pull_request.number }},
+              milestone: ${{ steps.milestones.outputs.result }},
+            });

data/.github/workflows/create-next-milestone.yml

@@ -0,0 +1,20 @@
+name: Create next milestone
+on:
+  milestone:
+    types: [closed]
+
+jobs:
+  create_next_milestone:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get next minor version
+        id: semvers
+        uses: WyriHaximus/github-action-next-semvers@0.1.0
+        with:
+          version: ${{ github.event.milestone.title }}
+      - name: Create next milestone
+        uses: WyriHaximus/github-action-create-milestone@0.1.0
+        with:
+          title: ${{ steps.semvers.outputs.minor }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.simplecov

@@ -2,6 +2,9 @@ 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,6 +2,12 @@ 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) \
@@ -33,6 +39,7 @@ 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'
     end
 
@@ -80,6 +87,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
       gem 'mongo', '< 2.5'
       gem 'mysql2', '0.3.21', platform: :ruby
       gem 'pg', '< 1.0', platform: :ruby
@@ -90,6 +98,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis', '< 4.0'
       gem 'rest-client'
       gem 'resque', '< 2.0'
+      gem 'rspec', '>= 3.0.0'
       gem 'sequel', '~> 4.0', '< 4.37'
       gem 'sidekiq', '~> 3.5.4'
       gem 'sinatra', '1.4.5'
@@ -128,6 +137,7 @@ 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'
     end
 
@@ -202,6 +212,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
       gem 'mongo', '< 2.5'
       gem 'mysql2', '0.3.21', platform: :ruby
       gem 'pg', '< 1.0', platform: :ruby
@@ -213,6 +224,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'
@@ -252,6 +264,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
 
@@ -377,12 +390,14 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'excon'
       gem 'faraday'
       gem 'grape'
-      gem 'graphql', '< 1.9.4'
+      gem 'graphql', '>= 1.12.0'
       gem 'grpc', '~> 1.21.0' # Last version to support Ruby < 2.3
       gem 'hiredis'
       gem 'http'
+      gem 'httpclient'
       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 +406,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'
@@ -431,6 +447,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 +556,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 +583,26 @@ 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 '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'
@@ -628,6 +660,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 +679,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 +688,26 @@ 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 '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'
@@ -677,10 +725,198 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
   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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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'
+  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 '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'
+    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
+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 +924,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 +931,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 +939,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 +947,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 +956,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 +963,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 +970,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 +978,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 +986,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 +1041,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 +1050,25 @@ 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 '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'
@@ -939,11 +1084,12 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'faraday', '0.17'
     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 +1130,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 +1169,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 +1218,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 +1226,25 @@ 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 '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'
@@ -1068,4 +1260,91 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'faraday', '0.17'
     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 '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
 end