ddtrace 0.44.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bab61fb7855f2281cbaa808536cc7f7f6fe857657c49f91b532e6780c05187f
-  data.tar.gz: 463065e1f917522e19b2ace842cf117bfaf747b2e41e2bae405073080cf6f077
+  metadata.gz: 0e85a4cb4edf7f4d545f54faf32eb97183a88e66c6726317239bd9e1f152005d
+  data.tar.gz: b76468765ea5ba2202e5650d14f320cd6ca16456eed4c5b301bcec81018e70ce
 SHA512:
-  metadata.gz: 688c0fb395d61cb53609eb872f32eba8337c810d7d83d4751822e31487a34cf5322284f025b512bc3e7251369406b77467754aecf327403dcf0128fcfebbdfc6
-  data.tar.gz: a484ea8f729a3736209c8182ea729e7e2f9475eff4742d366f1824b8d50bf78ebd92d0eb4afbf0c6fc01e2bedcb0e553d11c246e2cbcfd299d64819e64902d99
+  metadata.gz: b3731205a2a8bbac1c1489154f3d48a1d120177f6e45f57cc0636b55c27c09552c0d9fc66b8220be648bb5ae4775e34515c0831c551cff13f9d4f7d5db6c648f
+  data.tar.gz: cbc68cfece89a9728770cd227a1184543c494c58669ba589c80523d497c57ecc3cf0ba1129b8699d5f7527483cf7d55764272f37b60277f4837e2be29a1c8c10

data/.circleci/config.yml

@@ -21,8 +21,17 @@ 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
   - &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 >>
@@ -43,28 +52,37 @@ test_containers:
       - POSTGRES_PASSWORD=postgres
       - POSTGRES_USER=postgres
       - 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
     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:
@@ -83,8 +101,27 @@ 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
+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
+ensure_lockfile_committed: &ensure_lockfile_committed
+  run:
+    name: Ensure Gem lock files are commited
+    command: |
+      CHANGED_FILES=$(git status gemfiles/ --porcelain)
+      if [[ $CHANGED_FILES ]]
+      then
+        >&2 echo "Gem lock files were modified or new lock files were created during"
+        >&2 echo "'bundle install' and 'bundle appraisal install' installation in CI."
+        >&2 echo "You need to check in those changes in your branch."
+        >&2 echo "Affected files:"
+        >&2 echo $CHANGED_FILES
+        >&2 GIT_PAGER=cat git diff HEAD
+        exit 1
+      fi
 step_compute_bundle_checksum: &step_compute_bundle_checksum
   run:
     name: Compute bundle checksum
@@ -96,7 +133,13 @@ step_compute_bundle_checksum: &step_compute_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
@@ -118,6 +161,7 @@ orbs:
     jobs:
       build:
         <<: *test_job_default
+        resource_class: <<parameters.resource_class_to_use>>
         steps:
           - checkout
           - restore_cache:
@@ -133,7 +177,18 @@ orbs:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
           - *step_bundle_install
-          - *step_appraisal_install
+          - 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
+                - *ensure_lockfile_committed
           - *step_compute_bundle_checksum
           - save_cache:
               key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
@@ -147,6 +202,34 @@ orbs:
               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:
@@ -172,7 +255,26 @@ orbs:
               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:
@@ -251,7 +353,24 @@ orbs:
                   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
 
 jobs:
   "deploy release":
@@ -305,8 +424,10 @@ 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
@@ -355,10 +476,20 @@ job_configuration:
     image: marcotc/docker-library:ddtrace_rb_3.0.0
     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: 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
@@ -382,7 +513,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
@@ -391,6 +524,53 @@ workflows:
           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
@@ -479,13 +659,31 @@ 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_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
-          name: test-jruby-9.2
+          <<: *config-jruby-9_2-latest
+          name: test-jruby-9.2-latest
           requires:
-            - build-jruby-9.2
+            - 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
@@ -501,7 +699,9 @@ 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:
@@ -516,4 +716,179 @@ 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.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
+          edge: true
+      - orb/test:
+          <<: *config-2_0
+          name: test-2.0
+          requires:
+            - build-2.0
+      - 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