ddtrace 0.43.0 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 71b7fdfa16924489a0ab33f4d34753fb4df23e38
-  data.tar.gz: 122e1f6d2f7ba41a82727052a9b5ea36121c4bff
+SHA256:
+  metadata.gz: 9bab61fb7855f2281cbaa808536cc7f7f6fe857657c49f91b532e6780c05187f
+  data.tar.gz: 463065e1f917522e19b2ace842cf117bfaf747b2e41e2bae405073080cf6f077
 SHA512:
-  metadata.gz: bbb7693da41ddbdedeaf7a6fbe4cbfd296e12636c39e4e1a81a30ed392e4b6ac57a10ab0654400373e3ff7150207d0fd511b95cd4367d811b2f58ed028d75187
-  data.tar.gz: e2450e8e4f411dcc36ba5548f1d24160571c801fb6ece09b8801e605149695f3f7a44217f8c05b059b82eb3e64c740cf10a9affb80ae39d2e1bb2b5739b4839f
+  metadata.gz: 688c0fb395d61cb53609eb872f32eba8337c810d7d83d4751822e31487a34cf5322284f025b512bc3e7251369406b77467754aecf327403dcf0128fcfebbdfc6
+  data.tar.gz: a484ea8f729a3736209c8182ea729e7e2f9475eff4742d366f1824b8d50bf78ebd92d0eb4afbf0c6fc01e2bedcb0e553d11c246e2cbcfd299d64819e64902d99

data/.circleci/config.yml

@@ -2,13 +2,41 @@ 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
+  - &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:
@@ -88,41 +116,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" }}
@@ -148,21 +148,9 @@ orbs:
               paths:
                 - /usr/local/bundle
       test:
-        <<: *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
-              - COVERAGE_BASE_DIR: coverage
           - *container_postgres
           - *container_presto
           - *container_mysql
@@ -190,20 +178,9 @@ orbs:
               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 +198,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 +208,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 +218,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,6 +230,26 @@ 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:
     executors:
 
@@ -281,7 +257,8 @@ 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 +278,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 +345,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 +381,44 @@ 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_.*/
       # 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 +429,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 +499,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 +514,6 @@ workflows:
             - test-2.5
             - test-2.6
             - test-2.7
+            - test-3.0
+            - test-3.0-jit
             - test-jruby-9.2

data/.circleci/images/primary/Dockerfile-3.0.0

@@ -0,0 +1,73 @@
+# https://hub.docker.com/layers/ruby/library/ruby/3.0.0/images/sha256-9719b7df964602b114a5e9319bd0a3ce2d4d44ccb7ea4d1702fa1ef9742a8f84
+FROM ruby@sha256:9719b7df964602b114a5e9319bd0a3ce2d4d44ccb7ea4d1702fa1ef9742a8f84
+
+# Make apt non-interactive
+RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90circleci \
+  && echo 'DPkg::Options "--force-confnew";' >> /etc/apt/apt.conf.d/90circleci
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install required packages
+RUN set -ex; \
+        apt-get update; \
+        mkdir -p /usr/share/man/man1; \
+        apt-get install -y --no-install-recommends \
+            git mercurial xvfb \
+            locales sudo openssh-client ca-certificates tar gzip parallel \
+            net-tools netcat unzip zip bzip2 gnupg curl wget \
+            tzdata rsync vim; \
+        rm -rf /var/lib/apt/lists/*;
+
+# Set timezone to UTC by default
+RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
+
+# Set language
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+
+# Install jq
+RUN JQ_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/jq-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/jq $JQ_URL \
+  && chmod +x /usr/bin/jq \
+  && jq --version
+
+# Install Docker
+RUN set -ex \
+  && export DOCKER_VERSION=$(curl --silent --fail --retry 3 https://download.docker.com/linux/static/stable/x86_64/ | grep -o -e 'docker-[.0-9]*-ce\.tgz' | sort -r | head -n 1) \
+  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/${DOCKER_VERSION}" \
+  && echo Docker URL: $DOCKER_URL \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/docker.tgz "${DOCKER_URL}" \
+  && ls -lha /tmp/docker.tgz \
+  && tar -xz -C /tmp -f /tmp/docker.tgz \
+  && mv /tmp/docker/* /usr/bin \
+  && rm -rf /tmp/docker /tmp/docker.tgz \
+  && which docker \
+  && (docker version || true)
+
+# Install Docker Compose
+RUN COMPOSE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/docker-compose-latest" \
+  && curl --silent --show-error --location --fail --retry 3 --output /usr/bin/docker-compose $COMPOSE_URL \
+  && chmod +x /usr/bin/docker-compose \
+  && docker-compose version
+
+# Install Dockerize
+RUN DOCKERIZE_URL="https://circle-downloads.s3.amazonaws.com/circleci-images/cache/linux-amd64/dockerize-latest.tar.gz" \
+  && curl --silent --show-error --location --fail --retry 3 --output /tmp/dockerize-linux-amd64.tar.gz $DOCKERIZE_URL \
+  && tar -C /usr/local/bin -xzvf /tmp/dockerize-linux-amd64.tar.gz \
+  && rm -rf /tmp/dockerize-linux-amd64.tar.gz \
+  && dockerize --version
+
+# Install RubyGems
+RUN gem update --system
+RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
+
+# Upgrade RubyGems and Bundler
+RUN gem update --system
+RUN gem install bundler
+ENV BUNDLE_SILENCE_ROOT_WARNING 1
+
+RUN mkdir /app
+WORKDIR /app
+
+CMD ["/bin/sh"]