ddtrace 0.30.1 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c36cc86fbd0beff70a42059214a0c60c616bd67b
-  data.tar.gz: 0b760d9c734d4945d607ee0ad63032d9b703eec3
+SHA256:
+  metadata.gz: e3ff39e24ac076f66cf5a897a58dd8bed004f510dca8e62229c875f7c15672ef
+  data.tar.gz: 0dc0267a78bb5a6d8da71b812369583118bb3abafcb6cd0e2d23be46570d28a6
 SHA512:
-  metadata.gz: b63c248f6f431dd430b0f51e5668e8bade6d0b1c2e30adf2f7ba1f4ee667038c1ca6ef62aa806ee5a898600ebf77d55624d26bc9144f0fbcb9602292dc2afa3c
-  data.tar.gz: 49c3a9e7442fd8835ad2124f5f1943429911da62671fda5d691d866ea6314856bd892f8841071823d71954802c4fdec7919a20f84653c583cd65f7a43c135324
+  metadata.gz: b0496e43acdce8830ffba4307903cedea2a48280759a6ef76fd33d8859422e2a8f33bdb39f17a9e744d0cfa357c46c9721e03def039f39f19d003f9e43a68154
+  data.tar.gz: e315219947b6cdf7f025205685e50be08098348fd0e9dfb077e19b81053c370e87d859c1ef455364786e58b330a17b02b76b78b7a660dbd4d8b4912c51c67927

data/.circleci/config.yml

@@ -120,6 +120,11 @@ orbs:
               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" }}
+                - 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:
@@ -139,6 +144,10 @@ orbs:
               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
       test:
         <<: *job_defaults
         parameters:
@@ -286,6 +295,10 @@ job_configuration:
     <<: *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
 
 workflows:
   version: 2
@@ -388,6 +401,19 @@ workflows:
           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
       - "deploy prerelease Gem":
           <<: *filters_all_branches_and_tags
           requires:
@@ -398,6 +424,7 @@ workflows:
             - test-2.4
             - test-2.5
             - test-2.6
+            - test-2.7
       - "deploy release":
           <<: *filters_only_release_tags
           requires:
@@ -408,3 +435,4 @@ workflows:
             - test-2.4
             - test-2.5
             - test-2.6
+            - test-2.7

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

@@ -0,0 +1,73 @@
+# Current version: https://github.com/docker-library/ruby/blob/defb10adcd6dd2178be3cd9c884fd035b52d42fb/2.7/buster/Dockerfile
+FROM ruby:2.7.0
+
+# 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 # Upgrading disabled until https://github.com/thoughtbot/appraisal/issues/162 is fixed
+RUN mkdir -p "$GEM_HOME" && chmod -R 777 "$GEM_HOME"
+
+# Upgrade RubyGems and Bundler # Upgrading disabled until https://github.com/thoughtbot/appraisal/issues/162 is fixed
+# RUN gem update --system
+# RUN gem install bundler
+ENV BUNDLE_SILENCE_ROOT_WARNING 1
+
+RUN mkdir /app
+WORKDIR /app
+
+CMD ["/bin/sh"]

data/Appraisals

@@ -698,7 +698,8 @@ elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'typhoeus'
     end
   end
-elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
+elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
   if RUBY_PLATFORM != 'java'
     appraise 'rails5-mysql2' do
       gem 'rails', '~> 5.2.1'
@@ -804,5 +805,113 @@ elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'typhoeus'
     end
   end
-end
+elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
+  if RUBY_PLATFORM != 'java'
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.2.1'
+      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails5-postgres-redis-activesupport' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '~> 5.2.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails6-mysql2' do
+      gem 'rails', '~> 6.0.0'
+      gem 'mysql2', '< 0.6', platform: :ruby
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails6-postgres' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sprockets', '< 4'
+    end
 
+    appraise 'rails6-postgres-redis' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails6-postgres-redis-activesupport' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'rails6-postgres-sidekiq' do
+      gem 'rails', '~> 6.0.0'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+      gem 'sprockets', '< 4'
+    end
+
+    appraise 'contrib' do
+      gem 'actionpack'
+      gem 'actionview'
+      gem 'active_model_serializers', '>= 0.10.0'
+      gem 'activerecord'
+      gem 'aws-sdk'
+      gem 'concurrent-ruby'
+      gem 'dalli'
+      gem 'delayed_job'
+      gem 'delayed_job_active_record'
+      gem 'elasticsearch-transport'
+      gem 'ethon'
+      gem 'excon'
+      gem 'grape'
+      gem 'graphql'
+      # gem 'grpc' # Pending 2.7 support: https://github.com/grpc/grpc/issues/21514
+      gem 'hiredis'
+      gem 'mongo', '>= 2.8.0'
+      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'racecar', '>= 0.3.5'
+      gem 'rack'
+      gem 'rack-test'
+      gem 'rake', '>= 12.3'
+      gem 'redis', '< 4.0'
+      gem 'rest-client'
+      gem 'resque', '< 2.0'
+      gem 'sequel'
+      gem 'shoryuken'
+      gem 'sidekiq'
+      gem 'sinatra'
+      gem 'sqlite3', '~> 1.4.1'
+      gem 'sucker_punch'
+      gem 'typhoeus'
+    end
+  end
+end

data/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## [Unreleased]
 
+## [0.31.0] - 2020-01-07
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.31.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.30.1...v0.31.0
+
+### Added
+
+- Ruby 2.7 support (#805, #896)
+- ActionCable integration (#132, #824) (@renchap, @ericmustin)
+- Faraday 1.0 support (#906)
+- Set resource for Rails template spans (#855, #881) (@djmb)
+- at_exit hook for graceful Tracer shutdown (#884)
+- Environment variables to configure RuleSampler defaults (#892)
+
+### Changed
+
+- Updated partial trace flushing to conform with new back-end requirements (#845)
+- Store numeric tags as metrics (#886)
+- Moved logging from Datadog::Tracer to Datadog::Logger (#880)
+- Changed default RuleSampler rate limit from unlimited to 100/s (#898)
+
+### Fixed
+
+- SyncWriter incompatibility with Transport::HTTP::Client (#903, #904) (@Yurokle)
+
+### Refactored
+
+- Improvements to test suite & CI (#815, #821, #841, #846, #883, #895)
+
 ## [0.30.1] - 2019-12-30
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.30.1
@@ -1012,7 +1042,9 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.30.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...master
+[0.31.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.30.1...v0.31.0
+[0.30.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.30.0...v0.30.1
 [0.30.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.29.1...v0.30.0
 [0.29.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.29.0...v0.29.1
 [0.29.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.28.0...v0.29.0

data/Rakefile

@@ -54,6 +54,7 @@ namespace :spec do
   end
 
   [
+    :action_cable,
     :action_pack,
     :action_view,
     :active_model_serializers,
@@ -519,12 +520,15 @@ task :ci do
       sh 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
       sh 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
       # Rails specs
+      sh 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
+      sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
       sh 'bundle exec appraisal rails6-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails6-postgres rake spec:rails'
     end
-  elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION)
+  elsif Gem::Version.new('2.6.0') <= Gem::Version.new(RUBY_VERSION) \
+      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
@@ -581,6 +585,70 @@ task :ci do
       sh 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
       sh 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
       # Rails specs
+      sh 'bundle exec appraisal rails5-mysql2 rake spec:action_cable'
+      sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails5-postgres rake spec:rails'
+      sh 'bundle exec appraisal rails6-mysql2 rake spec:action_cable'
+      sh 'bundle exec appraisal rails6-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails6-postgres rake spec:rails'
+    end
+  elsif Gem::Version.new('2.7.0') <= Gem::Version.new(RUBY_VERSION)
+    # Main library
+    sh 'bundle exec rake test:main'
+    sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
+    sh 'bundle exec rake spec:opentracer'
+
+    if RUBY_PLATFORM != 'java'
+      # Benchmarks
+      sh 'bundle exec rake benchmark'
+      # Contrib minitests
+      sh 'bundle exec appraisal contrib rake test:grape'
+      sh 'bundle exec appraisal contrib rake test:sidekiq'
+      sh 'bundle exec appraisal contrib rake test:sucker_punch'
+      # Contrib specs
+      sh 'bundle exec appraisal contrib rake spec:action_pack'
+      sh 'bundle exec appraisal contrib rake spec:action_view'
+      sh 'bundle exec appraisal contrib rake spec:active_model_serializers'
+      sh 'bundle exec appraisal contrib rake spec:active_record'
+      sh 'bundle exec appraisal contrib rake spec:active_support'
+      sh 'bundle exec appraisal contrib rake spec:aws'
+      sh 'bundle exec appraisal contrib rake spec:concurrent_ruby'
+      sh 'bundle exec appraisal contrib rake spec:dalli'
+      sh 'bundle exec appraisal contrib rake spec:delayed_job'
+      sh 'bundle exec appraisal contrib rake spec:elasticsearch'
+      sh 'bundle exec appraisal contrib rake spec:excon'
+      sh 'bundle exec appraisal contrib rake spec:faraday'
+      sh 'bundle exec appraisal contrib rake spec:graphql'
+      # sh 'bundle exec appraisal contrib rake spec:grpc' # Pending 2.7 support: https://github.com/grpc/grpc/issues/21514
+      sh 'bundle exec appraisal contrib rake spec:http'
+      sh 'bundle exec appraisal contrib rake spec:mongodb'
+      sh 'bundle exec appraisal contrib rake spec:mysql2'
+      sh 'bundle exec appraisal contrib rake spec:racecar'
+      sh 'bundle exec appraisal contrib rake spec:rack'
+      sh 'bundle exec appraisal contrib rake spec:rake'
+      sh 'bundle exec appraisal contrib rake spec:redis'
+      sh 'bundle exec appraisal contrib rake spec:resque'
+      sh 'bundle exec appraisal contrib rake spec:rest_client'
+      sh 'bundle exec appraisal contrib rake spec:sequel'
+      sh 'bundle exec appraisal contrib rake spec:shoryuken'
+      sh 'bundle exec appraisal contrib rake spec:sinatra'
+      sh 'bundle exec appraisal contrib rake spec:ethon'
+      # Rails minitests
+      # We only test Rails 5+ because older versions require Bundler < 2.0
+      sh 'bundle exec appraisal rails5-mysql2 rake test:rails'
+      sh 'bundle exec appraisal rails5-postgres rake test:rails'
+      sh 'bundle exec appraisal rails5-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake spec:railsdisableenv'
+      sh 'bundle exec appraisal rails6-mysql2 rake test:rails'
+      sh 'bundle exec appraisal rails6-postgres rake test:rails'
+      sh 'bundle exec appraisal rails6-postgres-redis rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-redis-activesupport rake spec:railsredis'
+      sh 'bundle exec appraisal rails6-postgres-sidekiq rake spec:railsactivejob'
+      sh 'bundle exec appraisal rails6-postgres rake spec:railsdisableenv'
+      # Rails specs
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
       sh 'bundle exec appraisal rails6-mysql2 rake spec:rails'

data/ddtrace.gemspec

@@ -46,6 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-collection_matchers', '~> 1.1'
   spec.add_development_dependency 'minitest', '= 5.10.1'
   spec.add_development_dependency 'appraisal', '~> 2.2'
+  spec.add_development_dependency 'bundler', '<= 2.1.2' # Remove when https://github.com/thoughtbot/appraisal/issues/162 is fixed
   spec.add_development_dependency 'yard', '~> 0.9'
   spec.add_development_dependency 'webmock', '~> 2.0'
   spec.add_development_dependency 'builder'

data/docker-compose.yml

@@ -196,6 +196,34 @@ services:
       - .:/app
       - bundle-2.6:/usr/local/bundle
       - gemfiles-2.6:/app/gemfiles
+  tracer-2.7:
+    image: marcotc/docker-library:ddtrace_rb_2_7_0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - BUNDLE_GEMFILE=/app/Gemfile
+      - DD_AGENT_HOST=ddagent
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_ELASTICSEARCH_HOST=elasticsearch
+      - TEST_MEMCACHED_HOST=memcached
+      - TEST_MONGODB_HOST=mongodb
+      - TEST_MYSQL_HOST=mysql
+      - TEST_POSTGRES_HOST=postgres
+      - TEST_REDIS_HOST=redis
+    stdin_open: true
+    tty: true
+    volumes:
+      - .:/app
+      - bundle-2.7:/usr/local/bundle
+      - gemfiles-2.7:/app/gemfiles
   ddagent:
     image: datadog/docker-dd-agent
     environment:
@@ -267,6 +295,7 @@ volumes:
   bundle-2.4:
   bundle-2.5:
   bundle-2.6:
+  bundle-2.7:
   gemfiles-2.0:
   gemfiles-2.1:
   gemfiles-2.2:
@@ -274,3 +303,4 @@ volumes:
   gemfiles-2.4:
   gemfiles-2.5:
   gemfiles-2.6:
+  gemfiles-2.7: