ddtrace 0.13.0 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a89641ee85dac608c0c2a580dfd413c47505ffa
-  data.tar.gz: 4cff7490665c4e954cb82466e0e77eacdf9bce99
+  metadata.gz: 9cf1ef2c94e28df64fe5d26a43c3cfb1c31cc9be
+  data.tar.gz: a7daf78f76f691e785946f0e3f2763b424cd6127
 SHA512:
-  metadata.gz: 8580fbbf837c16cbbcfc4652bed1455796f4f710c47042c93f913eb5a1df9b95e7cf400f0fa15b573f9f9eb86468c37da73add7dc5cb00dfc41035f36a136772
-  data.tar.gz: e0c4b207097f1efbee93a08150c5a2ed32a9352f8a82531f2d5432396fc698726909896250b1f0e01ee3786743832cd7fa092135bbf83f98eede9d515736546c
+  metadata.gz: 3d4f7408c4ef0b587c3a078cb29b5165a43cbb03bb204b72d04a989de1567cd0ff9ae8c7c0649f6269a531a4041c156970fc0470c7f124b208f7a98435c942e8
+  data.tar.gz: a8e0484124bc54ef8c69e3af13f6f06e8b0070223a6316922e38d2df2d97004d306f3d205babfdfe876dad6f76c69ccfba77ffc5de58c7bb6fc441856f85df60

data/.circleci/config.yml

@@ -1,61 +1,84 @@
+version: 2.1
+
 # Common variables, containers, jobs and steps.
 job_defaults: &job_defaults
+  # TODO: We should move away from using a directory
+  # TODO: that requires root permission to be created.
+  # TODO: Changing this requires rebuilding all docker images.
   working_directory: /app
   shell: /bin/bash --login
 
-ruby_containers: &ruby_containers
-  - &container-1_9
-    image: datadog/docker-library:ddtrace_rb_1_9_3
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-  - &container-2_0
-    image: datadog/docker-library:ddtrace_rb_2_0_0
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-  - &container-2_1
-    image: datadog/docker-library:ddtrace_rb_2_1_10
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-  - &container-2_2
-    image: datadog/docker-library:ddtrace_rb_2_2_10
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-  - &container-2_3
-    image: datadog/docker-library:ddtrace_rb_2_3_7
-    environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-  - &container-2_4
-    image: datadog/docker-library:ddtrace_rb_2_4_4
+test_containers:
+  - &job_parameters
+    parameters:
+      ruby_version:
+        description: Ruby version
+        type: string
+      image:
+        description: Docker image location
+        type: string
+      jit:
+        description: Jit enabled?
+        type: boolean
+        default: false
+      resource_class_to_use:
+        description: Resource class to use
+        type: string
+        default: medium
+  - &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
+  - &container_parameters_environment
+    - *container_base_environment
+    - RUBY_OPT: <<# parameters.jit >>--jit<</ parameters.jit >>
+    - TEST_DATADOG_INTEGRATION: 1
+    - COVERAGE_BASE_DIR: coverage
+  - &container_base
+    image: <<parameters.image>>
     environment:
-      - BUNDLE_GEMFILE=/app/Gemfile
-
-test_containers: &test_containers
+      *container_parameters_environment
+  - &test_job_default
+    <<: *job_defaults
+    <<: *job_parameters
+    docker:
+      - *container_base
   - &container_postgres
     image: postgres:9.6
     environment:
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_USER=postgres
       - POSTGRES_DB=postgres
+  - &postgres_port 5432
+  - &container_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
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_PASSWORD=mysql
       - MYSQL_USER=mysql
+  - &mysql_port 3306
   - &container_elasticsearch
     image: elasticsearch:2.4
+  - &elasticsearch_port 9200
   - &container_redis
     image: redis:3.0
+  - &redis_port 6379
   - &container_mongo
     image: mongo:3.5
+  - &mongo_port 27017
   - &container_memcached
     image: memcached:1.5-alpine
+  - &memcached_port 11211
   - &container_agent
     image: datadog/docker-dd-agent
     environment:
       - DD_APM_ENABLED=true
       - DD_BIND_HOST=0.0.0.0
       - DD_API_KEY=invalid_key_but_this_is_fine
+  - &agent_port 8126
 
 step_init_bundle_checksum: &step_init_bundle_checksum
   run:
@@ -73,396 +96,590 @@ step_rubocop: &step_rubocop
 step_appraisal_install: &step_appraisal_install
   run:
     name: Install Appraisal gems
-    command: bundle exec appraisal install
+    command: |
+      bundle exec appraisal clean # Ensure we fetch the latest version of dependencies
+      bundle exec appraisal install
 step_compute_bundle_checksum: &step_compute_bundle_checksum
   run:
     name: Compute bundle checksum
     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
 step_run_all_tests: &step_run_all_tests
   run:
     name: Run tests
-    command: bundle exec rake ci
+    command: |
+        echo "
+        --format=progress
+        --format=RspecJunitFormatter
+        --out='/tmp/rspec/-<%= ARGV.join.gsub('/', '-') %>.xml'
+        " > .rspec-local # Configure RSpec metadata exporter
+        bundle exec rake ci
+step_release_docs: &step_release_docs
+  run:
+    name: Upload release docs
+    command: S3_DIR=trace bundle exec rake release:docs
+
+filters_all_branches_and_tags: &filters_all_branches_and_tags
+  filters:
+    tags:
+      only: /.*/
+filters_only_release_tags: &filters_only_release_tags
+  filters:
+    branches:
+      ignore: /.*/
+    tags:
+      only: /^v\d+(\.\d+){0,3}(\.(alpha|beta|rc)\d+)?$/
+
+orbs:
+  orb:
+    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 }}'
+          - 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 }}-
+                - 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" }}'
+          - *step_bundle_install
+          - *step_appraisal_install
+          - *step_compute_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" }}'
+              paths:
+                - /usr/local/bundle
+      build_and_test_integration:
+        executor: docker-integration
+        parameters:
+          ruby_version:
+            description: Ruby version
+            type: string
+          integration_apps:
+            description: Integration apps
+            type: string
+        steps:
+          - checkout
+          - setup_remote_docker:
+              docker_layer_caching: true
+          - run:
+              name: Build integration base images
+              command: ./integration/script/build-images -v <<parameters.ruby_version>>
+          - run:
+              name: Build integration app images
+              command: |
+                for i in <<parameters.integration_apps>>; do
+                  ./integration/apps/$i/script/build-images -v <<parameters.ruby_version>>
+                done
+          - run:
+              name: Test integration apps
+              command: |
+                for i in <<parameters.integration_apps>>; do
+                  ./integration/apps/$i/script/ci -v <<parameters.ruby_version>>
+                done
+      test:
+        <<: *test_job_default
+        docker:
+          - <<: *container_base
+          - *container_postgres
+          - *container_presto
+          - *container_mysql
+          - *container_elasticsearch
+          - *container_redis
+          - *container_mongo
+          - *container_memcached
+          - *container_agent
+        parallelism: 22
+        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" }}'
+          - 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
+          # Wait for containers to start
+          - docker-wait:
+              port: *postgres_port
+          - docker-wait:
+              port: *presto_port
+          - docker-wait:
+              port: *mysql_port
+          - docker-wait:
+              port: *elasticsearch_port
+          - docker-wait:
+              port: *redis_port
+          - docker-wait:
+              port: *mongo_port
+          - docker-wait:
+              port: *memcached_port
+          - docker-wait:
+              port: *agent_port
+          - *step_run_all_tests
+          - store_test_results:
+              path: /tmp/rspec
+          - persist_to_workspace:
+              root: .
+              paths:
+                - coverage
+      benchmark:
+        <<: *test_job_default
+        docker:
+          - <<: *container_base
+          - *container_postgres
+          - *container_redis
+          - *container_agent
+        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" }}'
+          - 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
+          - run:
+              name: Run Benchmark without ddtracer
+              command: rm -f lib/ddtrace.rb && bundle exec appraisal rails5-postgres-sidekiq ruby benchmarks/sidekiq_test.rb 2>&1 1> /dev/null | tee benchmark_results.csv
+      lint:
+        <<: *test_job_default
+        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" }}'
+          - *step_rubocop
+      coverage:
+        <<: *test_job_default
+        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: Install codecov
+              command: bundle add codecov
+          - 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
+      changelog:
+        <<: *test_job_default
+        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: Format changelog
+              command: bundle exec rake changelog:format
+          - run:
+              name: Check if changelog was unformatted
+              command: |
+                if ! git diff-files --quiet; then
+                  echo "Please run 'bundle exec rake changelog:format' and commit the results."
+                fi
+    commands:
+      docker-wait:
+        description: Wait for containers to listen on a TCP port.
+        parameters:
+          port:
+            description: TCP port the container is listening on.
+            type: integer
+          timeout:
+            description: How long to wait for the port to be responsive.
+            type: string
+            default: 1m
+        steps:
+          - run:
+              name: Wait for container on port <<parameters.port>>
+              command: dockerize -wait 'tcp://localhost:<<parameters.port>>' -timeout '<<parameters.timeout>>'
+    executors:
+      docker-integration:
+        docker:
+          - image: circleci/buildpack-deps:stretch
 
-version: 2.0
 jobs:
-  checkout-1.9:
-    <<: *job_defaults
-    docker:
-      - *container-1_9
-    steps:
-      - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-1.9:
-    <<: *job_defaults
-    docker:
-      - *container-1_9
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_bundle_install
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-1.9:
-    <<: *job_defaults
-    docker:
-      - <<: *container-1_9
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-1.9-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-1.9-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
-  checkout-2.0:
-    <<: *job_defaults
-    docker:
-      - *container-2_0
-    steps:
-      - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.0-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-2.0:
-    <<: *job_defaults
-    docker:
-      - *container-2_0
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.0-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.0-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.0-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_bundle_install
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.0-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.0-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-2.0:
-    <<: *job_defaults
-    docker:
-      - <<: *container-2_0
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.0-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.0-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
-  checkout-2.1:
-    <<: *job_defaults
-    docker:
-      - *container-2_1
-    steps:
-      - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.1-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-2.1:
-    <<: *job_defaults
-    docker:
-      - *container-2_1
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.1-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.1-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.1-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_bundle_install
-      - *step_rubocop
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.1-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.1-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-2.1:
-    <<: *job_defaults
-    docker:
-      - <<: *container-2_1
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.1-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.1-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
-  checkout-2.2:
+  "deploy release":
     <<: *job_defaults
     docker:
-      - *container-2_2
+      - environment:
+          *container_base_environment
+        image: marcotc/docker-library:ddtrace_rb_2_5_6
     steps:
       - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.2-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-2.2:
-    <<: *job_defaults
-    docker:
-      - *container-2_2
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.2-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.2-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.2-{{ checksum ".circleci/bundle_checksum" }}'
+      - run:
+          name: Install AWS CLI
+          command: |
+            apt-get -y -qq update
+            apt-get -y -qq install awscli
       - *step_bundle_install
-      - *step_rubocop
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.2-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.2-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-2.2:
-    <<: *job_defaults
-    docker:
-      - <<: *container-2_2
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.2-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.2-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
-  checkout-2.3:
+      - *step_release_docs
+      - run:
+          name: Upload release Gem and rebuild index
+          command: S3_DIR=release bundle exec rake release:gem
+      - store_artifacts:
+          path: pkg/
+          destination: gem
+  "deploy prerelease Gem":
     <<: *job_defaults
     docker:
-      - *container-2_3
+      - environment:
+          *container_base_environment
+        image: marcotc/docker-library:ddtrace_rb_2_5_6
     steps:
+      - run:
+          name: Check if this commit author has publishing credentials
+          command: |
+            if [[ -z "${AWS_ACCESS_KEY_ID}" ]]
+            then
+              echo 'No AWS credentials, skipping publish of pre-release build.'
+              circleci task halt
+            fi
       - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-2.3:
-    <<: *job_defaults
-    docker:
-      - *container-2_3
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.3-{{ checksum ".circleci/bundle_checksum" }}'
+      - run:
+          name: Install AWS CLI
+          command: |
+            apt-get -y -qq update
+            apt-get -y -qq install awscli
       - *step_bundle_install
-      - *step_rubocop
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.3-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-2.3:
-    <<: *job_defaults
-    docker:
-      - <<: *container-2_3
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.3-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.3-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
-  checkout-2.4:
-    <<: *job_defaults
-    docker:
-      - *container-2_4
-    steps:
-      - checkout
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.4-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-  build-2.4:
-    <<: *job_defaults
-    docker:
-      - *container-2_4
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.4-{{ .Environment.CIRCLE_SHA1 }}'
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-2.4-{{ .Environment.CIRCLE_SHA1 }}'
-      - *step_init_bundle_checksum
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_bundle_install
-      - *step_rubocop
-      - *step_appraisal_install
-      - *step_compute_bundle_checksum
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.4-{{ .Environment.CIRCLE_SHA1 }}'
-          paths:
-            - /app
-      - save_cache:
-          key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
-          paths:
-            - /usr/local/bundle
-  test-2.4:
-    <<: *job_defaults
-    docker:
-      - <<: *container-2_4
-        environment:
-          - TEST_DATADOG_INTEGRATION: 1
-      - *container_postgres
-      - *container_mysql
-      - *container_elasticsearch
-      - *container_redis
-      - *container_mongo
-      - *container_memcached
-      - *container_agent
-    steps:
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-2.4-{{ .Environment.CIRCLE_SHA1 }}'
-      - restore_cache:
-          keys:
-            - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
-      - *step_run_all_tests
+      - run:
+          name: Rename to pre-release version based on branch name and build number
+          command: |
+            # create safe version string
+            PRE=$(echo "${CIRCLE_BRANCH:-unknown}.${CIRCLE_BUILD_NUM:-R$RANDOM}" | sed -e 's/[^a-zA-Z0-9+]\{1,\}/./g')
+            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
+      - 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
+  - &config-2_2
+    <<: *filters_all_branches_and_tags
+    ruby_version: '2.2'
+    image: palazzem/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
+  - &config-2_4
+    <<: *filters_all_branches_and_tags
+    ruby_version: '2.4'
+    image: palazzem/docker-library:ddtrace_rb_2_4_6
+  - &config-2_5
+    <<: *filters_all_branches_and_tags
+    ruby_version: '2.5'
+    image: marcotc/docker-library:ddtrace_rb_2_5_6
+  - &config-2_6
+    <<: *filters_all_branches_and_tags
+    ruby_version: '2.6'
+    image: marcotc/docker-library:ddtrace_rb_2_6_4
+  - &config-2_7
+    <<: *filters_all_branches_and_tags
+    ruby_version: '2.7'
+    image: marcotc/docker-library:ddtrace_rb_2_7_0
+  - &config-3_0
+    <<: *filters_all_branches_and_tags
+    ruby_version: '3.0'
+    image: marcotc/docker-library:ddtrace_rb_3.0.0
+  - &config-3_0-jit
+    <<: *filters_all_branches_and_tags
+    ruby_version: '3.0'
+    image: marcotc/docker-library:ddtrace_rb_3.0.0
+    jit: true
+  # JRuby
+  - &config-jruby-9_2_0_0 # Oldest supported version
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'jruby-9.2.0.0'
+    image: marcotc/docker-library:ddtrace_rb_jruby_9_2_0_0
+  - &config-jruby-9_2-latest # More recent release of 9.2
+    <<: *filters_all_branches_and_tags
+    ruby_version: 'jruby-9.2-latest'
+    image: marcotc/docker-library:ddtrace_rb_jruby_9_2_11_1
+  # 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: large
+
 workflows:
   version: 2
   build-and-test:
     jobs:
-      - checkout-1.9
-      - build-1.9:
+      - orb/lint:
+          <<: *config-2_6
+          name: lint
           requires:
-            - checkout-1.9
-      - test-1.9:
+            - build-2.6
+      - orb/coverage:
+          <<: *config-2_7
+          name: coverage
           requires:
-            - build-1.9
-      - checkout-2.0
-      - build-2.0:
+            - 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-3.0
+            - test-jruby-9.2.0.0
+            - test-jruby-9.2-latest
+            # soon™️ - test-truffleruby-21.0.0
+      - orb/changelog:
+          <<: *config-2_7
+          name: changelog
           requires:
-            - checkout-2.0
-      - test-2.0:
+            - build-2.7
+          filters:
+            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'
+          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'
+          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'
+          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'
+          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'
+          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'
+          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'
+          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_0
+          name: build-2.0
+      - orb/test:
+          <<: *config-2_0
+          name: test-2.0
           requires:
             - build-2.0
-      - checkout-2.1
-      - build-2.1:
-          requires:
-            - checkout-2.1
-      - test-2.1:
+      - orb/build:
+          <<: *config-2_1
+          name: build-2.1
+      - orb/test:
+          <<: *config-2_1
+          name: test-2.1
           requires:
             - build-2.1
-      - checkout-2.2
-      - build-2.2:
-          requires:
-            - checkout-2.2
-      - test-2.2:
+      - orb/build:
+          <<: *config-2_2
+          name: build-2.2
+      - orb/test:
+          <<: *config-2_2
+          name: test-2.2
           requires:
             - build-2.2
-      - checkout-2.3
-      - build-2.3:
-          requires:
-            - checkout-2.3
-      - test-2.3:
+      - orb/build:
+          <<: *config-2_3
+          name: build-2.3
+      - orb/test:
+          <<: *config-2_3
+          name: test-2.3
           requires:
             - build-2.3
-      - checkout-2.4
-      - build-2.4:
+      - orb/benchmark:
+          <<: *config-2_3
+          name: benchmark-2.3
           requires:
-            - checkout-2.4
-      - test-2.4:
+            - 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
+      # Release jobs
+      - "deploy prerelease Gem":
+          <<: *filters_all_branches_and_tags
+          requires:
+            - lint
+            - 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-3.0
+            - test-3.0-jit
+            - 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
+            - test-2.4
+            - test-2.5
+            - test-2.6
+            - test-2.7
+            - test-3.0
+            - test-3.0-jit
+            - test-jruby-9.2.0.0
+            - test-jruby-9.2-latest
+            # soon™️ - test-truffleruby-21.0.0