ddtrace 0.46.0 → 0.51.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765c02ea39ee5565a83c8b818f27c7dae9c4bc1a0f0dfeed188484e726b80d8a
-  data.tar.gz: 64abc2a7449f61b4f6b121a8ca3f9e4fc2a3a515842ed737d57b5441ab631300
+  metadata.gz: fce3db0a7021902cfad28b09efb4781e6a1462c90735532b844366ed5a1dcb95
+  data.tar.gz: 202ddf5a16aa72777ec7c5cd70affa62229e11e733feb7d79a3cace17cb21ced
 SHA512:
-  metadata.gz: 3b4b88acb48e5a1cf9b6f52280d06ecc8d1ab0b1ba3e09c1649d4b5e42a2d2fac9056be0d4c339c4fac3bc944401b2e142a6f4f99f01e16d6c3f9f52cce6b305
-  data.tar.gz: 5564b83b67f0b0ae9df7b93f038b4e25fe53de21aea237695b0522e6af06eb22cd957444ab8d05c7d9b4a597676ece5fa6da7cb9a5080a0f372056b6927d1596
+  metadata.gz: 822cd2d9cbc80bd26964fe284ddc59600cc1fea8b36414a9654d595146a97035a8f929d66305046c10222cb749da63c0a9bf9aae09fa601bc727752a86d99941
+  data.tar.gz: 3cd593083e32fb0ae0e794cd043e49a80eb22e167833824632a1e809bcf78a014e5d35466e5342232c9a903e43cf0a2a9f38d134ed5148d6d6b8693c5ddbd062

data/.circleci/config.yml

@@ -21,6 +21,15 @@ test_containers:
         description: Jit enabled?
         type: boolean
         default: false
+      resource_class_to_use:
+        description: Resource class to use
+        type: string
+        default: medium
+      edge:
+        description: Use latest version of dependencies during testing
+        type: boolean
+        default: false
+    resource_class: <<parameters.resource_class_to_use>>
   - &container_base_environment
     BUNDLE_GEMFILE: /app/Gemfile
     JRUBY_OPTS: --dev # Faster JVM startup: https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag
@@ -46,7 +55,8 @@ test_containers:
       - POSTGRES_DB=postgres
   - &postgres_port 5432
   - &container_presto
-    image: prestosql/presto
+    # Move to trinodb/trino after https://github.com/treasure-data/presto-client-ruby/issues/64 is resolved.
+    image: starburstdata/presto:332-e.9
   - &presto_port 8080
   - &container_mysql
     image: mysql:5.6
@@ -75,15 +85,39 @@ test_containers:
       - DD_API_KEY=invalid_key_but_this_is_fine
   - &agent_port 8126
 
-step_init_bundle_checksum: &step_init_bundle_checksum
+check_exact_bundle_cache_hit: &check_exact_bundle_cache_hit
+  run:
+    name: Check if we restored an exact cache of gems that this job requires
+    # CircleCI doesn't tell us if we had a perfect cache match or partial match.
+    # To accomplish such check, we save `bundle_checksum` alongside the cached
+    # gems. After gems are restored, we compare the restored `bundle_checksum`'s
+    # content with the current commit's `bundle_checksum`.
+    #
+    # Because we are using a "soft" approach to our gemset lock files, we allow
+    # for partial matches to lock files until a new release goes out.
+    # This means that we might install slightly out of date gems, instead of the
+    # very latest versions from RubyGems until the next gemset update commit.
+    command: |
+      ! cmp -s .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
+      echo "export CI_BUNDLE_CACHE_HIT=$?" >> $BASH_ENV
+save_bundle_checksum: &save_bundle_checksum
   run:
-    name: Initialize bundle cache key
+    name: Save current bundle checksum alongside cached gems
     command: |
-      touch .circleci/bundle_checksum
+      if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
+        # Recompute gemfiles/*.lock checksum, as it might have changed.
+        cat Gemfile Appraisals gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+      fi
+      cp .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
 step_bundle_install: &step_bundle_install
   run:
     name: Install gem dependencies
-    command: bundle install
+    command: |
+      if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
+        bundle install
+      else
+        echo "All required gems were found in cache."
+      fi
 step_rubocop: &step_rubocop
   run:
     name: Delint with Rubocop
@@ -92,16 +126,25 @@ step_appraisal_install: &step_appraisal_install
   run:
     name: Install Appraisal gems
     command: |
-      bundle exec appraisal clean # Ensure we fetch the latest version of dependencies
-      bundle exec appraisal install
+      if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
+        bundle exec appraisal install
+      else
+        echo "All required gems were found in cache."
+      fi
+step_appraisal_update: &step_appraisal_update
+  run:
+    name: Update Appraisal gems
+    command: | # Remove all generated gemfiles and lockfiles, resolve, and install dependencies again
+      bundle exec appraisal update
 step_compute_bundle_checksum: &step_compute_bundle_checksum
   run:
     name: Compute bundle checksum
+    # This checksum leaves some leeway for changes to Gemfile.lock, as
+    # we have a "soft" approach to committing gemset changes until release, given
+    # updating the gemset lock files produces extremely large commits.
     command: |
-      # JRuby: Ensure files exist when Appraisal generates no output
-      mkdir gemfiles
-      touch gemfiles/_.gemfile.lock
-      cat Gemfile.lock gemfiles/*.gemfile.lock > .circleci/bundle_checksum
+      bundle lock # Create Gemfile.lock
+      cat Gemfile Appraisals gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
 step_run_all_tests: &step_run_all_tests
   run:
     name: Run tests
@@ -133,33 +176,38 @@ orbs:
     jobs:
       build:
         <<: *test_job_default
+        resource_class: <<parameters.resource_class_to_use>>
         steps:
           - checkout
           - restore_cache:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
+          - *step_compute_bundle_checksum
           - restore_cache:
               keys:
-                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "Appraisals" }}-{{ checksum "ddtrace.gemspec" }}
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
                 - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-
                 - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}
-          - *step_init_bundle_checksum
-          - restore_cache:
-              keys:
-                - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
+          - *check_exact_bundle_cache_hit
           - *step_bundle_install
-          - *step_appraisal_install
-          - *step_compute_bundle_checksum
+          - when:
+              condition:
+                equal: [ << parameters.edge >>, true ]
+              steps:
+                - *step_appraisal_update # Run on latest version of all gems we integrate with
+          - when:
+              condition:
+                not:
+                  equal: [ << parameters.edge >>, true ]
+              steps:
+                - *step_appraisal_install # Run on a stable set of gems we integrate with
+          - *save_bundle_checksum
           - save_cache:
               key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
               paths:
                 - /app
           - save_cache:
-              key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
-              paths:
-                - /usr/local/bundle
-          - save_cache:
-              key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum "Gemfile" }}-{{ checksum "Appraisals" }}-{{ checksum "ddtrace.gemspec" }}-{{ checksum ".circleci/bundle_checksum" }}'
+              key: bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
               paths:
                 - /usr/local/bundle
       build_and_test_integration:
@@ -209,7 +257,7 @@ orbs:
                 - '{{ .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" }}'
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - run:
               name: Set coverage report directory
               command: |
@@ -252,7 +300,7 @@ orbs:
                 - '{{ .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" }}'
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - run:
               name: Run Benchmark
               command: bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
@@ -267,7 +315,7 @@ orbs:
                 - '{{ .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" }}'
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - *step_rubocop
       coverage:
         <<: *test_job_default
@@ -277,7 +325,7 @@ orbs:
                 - '{{ .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" }}'
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - attach_workspace:
               at: /tmp/workspace
           - run:
@@ -300,7 +348,7 @@ orbs:
                 - '{{ .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" }}'
+                - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-<<parameters.ruby_version>>-{{ checksum "lib/ddtrace/version.rb" }}-{{ .Branch }}-{{ checksum ".circleci/bundle_checksum" }}
           - attach_workspace:
               at: /tmp/workspace
           - run:
@@ -338,7 +386,7 @@ jobs:
     docker:
       - environment:
           *container_base_environment
-        image: marcotc/docker-library:ddtrace_rb_2_5_6
+        image: ivoanjo/docker-library:ddtrace_rb_2_5_9
     steps:
       - checkout
       - run:
@@ -359,7 +407,7 @@ jobs:
     docker:
       - environment:
           *container_base_environment
-        image: marcotc/docker-library:ddtrace_rb_2_5_6
+        image: ivoanjo/docker-library:ddtrace_rb_2_5_9
     steps:
       - run:
           name: Check if this commit author has publishing credentials
@@ -384,60 +432,69 @@ jobs:
             echo PRE=$PRE
             sed lib/ddtrace/version.rb -i -e "s/^\([\t ]*PRE\) *=*/\1 = \'${PRE}\' #/g"
       - run:
-          name: Upload prereleas Gem and rebuild index
-          command: S3_DIR=prerelease bundle exec rake release:gem
+          name: Upload prerelease Gem and rebuild index
+          # This was bumped from prerelease to prerelease-v2 to avoid the issue documented in
+          # https://github.com/DataDog/dd-trace-rb/pull/1358
+          command: S3_DIR=prerelease-v2 bundle exec rake release:gem
       - store_artifacts:
           path: pkg/
           destination: gem
 
 job_configuration:
   # MRI
-  - &config-2_0
-    <<: *filters_all_branches_and_tags
-    ruby_version: '2.0'
-    image: palazzem/docker-library:ddtrace_rb_2_0_0
   - &config-2_1
     <<: *filters_all_branches_and_tags
     ruby_version: '2.1'
-    image: palazzem/docker-library:ddtrace_rb_2_1_10
+    image: ivoanjo/docker-library:ddtrace_rb_2_1_10
   - &config-2_2
     <<: *filters_all_branches_and_tags
     ruby_version: '2.2'
-    image: palazzem/docker-library:ddtrace_rb_2_2_10
+    image: ivoanjo/docker-library:ddtrace_rb_2_2_10
   - &config-2_3
     <<: *filters_all_branches_and_tags
     ruby_version: '2.3'
-    image: palazzem/docker-library:ddtrace_rb_2_3_8
+    image: ivoanjo/docker-library:ddtrace_rb_2_3_8
   - &config-2_4
     <<: *filters_all_branches_and_tags
     ruby_version: '2.4'
-    image: palazzem/docker-library:ddtrace_rb_2_4_6
+    image: ivoanjo/docker-library:ddtrace_rb_2_4_10
   - &config-2_5
     <<: *filters_all_branches_and_tags
     ruby_version: '2.5'
-    image: marcotc/docker-library:ddtrace_rb_2_5_6
+    image: ivoanjo/docker-library:ddtrace_rb_2_5_9
   - &config-2_6
     <<: *filters_all_branches_and_tags
     ruby_version: '2.6'
-    image: marcotc/docker-library:ddtrace_rb_2_6_4
+    image: ivoanjo/docker-library:ddtrace_rb_2_6_7
   - &config-2_7
     <<: *filters_all_branches_and_tags
     ruby_version: '2.7'
-    image: marcotc/docker-library:ddtrace_rb_2_7_0
+    image: ivoanjo/docker-library:ddtrace_rb_2_7_3
   - &config-3_0
     <<: *filters_all_branches_and_tags
     ruby_version: '3.0'
-    image: marcotc/docker-library:ddtrace_rb_3.0.0
+    image: ivoanjo/docker-library:ddtrace_rb_3_0_1
   - &config-3_0-jit
     <<: *filters_all_branches_and_tags
     ruby_version: '3.0'
-    image: marcotc/docker-library:ddtrace_rb_3.0.0
+    image: ivoanjo/docker-library:ddtrace_rb_3_0_1
     jit: true
   # JRuby
-  - &config-jruby-9_2
+  - &config-jruby-9_2_0_0 # Oldest supported version
     <<: *filters_all_branches_and_tags
-    ruby_version: 'jruby-9.2'
-    image: marcotc/docker-library:ddtrace_rb_jruby_9_2
+    ruby_version: 'jruby-9.2.0.0'
+    image: ivoanjo/docker-library:ddtrace_rb_jruby_9_2_0_0
+    resource_class_to_use: medium+
+  - &config-jruby-9_2-latest # More recent release of 9.2
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'jruby-9.2-latest'
+    image: ivoanjo/docker-library:ddtrace_rb_jruby_9_2_18_0
+  # TruffleRuby
+  - &config-truffleruby-21_0_0
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'truffleruby-21.0.0'
+    image: ivoanjo/docker-library:ddtrace_rb_truffleruby_21_0_0
+    resource_class_to_use: medium+
 
 workflows:
   version: 2
@@ -452,7 +509,6 @@ workflows:
           <<: *config-2_7
           name: coverage
           requires:
-            - test-2.0
             - test-2.1
             - test-2.2
             - test-2.3
@@ -461,7 +517,9 @@ workflows:
             - test-2.6
             - test-2.7
             - test-3.0
-            - test-jruby-9.2
+            - test-jruby-9.2.0.0
+            - test-jruby-9.2-latest
+            # soon™️ - test-truffleruby-21.0.0
       - orb/changelog:
           <<: *config-2_7
           name: changelog
@@ -471,44 +529,39 @@ workflows:
             branches:
               only: /bump_to_version_.*/
       # Integration
-      - orb/build_and_test_integration:
-          name: build_and_test_integration-2.0
-          integration_apps: 'ruby rack'
-          ruby_version: '2.0'
-          <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.1
-          integration_apps: 'ruby rack'
+          integration_apps: 'ruby rack rspec'
           ruby_version: '2.1'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.2
-          integration_apps: 'ruby rack'
+          integration_apps: 'ruby rack rspec'
           ruby_version: '2.2'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.3
-          integration_apps: 'ruby rack rails-five'
+          integration_apps: 'ruby rack rails-five rspec'
           ruby_version: '2.3'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.4
-          integration_apps: 'ruby rack rails-five'
+          integration_apps: 'ruby rack rails-five rspec'
           ruby_version: '2.4'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.5
-          integration_apps: 'ruby rack rails-five'
+          integration_apps: 'ruby rack rails-five rspec'
           ruby_version: '2.5'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.6
-          integration_apps: 'ruby rack rails-five'
+          integration_apps: 'ruby rack rails-five rspec'
           ruby_version: '2.6'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
           name: build_and_test_integration-2.7
-          integration_apps: 'ruby rack rails-five'
+          integration_apps: 'ruby rack rails-five rspec'
           ruby_version: '2.7'
           <<: *filters_all_branches_and_tags
       - orb/build_and_test_integration:
@@ -518,14 +571,6 @@ workflows:
           ruby_version: '3.0'
           <<: *filters_all_branches_and_tags
       # MRI
-      - orb/build:
-          <<: *config-2_0
-          name: build-2.0
-      - orb/test:
-          <<: *config-2_0
-          name: test-2.0
-          requires:
-            - build-2.0
       - orb/build:
           <<: *config-2_1
           name: build-2.1
@@ -605,19 +650,36 @@ workflows:
             - build-3.0-jit
       # JRuby
       - orb/build:
-          <<: *config-jruby-9_2
-          name: build-jruby-9.2
+          <<: *config-jruby-9_2_0_0
+          name: build-jruby-9.2.0.0
       - orb/test:
-          <<: *config-jruby-9_2
-          name: test-jruby-9.2
+          <<: *config-jruby-9_2_0_0
+          name: test-jruby-9.2.0.0
           requires:
-            - build-jruby-9.2
+            - build-jruby-9.2.0.0
+      - orb/build:
+          <<: *config-jruby-9_2-latest
+          name: build-jruby-9.2-latest
+      - orb/test:
+          <<: *config-jruby-9_2-latest
+          name: test-jruby-9.2-latest
+          requires:
+            - build-jruby-9.2-latest
+      # TruffleRuby
+      # soon™️
+      # - orb/build:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: build-truffleruby-21.0.0
+      # - orb/test:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: test-truffleruby-21.0.0
+      #     requires:
+      #       - build-truffleruby-21.0.0
       # Release jobs
       - "deploy prerelease Gem":
           <<: *filters_all_branches_and_tags
           requires:
             - lint
-            - test-2.0
             - test-2.1
             - test-2.2
             - test-2.3
@@ -627,12 +689,13 @@ workflows:
             - test-2.7
             - test-3.0
             - test-3.0-jit
-            - test-jruby-9.2
+            - test-jruby-9.2.0.0
+            - test-jruby-9.2-latest
+            # soon™️ - test-truffleruby-21.0.0
       - "deploy release":
           <<: *filters_only_release_tags
           requires:
             - lint
-            - test-2.0
             - test-2.1
             - test-2.2
             - test-2.3
@@ -642,4 +705,165 @@ workflows:
             - test-2.7
             - test-3.0
             - test-3.0-jit
-            - test-jruby-9.2
+            - test-jruby-9.2.0.0
+            - test-jruby-9.2-latest
+            # soon™️ - test-truffleruby-21.0.0
+  # This workflow runs the same `build` and `test` jobs as above on a schedule.
+  # Tasks related to housekeeping (e.g. prerelease) are not relevant
+  # to this daily check, as they are not expected to be impacted here.
+  edge:
+    triggers:
+      - schedule:
+          cron: "0 0 * * 1-5" # Every weekday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      # Integration
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.1
+          integration_apps: 'ruby rack rspec'
+          ruby_version: '2.1'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.2
+          integration_apps: 'ruby rack rspec'
+          ruby_version: '2.2'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.3
+          integration_apps: 'ruby rack rails-five rspec'
+          ruby_version: '2.3'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.4
+          integration_apps: 'ruby rack rails-five rspec'
+          ruby_version: '2.4'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.5
+          integration_apps: 'ruby rack rails-five rspec'
+          ruby_version: '2.5'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.6
+          integration_apps: 'ruby rack rails-five rspec'
+          ruby_version: '2.6'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.7
+          integration_apps: 'ruby rack rails-five rspec'
+          ruby_version: '2.7'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-3.0
+          # TODO: Get Rack & Rails apps working with Ruby 3.0
+          integration_apps: 'ruby'
+          ruby_version: '3.0'
+          <<: *filters_all_branches_and_tags
+      # MRI
+      - orb/build:
+          <<: *config-2_1
+          name: build-2.1
+      - orb/test:
+          <<: *config-2_1
+          name: test-2.1
+          requires:
+            - build-2.1
+      - orb/build:
+          <<: *config-2_2
+          name: build-2.2
+      - orb/test:
+          <<: *config-2_2
+          name: test-2.2
+          requires:
+            - build-2.2
+      - orb/build:
+          <<: *config-2_3
+          name: build-2.3
+      - orb/test:
+          <<: *config-2_3
+          name: test-2.3
+          requires:
+            - build-2.3
+      - orb/benchmark:
+          <<: *config-2_3
+          name: benchmark-2.3
+          requires:
+            - build-2.3
+      - orb/build:
+          <<: *config-2_4
+          name: build-2.4
+      - orb/test:
+          <<: *config-2_4
+          name: test-2.4
+          requires:
+            - build-2.4
+      - orb/build:
+          <<: *config-2_5
+          name: build-2.5
+      - orb/test:
+          <<: *config-2_5
+          name: test-2.5
+          requires:
+            - build-2.5
+      - orb/build:
+          <<: *config-2_6
+          name: build-2.6
+      - orb/test:
+          <<: *config-2_6
+          name: test-2.6
+          requires:
+            - build-2.6
+      - orb/build:
+          <<: *config-2_7
+          name: build-2.7
+      - orb/test:
+          <<: *config-2_7
+          name: test-2.7
+          requires:
+            - build-2.7
+      - orb/build:
+          <<: *config-3_0
+          name: build-3.0
+      - orb/test:
+          <<: *config-3_0
+          name: test-3.0
+          requires:
+            - build-3.0
+      - orb/build:
+          <<: *config-3_0-jit
+          name: build-3.0-jit
+      - orb/test:
+          <<: *config-3_0-jit
+          name: test-3.0-jit
+          requires:
+            - build-3.0-jit
+      # JRuby
+      - orb/build:
+          <<: *config-jruby-9_2_0_0
+          name: build-jruby-9.2.0.0
+      - orb/test:
+          <<: *config-jruby-9_2_0_0
+          name: test-jruby-9.2.0.0
+          requires:
+            - build-jruby-9.2.0.0
+      - orb/build:
+          <<: *config-jruby-9_2-latest
+          name: build-jruby-9.2-latest
+      - orb/test:
+          <<: *config-jruby-9_2-latest
+          name: test-jruby-9.2-latest
+          requires:
+            - build-jruby-9.2-latest
+      # TruffleRuby
+      # soon™️
+      # - orb/build:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: build-truffleruby-21.0.0
+      # - orb/test:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: test-truffleruby-21.0.0
+      #     requires:
+      #       - build-truffleruby-21.0.0