ddtrace 0.41.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bbda933f09b8f29d20edc57d6825f6491158161b7e5164252deb006931e0e7d
-  data.tar.gz: b3aaa6718e835fbfe97db64faa62f82b2f3ff76aefadb53cb27fb9b236b842e3
+  metadata.gz: 765c02ea39ee5565a83c8b818f27c7dae9c4bc1a0f0dfeed188484e726b80d8a
+  data.tar.gz: 64abc2a7449f61b4f6b121a8ca3f9e4fc2a3a515842ed737d57b5441ab631300
 SHA512:
-  metadata.gz: 60d239de8c63091ede6a810127ad580629428b96181982cf543e77f45a89087dfdd238b98418fe72f0e27ebefae6d5f730208c5f6149541dfe1d1c6923579826
-  data.tar.gz: 1d3657bc28458d0b50d0c2c68d3397b20ef6b2d4c2a0adf2ec834f701fd2c7701bcdac7f6fbce913743482e5eb2492a6409baf7c9c37c3467677ead705fd752e
+  metadata.gz: 3b4b88acb48e5a1cf9b6f52280d06ecc8d1ab0b1ba3e09c1649d4b5e42a2d2fac9056be0d4c339c4fac3bc944401b2e142a6f4f99f01e16d6c3f9f52cce6b305
+  data.tar.gz: 5564b83b67f0b0ae9df7b93f038b4e25fe53de21aea237695b0522e6af06eb22cd957444ab8d05c7d9b4a597676ece5fa6da7cb9a5080a0f372056b6927d1596

data/.circleci/config.yml

@@ -2,41 +2,78 @@ 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
 
 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
+  - &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
+      *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
     image: prestosql/presto
+  - &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:
@@ -68,7 +105,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
@@ -88,41 +131,13 @@ filters_only_release_tags: &filters_only_release_tags
 orbs:
   orb:
     jobs:
-      checkout:
-        <<: *job_defaults
-        parameters:
-          ruby_version:
-            description: Ruby version
-            type: string
-          image:
-            description: Docker image location
-            type: string
-        docker:
-          - <<: *container_base
-            image: <<parameters.image>>
-        steps:
-          - checkout
-          - save_cache:
-              key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
-              paths:
-                - /app
       build:
-        <<: *job_defaults
-        parameters:
-          ruby_version:
-            description: Ruby version
-            type: string
-          image:
-            description: Docker image location
-            type: string
-        docker:
-          - <<: *container_base
-            image: <<parameters.image>>
+        <<: *test_job_default
         steps:
+          - checkout
           - restore_cache:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
-                - '{{ .Environment.CIRCLE_CACHE_VERSION }}-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" }}
@@ -147,22 +162,38 @@ 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
-      test:
-        <<: *job_defaults
+      build_and_test_integration:
+        executor: docker-integration
         parameters:
           ruby_version:
             description: Ruby version
             type: string
-          image:
-            description: Docker image location
+          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
-            image: <<parameters.image>>
-            environment:
-              - BUNDLE_GEMFILE: /app/Gemfile
-              - TEST_DATADOG_INTEGRATION: 1
-              - COVERAGE_BASE_DIR: coverage
           - *container_postgres
           - *container_presto
           - *container_mysql
@@ -184,26 +215,34 @@ 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:
                 - coverage
       benchmark:
-        <<: *job_defaults
-        parameters:
-          ruby_version:
-            description: Ruby version
-            type: string
-          image:
-            description: Docker image location
-            type: string
+        <<: *test_job_default
         docker:
           - <<: *container_base
-            image: <<parameters.image>>
-            environment:
-              - BUNDLE_GEMFILE: /app/Gemfile
-              - TEST_DATADOG_INTEGRATION: 1
           - *container_postgres
           - *container_redis
           - *container_agent
@@ -221,19 +260,7 @@ orbs:
               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:
-        <<: *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
+        <<: *test_job_default
         steps:
           - restore_cache:
               keys:
@@ -243,19 +270,7 @@ orbs:
                 - '{{ .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
+        <<: *test_job_default
         steps:
           - restore_cache:
               keys:
@@ -265,6 +280,9 @@ orbs:
                 - '{{ .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
@@ -274,14 +292,52 @@ orbs:
           - 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
 
 jobs:
   "deploy release":
     <<: *job_defaults
     docker:
-      - <<: *container_base
+      - environment:
+          *container_base_environment
         image: marcotc/docker-library:ddtrace_rb_2_5_6
     steps:
       - checkout
@@ -301,7 +357,8 @@ jobs:
   "deploy prerelease Gem":
     <<: *job_defaults
     docker:
-      - <<: *container_base
+      - environment:
+          *container_base_environment
         image: marcotc/docker-library:ddtrace_rb_2_5_6
     steps:
       - run:
@@ -367,6 +424,15 @@ job_configuration:
     <<: *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
     <<: *filters_all_branches_and_tags
@@ -394,55 +460,91 @@ workflows:
             - test-2.5
             - test-2.6
             - test-2.7
+            - test-3.0
             - test-jruby-9.2
+      - orb/changelog:
+          <<: *config-2_7
+          name: changelog
+          requires:
+            - 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/checkout:
-          <<: *config-2_0
-          name: checkout-2.0
       - orb/build:
           <<: *config-2_0
           name: build-2.0
-          requires:
-            - checkout-2.0
       - orb/test:
           <<: *config-2_0
           name: test-2.0
           requires:
             - build-2.0
-      - orb/checkout:
-          <<: *config-2_1
-          name: checkout-2.1
       - orb/build:
           <<: *config-2_1
           name: build-2.1
-          requires:
-            - checkout-2.1
       - orb/test:
           <<: *config-2_1
           name: test-2.1
           requires:
             - build-2.1
-      - orb/checkout:
-          <<: *config-2_2
-          name: checkout-2.2
       - orb/build:
           <<: *config-2_2
           name: build-2.2
-          requires:
-            - checkout-2.2
       - orb/test:
           <<: *config-2_2
           name: test-2.2
           requires:
             - build-2.2
-      - orb/checkout:
-          <<: *config-2_3
-          name: checkout-2.3
       - orb/build:
           <<: *config-2_3
           name: build-2.3
-          requires:
-            - checkout-2.3
       - orb/test:
           <<: *config-2_3
           name: test-2.3
@@ -453,67 +555,58 @@ workflows:
           name: benchmark-2.3
           requires:
             - build-2.3
-      - orb/checkout:
-          <<: *config-2_4
-          name: checkout-2.4
       - orb/build:
           <<: *config-2_4
           name: build-2.4
-          requires:
-            - checkout-2.4
       - orb/test:
           <<: *config-2_4
           name: test-2.4
           requires:
             - build-2.4
-      - orb/checkout:
-          <<: *config-2_5
-          name: checkout-2.5
       - orb/build:
           <<: *config-2_5
           name: build-2.5
-          requires:
-            - checkout-2.5
       - orb/test:
           <<: *config-2_5
           name: test-2.5
           requires:
             - build-2.5
-      - orb/checkout:
-          <<: *config-2_6
-          name: checkout-2.6
       - orb/build:
           <<: *config-2_6
           name: build-2.6
-          requires:
-            - checkout-2.6
       - orb/test:
           <<: *config-2_6
           name: test-2.6
           requires:
             - build-2.6
-      - orb/checkout:
-          <<: *config-2_7
-          name: checkout-2.7
       - orb/build:
           <<: *config-2_7
           name: build-2.7
-          requires:
-            - checkout-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/checkout:
-          <<: *config-jruby-9_2
-          name: checkout-jruby-9.2
       - orb/build:
           <<: *config-jruby-9_2
           name: build-jruby-9.2
-          requires:
-            - checkout-jruby-9.2
       - orb/test:
           <<: *config-jruby-9_2
           name: test-jruby-9.2
@@ -532,6 +625,8 @@ workflows:
             - test-2.5
             - test-2.6
             - test-2.7
+            - test-3.0
+            - test-3.0-jit
             - test-jruby-9.2
       - "deploy release":
           <<: *filters_only_release_tags
@@ -545,4 +640,6 @@ workflows:
             - test-2.5
             - test-2.6
             - test-2.7
+            - test-3.0
+            - test-3.0-jit
             - test-jruby-9.2