ddtrace 0.14.2.withoutpriorityparsing1 → 0.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344adc28461c653516ee9b0bd7c80454000fab9140ce0cb599d1f570b54c93bd
-  data.tar.gz: 42292dd1e4d6d8dcbfedd90ef3175c1e821ba3adc2039a4d222b9d4376b6f59a
+  metadata.gz: 25dde262eb6c5e6fc818787e0393798fca7c427fabe3fd83acfde68ae75d5e4d
+  data.tar.gz: 384fc03cba261af39f3236d7ed1308ab5a706978f5ba8a0836538cd8f207cd49
 SHA512:
-  metadata.gz: 6b744f098b31a4f90e0ddf8e23aeef4438fbe7ae1144ae44b0892f0925462c13c201b14a351a4f072f61a73fd8ec78ba3eea026e54d695f4e5e2be5a1d0c87ad
-  data.tar.gz: eeb18d73d341fa4562fa84baab3d332ae605a1fe922b6f7842ca0619db20e46b4db5e521ef187cc6131bdf081439c1bba0097643970408e5e6fba9919b602087
+  metadata.gz: c4f348bf0337b3d820257f91bae3c8d95d0d47d6527eee841772e2beb66b7ca0679a325dc3d4d9027a53e518d437aa1522ced5dbadb865f2404c86c18c2908b6
+  data.tar.gz: 26919c343f9ee6bed204d6b08fdd741a5bd878b11a19aba6cf970f36e7e0ee863c4708070bcf0bad4885a66d85913a4e3e87f73f9b18d54b900e02208b9b9c0c

data/.circleci/config.yml

@@ -401,6 +401,7 @@ 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:
@@ -457,52 +458,6 @@ 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:
@@ -584,11 +539,6 @@ 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:
@@ -598,4 +548,3 @@ workflows:
             - test-2.2
             - test-2.3
             - test-2.4
-            - test-2.5

data/Appraisals

@@ -1,265 +1,583 @@
-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!'
-end
+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
 
-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 '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
 
-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 '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
 
-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 '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
 
-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 '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
 
-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 '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
 
-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 '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
 
-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 '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 '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 '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-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 '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 '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 '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 '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-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 '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 '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
 
-common_appraisal 'rails5-mysql2' do
-  gem 'rails', '~> 5.1.6'
-  gem 'mysql2', '< 0.5', platform: :ruby
-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 'rails5-postgres' do
-  gem 'rails', '~> 5.1.6'
-  gem 'pg', '< 1.0', platform: :ruby
-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 'rails5-postgres-redis' do
-  gem 'rails', '~> 5.1.6'
-  gem 'pg', '< 1.0', platform: :ruby
-  gem 'redis-rails'
-  gem 'redis'
-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-postgres-sidekiq' do
-  gem 'rails', '~> 5.1.6'
-  gem 'pg', '< 1.0', platform: :ruby
-  gem 'sidekiq'
-  gem 'activejob'
-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
 
-ruby_version('1.9.3') do
-  rake = proc { gem 'rake', '< 12.3' }
+    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
 
-  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-mysql2' do
+      gem 'rails', '4.2.7.1'
+      gem 'mysql2', '< 0.5', platform: :ruby
+      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+    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 'rails4-postgres' do
+      gem 'rails', '4.2.7.1'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    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 '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
 
-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 '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
 
-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 '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
 
-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 '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 '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
+
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.1.6'
+      gem 'mysql2', '< 0.5', platform: :ruby
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.1.6'
+      gem 'pg', '< 1.0', platform: :ruby
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.1.6'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    end
+
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '~> 5.1.6'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'sidekiq'
+      gem 'activejob'
+    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
+
+    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 '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
+
+    appraise 'rails5-mysql2' do
+      gem 'rails', '~> 5.1.6'
+      gem 'mysql2', '< 0.5', platform: :ruby
+    end
+
+    appraise 'rails5-postgres' do
+      gem 'rails', '~> 5.1.6'
+      gem 'pg', '< 1.0', platform: :ruby
+    end
+
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '~> 5.1.6'
+      gem 'pg', '< 1.0', platform: :ruby
+      gem 'redis-rails'
+      gem 'redis'
+    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.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'
+    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
 end

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 = ['tools/**/*.rb', 'lib/**/*.rb', 'test/**/*.rb', 'spec/**/*.rb', 'Gemfile', 'Rakefile']
+    t.patterns = ['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) # also covers 2.5
+  elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
@@ -501,8 +501,6 @@ 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'
@@ -525,23 +523,7 @@ 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 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'
+      sh 'bundle exec rake benchmark'
     end
   end
 end

data/docs/GettingStarted.md

@@ -72,7 +72,6 @@ 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.
@@ -847,15 +846,6 @@ 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/version.rb

@@ -3,7 +3,7 @@ module Datadog
     MAJOR = 0
     MINOR = 14
     PATCH = 2
-    PRE = 'withoutpriorityparsing1'
+    PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

data/lib/ddtrace/writer.rb

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.14.2.withoutpriorityparsing1
+  version: 0.14.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-07 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -419,7 +419,6 @@ 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
@@ -436,9 +435,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7

data/tools/appraisal_helper.rb

@@ -1,36 +0,0 @@
-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