ddtrace 0.14.1 → 0.14.2.disableprotocolversion4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: dd428e0433f158ee8b3a353082112f464f16e6f614c099c8bbe208540b736d63
-  data.tar.gz: 1cf0a646378f1d39ea248eca52e856116fef3aaab8bd8911560150b859ca8b58
+SHA1:
+  metadata.gz: 02a427d7e8055a2a9315d811ce0a7bf88073e4a2
+  data.tar.gz: 41e96cdfcad1fdd3ad5fc54f3d7f1d7dd297a3d0
 SHA512:
-  metadata.gz: dd019f7bc2e5eea75da991b6fe13ac4e914ba53fa7ed993364d53d57bb60ae2ac2003746fcd9389e1b376938ab1e889cfa68ce3887bafd06d16b12750676140a
-  data.tar.gz: 1db4b25d3366fd810459764760147005de0d2dd4370263d84d77bc00d2515c530794c5d5a9d2f8e816b751d960e6b70f265ee6f568da4c9ab4016df7b5a44e02
+  metadata.gz: 57e16b76584aa0a7a7d831b5a82840b3e9228451ce09ef3726a6b80c8a9b276e9a8e3c61d1b4a00d0cece893ddab4c7147a094c659916fc16941b804a72202a5
+  data.tar.gz: cc67284cb5cd1f62e728d84390c0dd5f6d352840a048622b2208d5ef9523631b85e050e8ec6e3f3a958e7705753ee0b249c5427db7c5b09731298274d4cf4cf5

data/.circleci/config.yml

@@ -401,7 +401,6 @@ jobs:
       - 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
-
   checkout-2.4:
     <<: *job_defaults
     docker:
@@ -458,6 +457,52 @@ jobs:
           keys:
             - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-2.4-{{ checksum ".circleci/bundle_checksum" }}'
       - *step_run_all_tests
+  
+  build-2.5:
+    <<: *job_defaults
+    working_directory: ~/app
+    docker: 
+      - &container-2_5
+          image: circleci/ruby:2.5.1
+    steps:
+      - checkout
+      - restore_cache: &cache-2_5
+          key: 'b1-{{ .Environment.CIRCLE_CACHE_VERSION }}-cache-2.5-{{ checksum Appraisals }}-{{ checksum ddtrace.gemspec }}-{{ checksum Gemfile }}'
+          paths:
+            - vendor/bundle
+            - gemfiles/
+            - Gemfile.lock
+      - run: &bundler_init
+          name: Initializing Bundler vendor path
+          command: bundle --path vendor/bundle      
+      - *step_bundle_install
+      - *step_appraisal_install
+      - save_cache: *cache-2_5
+      - *step_rubocop
+      - persist_to_workspace:
+          <<: *cache-2_5
+          root: '.'
+  test-2.5:
+    <<: *job_defaults
+    working_directory: ~/app
+    docker:
+      - <<: *container-2_5
+        environment:
+          - TEST_DATADOG_INTEGRATION: 1
+      - *container_postgres
+      - *container_mysql
+      - *container_elasticsearch
+      - *container_redis
+      - *container_mongo
+      - *container_memcached
+      - *container_agent
+    steps:
+      - checkout
+      - attach_workspace:
+          at: ~/app
+      - run: *bundler_init
+      - *step_run_all_tests
+
   deploy-release:
     <<: *job_defaults
     docker:
@@ -539,6 +584,11 @@ workflows:
           <<: *filters_all_branches_and_tags
           requires:
             - build-2.4
+      - build-2.5: *filters_all_branches_and_tags
+      - test-2.5:
+          <<: *filters_all_branches_and_tags
+          requires:
+            - build-2.5            
       - deploy-release:
           <<: *filters_only_release_tags
           requires:
@@ -548,3 +598,4 @@ workflows:
             - test-2.2
             - test-2.3
             - test-2.4
+            - test-2.5

data/Appraisals

@@ -1,583 +1,265 @@
+require File.expand_path('tools/appraisal_helper', Dir.pwd)
+
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.3')
   raise NotImplementedError, 'Ruby versions < 1.9.3 are not supported!'
-elsif Gem::Version.new('1.9.3') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-      gem 'rake', '< 12.3'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client', '< 2.0'
-      gem 'resque', '< 2.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '4.0.0'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
-elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client'
-      gem 'resque', '< 2.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '4.0.0'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
-elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-    end
-
-    appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    end
-
-    appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-    end
-
-    appraise 'contrib-old' do
-      gem 'active_model_serializers', '~> 0.9.0'
-      gem 'activerecord', '3.2.22.5'
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'aws-sdk', '~> 2.0'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'rack', '1.4.7'
-      gem 'rack-cache', '1.7.1'
-      gem 'rack-test', '0.7.0'
-      gem 'rake', '< 12.3'
-      gem 'redis', '< 4.0'
-      gem 'rest-client'
-      gem 'resque', '< 2.0'
-      gem 'sequel', '~> 4.0', '< 4.37'
-      gem 'sidekiq', '4.0.0'
-      gem 'sinatra', '1.4.5'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
-elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
-
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-    end
+end
 
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal('rails30-postgres') do
+  gem 'test-unit'
+  gem 'rails', '3.0.20'
+  gem 'pg', '0.15.1', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-    end
+common_appraisal 'rails30-postgres-sidekiq' do
+  gem 'test-unit'
+  gem 'rails', '3.0.20'
+  gem 'pg', '0.15.1', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'sidekiq', '4.0.0'
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    end
+common_appraisal('contrib-old') do
+  gem 'active_model_serializers', '~> 0.9.0'
+  gem 'activerecord', '3.2.22.5'
+  gem 'activerecord-mysql-adapter', platform: :ruby
+  gem 'aws-sdk', '~> 2.0'
+  gem 'dalli'
+  gem 'delayed_job'
+  gem 'delayed_job_active_record'
+  gem 'elasticsearch-transport'
+  gem 'excon'
+  gem 'hiredis'
+  gem 'mongo', '< 2.5'
+  gem 'mysql2', '0.3.21', platform: :ruby
+  gem 'rack', '1.4.7'
+  gem 'rack-cache', '1.7.1'
+  gem 'rack-test', '0.7.0'
+  gem 'rake', '< 12.3'
+  gem 'redis', '< 4.0'
+  gem 'rest-client', '< 2.0'
+  gem 'resque', '< 2.0'
+  gem 'sequel', '~> 4.0', '< 4.37'
+  gem 'sidekiq', '4.0.0'
+  gem 'sinatra', '1.4.5'
+  gem 'sqlite3'
+  gem 'sucker_punch'
+end
 
-    appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-    end
+common_appraisal('contrib') do
+  gem 'active_model_serializers', '>= 0.10.0'
+  gem 'activerecord', '< 5.1.5'
+  gem 'aws-sdk'
+  gem 'dalli'
+  gem 'delayed_job'
+  gem 'delayed_job_active_record'
+  gem 'elasticsearch-transport'
+  gem 'excon'
+  gem 'grape'
+  gem 'graphql'
+  gem 'grpc'
+  gem 'hiredis'
+  gem 'mongo', '< 2.5'
+  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 'sidekiq'
+  gem 'sinatra'
+  gem 'sqlite3'
+  gem 'sucker_punch'
+end
 
-    appraise 'rails4-postgres-sidekiq' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq'
-      gem 'activejob'
-    end
+common_appraisal 'rails32-mysql2' do
+  gem 'test-unit'
+  gem 'rails', '3.2.22.5'
+  gem 'mysql2', '0.3.21', platform: :ruby
+  gem 'activerecord-mysql-adapter', platform: :ruby
+  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails5-mysql2' do
-      gem 'rails', '~> 5.1.6'
-      gem 'mysql2', '< 0.5', platform: :ruby
-    end
+common_appraisal 'rails32-postgres' do
+  gem 'test-unit'
+  gem 'rails', '3.2.22.5'
+  gem 'pg', '0.15.1', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails5-postgres' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-    end
+common_appraisal 'rails32-postgres-redis' do
+  gem 'test-unit'
+  gem 'rails', '3.2.22.5'
+  gem 'pg', '0.15.1', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'redis-rails'
+  gem 'redis', '< 4.0'
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails5-postgres-redis' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
-    end
+common_appraisal 'rails32-postgres-sidekiq' do
+  gem 'test-unit'
+  gem 'rails', '3.2.22.5'
+  gem 'pg', '0.15.1', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'sidekiq', '4.0.0'
+  gem 'rack-cache', '1.7.1'
+end
 
-    appraise 'rails5-postgres-sidekiq' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'sidekiq'
-      gem 'activejob'
-    end
+common_appraisal 'rails4-mysql2' do |version|
+  gem 'rails', version.fetch(:rails, '4.2.7.1')
+  gem 'mysql2', '< 0.5', platform: :ruby
+  gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+end
 
-    appraise 'contrib' do
-      gem 'active_model_serializers', '>= 0.10.0'
-      gem 'activerecord', '< 5.1.5'
-      gem 'aws-sdk'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'grape'
-      gem 'graphql'
-      gem 'grpc'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      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 'sidekiq'
-      gem 'sinatra'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
-elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
-      && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4.0')
-  if RUBY_PLATFORM != 'java'
-    appraise 'rails30-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails4-postgres' do |version|
+  gem 'rails', version.fetch(:rails, '4.2.7.1')
+  gem 'pg', '< 1.0', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+end
 
-    appraise 'rails30-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.0.20'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails4-postgres-redis' do |version|
+  gem 'rails', version.fetch(:rails, '4.2.7.1')
+  gem 'pg', '< 1.0', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'redis-rails'
+  gem 'redis', '< 4.0'
+end
 
-    appraise 'rails32-mysql2' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'mysql2', '0.3.21', platform: :ruby
-      gem 'activerecord-mysql-adapter', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails4-postgres-sidekiq' do |version|
+  gem 'rails', version.fetch(:rails, '4.2.7.1')
+  gem 'pg', '< 1.0', platform: :ruby
+  gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+  gem 'sidekiq'
+  gem 'activejob'
+end
 
-    appraise 'rails32-postgres' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails5-mysql2' do
+  gem 'rails', '~> 5.1.6'
+  gem 'mysql2', '< 0.5', platform: :ruby
+end
 
-    appraise 'rails32-postgres-redis' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails5-postgres' do
+  gem 'rails', '~> 5.1.6'
+  gem 'pg', '< 1.0', platform: :ruby
+end
 
-    appraise 'rails32-postgres-sidekiq' do
-      gem 'test-unit'
-      gem 'rails', '3.2.22.5'
-      gem 'pg', '0.15.1', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq', '4.0.0'
-      gem 'rack-cache', '1.7.1'
-    end
+common_appraisal 'rails5-postgres-redis' do
+  gem 'rails', '~> 5.1.6'
+  gem 'pg', '< 1.0', platform: :ruby
+  gem 'redis-rails'
+  gem 'redis'
+end
 
-    appraise 'rails4-mysql2' do
-      gem 'rails', '4.2.7.1'
-      gem 'mysql2', '< 0.5', platform: :ruby
-      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
-    end
+common_appraisal 'rails5-postgres-sidekiq' do
+  gem 'rails', '~> 5.1.6'
+  gem 'pg', '< 1.0', platform: :ruby
+  gem 'sidekiq'
+  gem 'activejob'
+end
 
-    appraise 'rails4-postgres' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    end
+ruby_version('1.9.3') do
+  rake = proc { gem 'rake', '< 12.3' }
 
-    appraise 'rails4-postgres-redis' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'redis-rails'
-      gem 'redis', '< 4.0'
-    end
+  do_appraise 'rails30-postgres', rake
+  do_appraise 'rails30-postgres-sidekiq', rake
+  do_appraise 'rails32-mysql2', rake
+  do_appraise 'rails32-postgres', rake
+  do_appraise 'rails32-postgres-redis', rake
+  do_appraise 'rails32-postgres-sidekiq', rake
+  do_appraise 'contrib-old', rake
+end
 
-    appraise 'rails4-postgres-sidekiq' do
-      gem 'rails', '4.2.7.1'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-      gem 'sidekiq'
-      gem 'activejob'
-    end
+ruby_version('2.0.0') do
+  do_appraise 'rails30-postgres'
+  do_appraise 'rails30-postgres-sidekiq'
+  do_appraise 'rails32-mysql2'
+  do_appraise 'rails32-postgres'
+  do_appraise 'rails32-postgres-redis'
+  do_appraise 'rails32-postgres-sidekiq'
+  do_appraise 'contrib-old'
+end
 
-    appraise 'rails5-mysql2' do
-      gem 'rails', '~> 5.1.6'
-      gem 'mysql2', '< 0.5', platform: :ruby
-    end
+ruby_version('2.1.0') do
+  do_appraise 'rails30-postgres'
+  do_appraise 'rails30-postgres-sidekiq'
+  do_appraise 'rails32-mysql2'
+  do_appraise 'rails32-postgres'
+  do_appraise 'rails32-postgres-redis'
+  do_appraise 'rails32-postgres-sidekiq'
+  do_appraise 'rails4-mysql2'
+  do_appraise 'rails4-postgres'
+  do_appraise 'rails4-postgres-redis'
+  do_appraise 'contrib-old'
+end
 
-    appraise 'rails5-postgres' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-    end
+ruby_version('2.2.0') do
+  do_appraise 'rails30-postgres'
+  do_appraise 'rails30-postgres-sidekiq'
+  do_appraise 'rails32-mysql2'
+  do_appraise 'rails32-postgres'
+  do_appraise 'rails32-postgres-redis'
+  do_appraise 'rails32-postgres-sidekiq'
+  do_appraise 'rails4-mysql2'
+  do_appraise 'rails4-postgres'
+  do_appraise 'rails4-postgres-redis'
+  do_appraise 'rails4-postgres-sidekiq'
+  do_appraise 'rails5-mysql2'
+  do_appraise 'rails5-postgres'
+  do_appraise 'rails5-postgres-redis'
+  do_appraise 'rails5-postgres-sidekiq'
+  do_appraise 'contrib'
+end
 
-    appraise 'rails5-postgres-redis' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'redis-rails'
-      gem 'redis'
-    end
+ruby_version('2.3.0') do
+  do_appraise 'rails30-postgres'
+  do_appraise 'rails30-postgres-sidekiq'
+  do_appraise 'rails32-mysql2'
+  do_appraise 'rails32-postgres'
+  do_appraise 'rails32-postgres-redis'
+  do_appraise 'rails32-postgres-sidekiq'
+  do_appraise 'rails4-mysql2'
+  do_appraise 'rails4-postgres'
+  do_appraise 'rails4-postgres-redis'
+  do_appraise 'rails4-postgres-sidekiq'
+  do_appraise 'rails5-mysql2'
+  do_appraise 'rails5-postgres'
+  do_appraise 'rails5-postgres-redis'
+  do_appraise 'rails5-postgres-sidekiq'
+  do_appraise 'contrib'
+end
 
-    appraise 'rails5-postgres-sidekiq' do
-      gem 'rails', '~> 5.1.6'
-      gem 'pg', '< 1.0', platform: :ruby
-      gem 'sidekiq'
-      gem 'activejob'
-    end
+ruby_version('2.4.0') do
+  rails4_version = version(rails: '~> 4.2.8')
+
+  do_appraise 'rails4-mysql2', rails4_version
+  do_appraise 'rails4-postgres', rails4_version
+  do_appraise 'rails4-postgres-redis', rails4_version
+  do_appraise 'rails4-postgres-sidekiq', rails4_version
+  do_appraise 'rails5-mysql2'
+  do_appraise 'rails5-postgres'
+  do_appraise 'rails5-postgres-redis'
+  do_appraise 'rails5-postgres-sidekiq'
+  do_appraise 'contrib'
+end
 
-    appraise 'contrib' do
-      gem 'active_model_serializers', '>= 0.10.0'
-      gem 'activerecord', '< 5.1.5'
-      gem 'aws-sdk'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'grape'
-      gem 'graphql'
-      gem 'grpc'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      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 'sidekiq'
-      gem 'sinatra'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
-elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
-  if RUBY_PLATFORM != 'java'
-    appraise 'contrib' do
-      gem 'active_model_serializers', '>= 0.10.0'
-      gem 'activerecord', '< 5.1.5'
-      gem 'aws-sdk'
-      gem 'dalli'
-      gem 'delayed_job'
-      gem 'delayed_job_active_record'
-      gem 'elasticsearch-transport'
-      gem 'excon'
-      gem 'grape'
-      gem 'graphql'
-      gem 'grpc'
-      gem 'hiredis'
-      gem 'mongo', '< 2.5'
-      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 'sidekiq'
-      gem 'sinatra'
-      gem 'sqlite3'
-      gem 'sucker_punch'
-    end
-  end
+ruby_version('2.5.0') do
+  rails4_version = version(rails: '~> 4.2.8')
+
+  do_appraise 'rails4-mysql2', rails4_version
+  do_appraise 'rails4-postgres', rails4_version
+  do_appraise 'rails4-postgres-redis', rails4_version
+  do_appraise 'rails4-postgres-sidekiq', rails4_version
+  do_appraise 'rails5-mysql2'
+  do_appraise 'rails5-postgres'
+  do_appraise 'rails5-postgres-redis'
+  do_appraise 'rails5-postgres-sidekiq'
+  do_appraise 'contrib'
 end

data/CHANGELOG.md

@@ -4,6 +4,17 @@
 
 ## [Unreleased (beta)]
 
+## [0.14.2] - 2018-08-23
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.1...v0.14.2
+
+### Fixed
+
+- Sampling priority from request headers not being used (#521)  
+
+
 ## [0.14.1] - 2018-08-21
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.1

data/Rakefile

@@ -151,7 +151,7 @@ end
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.1.0')
   RuboCop::RakeTask.new(:rubocop) do |t|
     t.options << ['-D', '--force-exclusion']
-    t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'spec/**/*.rb', 'Gemfile', 'Rakefile']
+    t.patterns = ['tools/**/*.rb', 'lib/**/*.rb', 'test/**/*.rb', 'spec/**/*.rb', 'Gemfile', 'Rakefile']
   end
 end
 
@@ -486,7 +486,7 @@ task :ci do
       sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails5-postgres rake spec:rails'
     end
-  elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
+  elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION) # also covers 2.5
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
@@ -501,6 +501,8 @@ task :ci do
       sh 'bundle exec appraisal contrib rake test:rack'
       sh 'bundle exec appraisal contrib rake test:sinatra'
       sh 'bundle exec appraisal contrib rake test:sucker_punch'
+      sh 'bundle exec appraisal contrib rake test:sidekiq'
+      sh 'bundle exec rake benchmark'
       # Contrib specs
       sh 'bundle exec appraisal contrib rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib rake spec:active_record'
@@ -523,7 +525,23 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib rake test:sidekiq'
-      sh 'bundle exec rake benchmark'
+      sh 'bundle exec appraisal rails4-mysql2 rake test:rails'
+      sh 'bundle exec appraisal rails4-postgres rake test:rails'
+      sh 'bundle exec appraisal rails4-postgres-redis rake test:railsredis'
+      sh 'bundle exec appraisal rails4-postgres rake test:railsdisableenv'
+      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railssidekiq'
+      sh 'bundle exec appraisal rails4-postgres-sidekiq rake test:railsactivejob'
+      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 test:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railssidekiq'
+      sh 'bundle exec appraisal rails5-postgres-sidekiq rake test:railsactivejob'
+      sh 'bundle exec appraisal rails5-postgres rake test:railsdisableenv'
+      # Rails specs
+      sh 'bundle exec appraisal rails4-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails4-postgres rake spec:rails'
+      sh 'bundle exec appraisal rails5-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails5-postgres rake spec:rails'
     end
   end
 end

data/docs/GettingStarted.md

@@ -72,6 +72,7 @@ For descriptions of terminology used in APM, take a look at the [official docume
 |       |                            | 2.2     | Full         |
 |       |                            | 2.3     | Full         |
 |       |                            | 2.4     | Full         |
+|       |                            | 2.5     | Full         |
 | JRuby | http://jruby.org/          | 9.1.5   | Experimental |
 
 *Full* support indicates all tracer features are available.
@@ -846,6 +847,15 @@ Where `options` is an optional `Hash` that accepts the following parameters:
 | ``tracer`` | A ``Datadog::Tracer`` instance used to instrument the application. Usually you don't need to set that. | ``Datadog.tracer`` |
 | ``databases`` | Hash of tracer settings to use for each database connection. See [ActiveRecord](#activerecord) for more details. | ``{}`` |
 
+Supported versions
+
+| Ruby Versions | Supported Rails Versions |
+| ------------- | ------------------------ |
+|  1.9.3 - 2.0  |  3.0 - 3.2               |
+|  2.1          |  3.0 - 4.2               |
+|  2.2 - 2.3    |  3.0 - 5.1               |
+|  2.4 - 2.5    |  4.2.8 - 5.1             |
+
 ### Rake
 
 You can add instrumentation around your Rake tasks by activating the `rake` integration. Each task and its subsequent subtasks will be traced.

data/lib/ddtrace/sampler.rb

@@ -98,14 +98,32 @@ module Datadog
     end
 
     def sample(span)
-      span.context.sampling_priority = Datadog::Ext::Priority::AUTO_REJECT if span.context
-      return unless @base_sampler.sample(span)
-      return unless @post_sampler.sample(span)
-      span.context.sampling_priority = Datadog::Ext::Priority::AUTO_KEEP if span.context
-
-      true
+      return perform_sampling(span) unless span.context
+      return sampled_by_upstream(span) if span.context.sampling_priority
+
+      perform_sampling(span).tap do |sampled|
+        span.context.sampling_priority = if sampled
+                                           Datadog::Ext::Priority::AUTO_KEEP
+                                         else
+                                           Datadog::Ext::Priority::AUTO_REJECT
+                                         end
+      end
     end
 
     def_delegators :@post_sampler, :update
+
+    private
+
+    def sampled_by_upstream(span)
+      span.sampled = priority_keep?(span.context.sampling_priority)
+    end
+
+    def priority_keep?(sampling_priority)
+      sampling_priority == Datadog::Ext::Priority::USER_KEEP || sampling_priority == Datadog::Ext::Priority::AUTO_KEEP
+    end
+
+    def perform_sampling(span)
+      @base_sampler.sample(span) && @post_sampler.sample(span)
+    end
   end
 end

data/lib/ddtrace/version.rb

@@ -2,8 +2,8 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 14
-    PATCH = 1
-    PRE = nil
+    PATCH = 2
+    PRE = 'disableprotocolversion4'
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/lib/ddtrace/writer.rb

@@ -18,7 +18,7 @@ module Datadog
       # priority sampling
       if options[:priority_sampler]
         @priority_sampler = options[:priority_sampler]
-        transport_options[:api_version] ||= HTTPTransport::V4
+        transport_options[:api_version] ||= HTTPTransport::V3
         transport_options[:response_callback] ||= method(:sampling_updater)
       end
 
@@ -120,8 +120,8 @@ module Datadog
       return unless action == :traces && response.is_a?(Net::HTTPOK)
 
       if api[:version] == HTTPTransport::V4
-        service_rates = JSON.parse(response.body)
-        @priority_sampler.update(service_rates)
+        # service_rates = JSON.parse(response.body)
+        # @priority_sampler.update(service_rates)
         true
       else
         false

data/tools/appraisal_helper.rb

@@ -0,0 +1,36 @@
+def ruby_version(version, java_required = false, &block)
+  return if java_required && RUBY_PLATFORM != 'java'
+
+  version = Gem::Version.new(version)
+  current_version = Gem::Version.new(RUBY_VERSION)
+
+  yield if current_version >= version && current_version < version.bump
+end
+
+def do_appraise(name, *closures, &block)
+  @common_appraisals ||= {}
+  @versions ||= {}
+  @versions[name] ||= {}
+  versions = @versions[name].dup
+  common_appraisal = @common_appraisals[name]
+
+  appraise(name) do
+    closures.each do |closure|
+      instance_exec(versions, &closure)
+    end
+
+    instance_exec(versions, &common_appraisal) if common_appraisal
+    instance_exec(versions, &block) if block_given?
+  end
+end
+
+def common_appraisal(name, &block)
+  @common_appraisals ||= {}
+  @common_appraisals[name] = block
+end
+
+def version(versions = {})
+  proc do |appraisal_version|
+    appraisal_version.merge!(versions)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.14.2.disableprotocolversion4
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -419,6 +419,7 @@ files:
 - lib/ddtrace/version.rb
 - lib/ddtrace/workers.rb
 - lib/ddtrace/writer.rb
+- tools/appraisal_helper.rb
 homepage: https://github.com/DataDog/dd-trace-rb
 licenses:
 - BSD-3-Clause
@@ -435,12 +436,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications