Merge pull request #512 from DataDog/0.14-dev

0.14.0 to stable
DataDog · Aug 15, 2018 · a055f58 · a055f58
2 parents 1e5a7b8 + c71ffa5
commit a055f58
Show file tree

Hide file tree

Showing 73 changed files with 3,053 additions and 125 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,5 +1,15 @@
 AllCops:
   TargetRubyVersion: 2.1
+  Include:
+    - 'lib/**/*.rb'
+    - 'test/**/*.rb'
+    - 'spec/**/*.rb'
+    - 'Gemfile'
+    - 'Rakefile'
+  Exclude:
+    - 'Appraisals'
+    - '*.gemspec'
+    - 'lib/ddtrace/vendor/**/*.rb'
 
 # 80 characters is a nice goal, but not worth currently changing in existing
 # code for the sake of changing it to conform to a length set in 1928 (IBM).

diff --git a/Appraisals b/Appraisals
@@ -68,6 +68,8 @@ elsif Gem::Version.new('1.9.3') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -78,6 +80,7 @@ elsif Gem::Version.new('1.9.3') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -148,6 +151,8 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -158,6 +163,7 @@ elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -248,6 +254,8 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -258,6 +266,7 @@ elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -379,6 +388,8 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -392,6 +403,7 @@ elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
+      gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'sequel'
       gem 'sidekiq'
@@ -513,6 +525,8 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       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'
@@ -526,6 +540,7 @@ elsif Gem::Version.new('2.3.0') <= Gem::Version.new(RUBY_VERSION) \
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
+      gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'sequel'
       gem 'sidekiq'
@@ -541,6 +556,8 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
       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'
@@ -554,6 +571,7 @@ elsif Gem::Version.new('2.4.0') <= Gem::Version.new(RUBY_VERSION)
       gem 'rack-test'
       gem 'rake', '>= 12.3'
       gem 'redis', '< 4.0'
+      gem 'rest-client'
       gem 'resque', '< 2.0'
       gem 'sequel'
       gem 'sidekiq'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,78 @@
 
 ## [Unreleased (beta)]
 
+## [0.14.0] - 2018-08-14
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.13.2...v0.14.0
+
+### Added
+
+- RestClient integration (#422, #460)
+- DelayedJob integration (#393 #444)
+- Version information to integrations (#483)
+- Tracer#active_root_span helper (#503)
+
+### Changed
+
+- Resque to flush traces when Job finishes instead of using SyncWriter (#474)
+- ActiveRecord to allow configuring multiple databases (#451)
+- Integrations configuration settings (#450, #452, #451)
+
+### Fixed
+
+- Context propagation for distributed traces when context is full (#502)
+- Rake shutdown tracer after execution (#487) (@kissrobber)
+- Deprecation warnings fired using Unicorn (#508)
+
+## [0.14.0.rc1] - 2018-08-08
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0.rc1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta2...v0.14.0.rc1
+
+### Added
+
+- RestClient integration (#422, #460)
+- Tracer#active_root_span helper (#503)
+
+### Fixed
+
+- Context propagation for distributed traces when context is full (#502)
+
+## [0.14.0.beta2] - 2018-07-25
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0.beta2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta1...v0.14.0.beta2
+
+### Fixed
+
+- Rake shutdown tracer after execution (#487) @kissrobber
+
+## [0.14.0.beta1] - 2018-07-24
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0.beta1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.13.1...v0.14.0.beta1
+
+### Changed
+
+- Resque to flush traces when Job finishes instead of using SyncWriter (#474)
+- ActiveRecord to allow configuring multiple databases (#451)
+- Integrations configuration settings (#450, #452, #451)
+
+### Fixed
+
+- Ruby warnings during tests (#499)
+- Tests failing intermittently on Ruby 1.9.3 (#497)
+
+### Added
+
+- DelayedJob integration (#393 #444)
+- Version information to integrations (#483)
+
 ## [0.13.2] - 2018-08-07
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.13.2
@@ -388,8 +460,12 @@ 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 (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...0.14-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0...0.15-dev
+[0.14.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.2...v0.14.0
+[0.14.0.rc1]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta2...v0.14.0.rc1
+[0.14.0.beta2]: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta1...v0.14.0.beta2
+[0.14.0.beta1]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...v0.14.0.beta1
 [0.13.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.1...v0.13.2
 [0.13.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.13.0...v0.13.1
 [0.13.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...v0.13.0

diff --git a/Gemfile b/Gemfile
@@ -4,3 +4,4 @@ gemspec
 
 # Add debugger for pry that's compatible with 0.10.4
 gem 'pry-nav', git: 'https://github.com/nixme/pry-nav.git', branch: 'master'
+# This file was generated by Appraisal
diff --git a/Rakefile b/Rakefile
@@ -39,9 +39,14 @@ namespace :spec do
     t.pattern = 'spec/ddtrace/contrib/rails/**/*disable_env*_spec.rb'
   end
 
+  RSpec::Core::RakeTask.new(:contrib) do |t|
+    t.pattern = 'spec/**/contrib/{configurable,integration,patchable,patcher,registerable,configuration/*}_spec.rb'
+  end
+
   [
     :active_model_serializers,
     :active_record,
+    :delayed_job,
     :active_support,
     :aws,
     :dalli,
@@ -62,7 +67,8 @@ namespace :spec do
     :sequel,
     :sidekiq,
     :sinatra,
-    :sucker_punch
+    :sucker_punch,
+    :rest_client
   ].each do |contrib|
     RSpec::Core::RakeTask.new(contrib) do |t|
       t.pattern = "spec/ddtrace/contrib/#{contrib}/**/*_spec.rb"
@@ -144,7 +150,7 @@ end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.1.0')
   RuboCop::RakeTask.new(:rubocop) do |t|
-    t.options << ['-D']
+    t.options << ['-D', '--force-exclusion']
     t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'spec/**/*.rb', 'Gemfile', 'Rakefile']
   end
 end
@@ -208,6 +214,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -221,6 +228,7 @@ task :ci do
       # Contrib specs
       sh 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
+      sh 'bundle exec appraisal contrib-old rake spec:delayed_job'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
       sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
@@ -233,6 +241,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:redis'
       sh 'bundle exec appraisal contrib-old rake spec:resque'
       sh 'bundle exec appraisal contrib-old rake spec:sequel'
+      sh 'bundle exec appraisal contrib-old rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
       sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
@@ -250,6 +259,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -263,6 +273,7 @@ task :ci do
       # Contrib specs
       sh 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
+      sh 'bundle exec appraisal contrib-old rake spec:delayed_job'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
       sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
@@ -275,6 +286,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:redis'
       sh 'bundle exec appraisal contrib-old rake spec:resque'
       sh 'bundle exec appraisal contrib-old rake spec:sequel'
+      sh 'bundle exec appraisal contrib-old rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib-old rake test:sidekiq'
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
@@ -295,6 +307,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -308,6 +321,7 @@ task :ci do
       # Contrib specs
       sh 'bundle exec appraisal contrib-old rake spec:active_model_serializers'
       sh 'bundle exec appraisal contrib-old rake spec:active_record'
+      sh 'bundle exec appraisal contrib-old rake spec:delayed_job'
       sh 'bundle exec appraisal contrib-old rake spec:active_support'
       sh 'bundle exec appraisal contrib-old rake spec:dalli'
       sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
@@ -320,6 +334,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:redis'
       sh 'bundle exec appraisal contrib-old rake spec:resque'
       sh 'bundle exec appraisal contrib-old rake spec:sequel'
+      sh 'bundle exec appraisal contrib-old rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib-old rake test:sidekiq'
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
@@ -346,6 +361,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -359,6 +375,7 @@ task :ci do
       # Contrib specs
       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:delayed_job'
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
       sh 'bundle exec appraisal contrib rake spec:elasticsearch'
@@ -374,6 +391,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:redis'
       sh 'bundle exec appraisal contrib rake spec:resque'
       sh 'bundle exec appraisal contrib rake spec:sequel'
+      sh 'bundle exec appraisal contrib rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib rake test:sidekiq'
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
@@ -408,6 +426,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -421,6 +440,7 @@ task :ci do
       # Contrib specs
       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:delayed_job'
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
       sh 'bundle exec appraisal contrib rake spec:excon'
@@ -436,6 +456,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:redis'
       sh 'bundle exec appraisal contrib rake spec:resque'
       sh 'bundle exec appraisal contrib rake spec:sequel'
+      sh 'bundle exec appraisal contrib rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib rake test:sidekiq'
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
@@ -469,6 +490,7 @@ task :ci do
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
+    sh 'bundle exec rake spec:contrib'
 
     if RUBY_PLATFORM != 'java'
       # Contrib minitests
@@ -482,6 +504,7 @@ task :ci do
       # Contrib specs
       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:delayed_job'
       sh 'bundle exec appraisal contrib rake spec:active_support'
       sh 'bundle exec appraisal contrib rake spec:dalli'
       sh 'bundle exec appraisal contrib rake spec:elasticsearch'
@@ -497,6 +520,7 @@ task :ci do
       sh 'bundle exec appraisal contrib rake spec:redis'
       sh 'bundle exec appraisal contrib rake spec:resque'
       sh 'bundle exec appraisal contrib rake spec:sequel'
+      sh 'bundle exec appraisal contrib rake spec:rest_client'
       # Rails minitests
       sh 'bundle exec appraisal contrib rake test:sidekiq'
       sh 'bundle exec rake benchmark'