ddtrace 0.38.0 → 0.43.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 88a2890ed343b6cfef9752a3bbeb34c4a670a86755c66f99d625fe10f9172f5f
-  data.tar.gz: e77520aa45dad85b0a8198233dd7e1bc485db11e8d478eb606401aaa9e17f2f9
+SHA1:
+  metadata.gz: 71b7fdfa16924489a0ab33f4d34753fb4df23e38
+  data.tar.gz: 122e1f6d2f7ba41a82727052a9b5ea36121c4bff
 SHA512:
-  metadata.gz: af5e2a13d1960b68d4b4d9c39661052898ce7636eef5866447ee67cb23d2f9e4a4d98aed3be403780a5d31c7c7a588cc7821dcf8b161679e211a6d315932f1bf
-  data.tar.gz: f0dc91d291576bec7a7b5ed7e494a09d2a976acfe7aa38999d2c8be893117757925253192f83f70317a8f60eee3d7fcc122aa8c33867409db5ade6b94f9148f4
+  metadata.gz: bbb7693da41ddbdedeaf7a6fbe4cbfd296e12636c39e4e1a81a30ed392e4b6ac57a10ab0654400373e3ff7150207d0fd511b95cd4367d811b2f58ed028d75187
+  data.tar.gz: e2450e8e4f411dcc36ba5548f1d24160571c801fb6ece09b8801e605149695f3f7a44217f8c05b059b82eb3e64c740cf10a9affb80ae39d2e1bb2b5739b4839f

data/.circleci/config.yml

@@ -162,6 +162,7 @@ orbs:
             environment:
               - BUNDLE_GEMFILE: /app/Gemfile
               - TEST_DATADOG_INTEGRATION: 1
+              - COVERAGE_BASE_DIR: coverage
           - *container_postgres
           - *container_presto
           - *container_mysql
@@ -170,6 +171,7 @@ orbs:
           - *container_mongo
           - *container_memcached
           - *container_agent
+        parallelism: 22
         steps:
           - restore_cache:
               keys:
@@ -177,7 +179,16 @@ orbs:
           - restore_cache:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
+          - run:
+              name: Set coverage report directory
+              command: |
+                # Create a unique coverage directory for this job, to avoid conflicts when merging all results
+                echo 'export COVERAGE_DIR="$COVERAGE_BASE_DIR/versions/$CIRCLE_JOB/$CIRCLE_NODE_INDEX"' >> $BASH_ENV
           - *step_run_all_tests
+          - persist_to_workspace:
+              root: .
+              paths:
+                - coverage
       benchmark:
         <<: *job_defaults
         parameters:
@@ -231,6 +242,38 @@ orbs:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
           - *step_rubocop
+      coverage:
+        <<: *job_defaults
+        parameters:
+          ruby_version:
+            description: Ruby version
+            type: string
+          image:
+            description: Docker image location
+            type: string
+        docker:
+          - <<: *container_base
+            image: <<parameters.image>>
+            environment:
+              - BUNDLE_GEMFILE: /app/Gemfile
+        steps:
+          - restore_cache:
+              keys:
+                - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
+          - restore_cache:
+              keys:
+                - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
+          - attach_workspace:
+              at: /tmp/workspace
+          - run:
+              name: Generate coverage report artifact "coverage/index.html"
+              command: COVERAGE_DIR=/tmp/workspace/coverage bundle exec rake coverage:report
+          - run:
+              name: Generate coverage report artifact "coverage/versions/*/index.html"
+              command: COVERAGE_DIR=/tmp/workspace/coverage bundle exec rake coverage:report_per_ruby_version
+          - store_artifacts:
+              path: /tmp/workspace/coverage/report/
+              destination: coverage
     commands:
     executors:
 
@@ -339,6 +382,19 @@ workflows:
           name: lint
           requires:
             - build-2.6
+      - orb/coverage:
+          <<: *config-2_7
+          name: coverage
+          requires:
+            - test-2.0
+            - test-2.1
+            - test-2.2
+            - test-2.3
+            - test-2.4
+            - test-2.5
+            - test-2.6
+            - test-2.7
+            - test-jruby-9.2
       # MRI
       - orb/checkout:
           <<: *config-2_0

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

@@ -0,0 +1,42 @@
+name: Add milestone to pull requests
+on:
+  pull_request:
+    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/.gitlab-ci.yml

@@ -15,6 +15,7 @@ copy_to_s3:
     - if: '$CI_COMMIT_BRANCH == "master"'
       when: on_success
     - when: manual
+      allow_failure: true
   script:
     - export ACCESS_KEY_ID=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.secret_key_id --with-decryption --query "Parameter.Value" --out text)
     - export SECRET_ACCESS_KEY=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-rb.secret_sec_key_id --with-decryption --query "Parameter.Value" --out text)

data/.simplecov

@@ -0,0 +1,38 @@
+SimpleCov.add_group 'contrib', '/lib/ddtrace/contrib'
+SimpleCov.add_group 'transport', '/lib/ddtrace/transport'
+SimpleCov.add_group 'spec', '/spec/'
+
+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.
+#
+# This should allow us to distinguish between runs with the same tests, but different gemsets:
+#   * appraisal rails5-mysql2 rake spec:rails
+#   * appraisal rails5-postgres rake spec:rails
+#
+# Subsequent runs of the same exact test suite should have the same command_name.
+command_line_arguments = ARGV.join(' ')
+gemset_hash = Digest::MD5.hexdigest Gem.loaded_specs.values.map { |x| "#{x.name}#{x.version}" }.sort.join
+ruby_engine = if defined?(RUBY_ENGINE_VERSION)
+  "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
+else
+  "#{RUBY_ENGINE}-#{RUBY_VERSION}" # For Ruby < 2.3
+end
+SimpleCov.command_name "#{ruby_engine}:#{gemset_hash}:#{$PROGRAM_NAME} #{command_line_arguments}"
+
+# A very large number to disable result merging timeout
+SimpleCov.merge_timeout 2 ** 31
+
+# DEV If we choose to enforce a hard minimum.
+# SimpleCov.minimum_coverage 95
+
+# DEV If we choose to enforce a maximum coverage drop.
+# DEV We have to figure out where to store previous coverage data
+# DEV in order to perform this comparison
+# SimpleCov.maximum_coverage_drop 1

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) \
@@ -13,6 +19,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -22,6 +29,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -31,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 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -39,6 +48,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -49,6 +59,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -58,6 +69,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -76,6 +88,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -83,6 +96,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'
@@ -101,6 +115,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -110,6 +125,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -119,6 +135,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 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -127,6 +144,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -137,6 +155,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -146,6 +165,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -153,6 +173,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres' do
@@ -160,6 +181,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -169,6 +191,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'contrib-old' do
@@ -181,13 +204,14 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
-      gem 'presto-client', '>=  0.5.14'      
+      gem 'presto-client', '>=  0.5.14'
       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'
@@ -196,6 +220,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'
@@ -215,6 +240,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -224,6 +250,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -233,6 +260,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 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -241,6 +269,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -251,6 +280,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -260,6 +290,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -267,6 +298,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres' do
@@ -274,6 +306,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -283,6 +316,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres-sidekiq' do
@@ -292,18 +326,21 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-mysql2' do
       gem 'rails', '5.2.3'
       gem 'mysql2', '< 1', platform: :ruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres' do
       gem 'rails', '5.2.3'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis' do
@@ -311,6 +348,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -318,6 +356,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -326,6 +365,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'contrib' do
@@ -339,6 +379,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'delayed_job'
       gem 'delayed_job_active_record'
       gem 'elasticsearch-transport'
+      gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'ethon'
       gem 'excon'
@@ -358,13 +399,16 @@ 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'
       gem 'sinatra'
+      gem 'sneakers', '>= 2.12.0'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
       gem 'typhoeus'
+      gem 'que', '>= 1.0.0.beta2'
     end
   end
 elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
@@ -376,6 +420,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -385,6 +430,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -394,6 +440,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 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres' do
@@ -402,6 +449,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -412,6 +460,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails32-postgres-sidekiq' do
@@ -421,6 +470,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sidekiq', '4.0.0'
       gem 'rack-cache', '1.7.1'
+      gem 'lograge', '< 0.4'
     end
 
     appraise 'rails4-mysql2' do
@@ -428,6 +478,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'mysql2', '< 1', platform: :ruby
       gem 'activerecord-jdbcmysql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres' do
@@ -435,6 +486,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres-redis' do
@@ -444,6 +496,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'redis-rails'
       gem 'redis', '< 4.0'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails4-postgres-sidekiq' do
@@ -453,18 +506,21 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     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
@@ -472,6 +528,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -479,6 +536,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -487,8 +545,21 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      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'
@@ -511,6 +582,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'http'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
       gem 'rack', '< 2.1.0' # Locked due to grape incompatibility: https://github.com/ruby-grape/grape/issues/1980
@@ -518,15 +590,18 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
       gem 'sinatra'
+      gem 'sneakers', '>= 2.12.0'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
       gem 'typhoeus'
+      gem 'que', '>= 1.0.0.beta2'
     end
 
     appraise 'contrib-old' do
@@ -540,12 +615,14 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -553,6 +630,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -560,6 +638,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -568,8 +647,21 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      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'
@@ -577,6 +669,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'
@@ -592,6 +685,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'http'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
@@ -599,15 +693,18 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
       gem 'sinatra'
+      gem 'sneakers', '>= 2.12.0'
       gem 'sqlite3', '~> 1.3.6'
       gem 'sucker_punch'
       gem 'typhoeus'
+      gem 'que', '>= 1.0.0.beta2'
     end
 
     appraise 'contrib-old' do
@@ -616,117 +713,154 @@ 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')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails5-mysql2' do
-      gem 'rails', '~> 5.2.1'
-      gem 'mysql2', '< 1', platform: :ruby
-      gem 'sprockets', '< 4'
-    end
+  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 'sprockets', '< 4'
-    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 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-    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 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-    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 'sidekiq'
-      gem 'activejob'
-      gem 'sprockets', '< 4'
-    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 'sprockets', '< 4'
-    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 'sprockets', '< 4'
-    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 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-    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 'redis', '>= 4.0.1'
-      gem 'sprockets', '< 4'
-    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 'sidekiq'
-      gem 'activejob'
-      gem 'sprockets', '< 4'
-    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 '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'
-      gem 'hiredis'
-      gem 'http'
-      gem 'mongo', '>= 2.8.0'
-      gem 'mysql2', '< 0.5', platform: :ruby
-      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 'sqlite3', '~> 1.4.1'
-      gem 'sucker_punch'
-      gem 'typhoeus'
-    end
+  appraise 'resque2-redis3' do
+    gem 'redis', '< 4.0'
+    gem 'resque', '>= 2.0'
+  end
 
-    appraise 'contrib-old' do
-      gem 'faraday', '0.17'
-    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'
+    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'
+    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 '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')
@@ -735,12 +869,14 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       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
@@ -748,6 +884,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -755,6 +892,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -763,18 +901,21 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       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 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-redis' do
@@ -782,6 +923,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
@@ -789,6 +931,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'pg', '< 1.0', platform: :ruby
       gem 'redis', '>= 4.0.1'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-sidekiq' do
@@ -797,8 +940,21 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      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..5).each { |v| gem_cucumber(v) }
+
     appraise 'contrib' do
       gem 'actionpack'
       gem 'actionview'
@@ -806,6 +962,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'
@@ -820,6 +977,7 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'http'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
@@ -827,15 +985,18 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
       gem 'sinatra'
+      gem 'sneakers', '>= 2.12.0'
       gem 'sqlite3', '~> 1.4.1'
       gem 'sucker_punch'
       gem 'typhoeus'
+      gem 'que', '>= 1.0.0.beta2'
     end
 
     appraise 'contrib-old' do
@@ -848,12 +1009,14 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'rails', '~> 5.2.1'
       gem 'mysql2', '< 0.5', 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
@@ -862,6 +1025,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-redis-activesupport' do
@@ -870,6 +1034,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails5-postgres-sidekiq' do
@@ -878,18 +1043,21 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-mysql2' do
       gem 'rails', '~> 6.0.0'
       gem 'mysql2', '< 0.6', platform: :ruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres' do
       gem 'rails', '~> 6.0.0'
       gem 'pg', '< 1.0', platform: :ruby
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-redis' do
@@ -898,6 +1066,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-redis-activesupport' do
@@ -906,6 +1075,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'redis-rails'
       gem 'redis'
       gem 'sprockets', '< 4'
+      gem 'lograge'
     end
 
     appraise 'rails6-postgres-sidekiq' do
@@ -914,8 +1084,21 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'sidekiq'
       gem 'activejob'
       gem 'sprockets', '< 4'
+      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..5).each { |v| gem_cucumber(v) }
+
     appraise 'contrib' do
       gem 'actionpack'
       gem 'actionview'
@@ -923,6 +1106,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'
@@ -936,6 +1120,7 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'http'
       gem 'mongo', '>= 2.8.0'
       gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'pg', platform: :ruby
       gem 'presto-client', '>=  0.5.14'
       gem 'racecar', '>= 0.3.5'
       gem 'rack'
@@ -943,15 +1128,18 @@ elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
       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'
       gem 'sinatra'
+      gem 'sneakers', '>= 2.12.0'
       gem 'sqlite3', '~> 1.4.1'
       gem 'sucker_punch'
       gem 'typhoeus'
+      gem 'que', '>= 1.0.0.beta2'
     end
 
     appraise 'contrib-old' do