ddtrace 0.26.1 → 0.27.0

data/CHANGELOG.md

@@ -4,15 +4,32 @@
 
 ## [Unreleased (beta)]
 
-## [0.26.1] - 2019-11-26
+## [0.27.0] - 2019-09-04
 
-Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.26.1
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.27.0
 
-Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.26.1
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.27.0
 
-### Fixed
+Support for Ruby < 2.0 is *removed*. Plan for timeline is as follows:
+
+ - 0.25.0: Support for Ruby < 2.0 is deprecated; retains full feature support.
+ - 0.26.0: Last version to support Ruby < 2.0; any new features will not support 1.9.
+ - 0.27.0: Support for Ruby < 2.0 is removed.
+
+Version 0.26.x will receive only critical bugfixes for 1 year following the release of 0.26.0 (August 6th, 2020.)
+
+### Added
+
+ - Support for Ruby 2.5 & 2.6 (#800, #802)
+ - Ethon integration (#527, #778) (@al-kudryavtsev)
+
+### Refactored
+
+ - Rails integration into smaller integrations per component (#747, #762, #795)
+
+### Removed
 
-- Priority sampling not activating by default (#868)
+ - Support for Ruby 1.9 (#791)
 
 ## [0.26.0] - 2019-08-06
 
@@ -912,9 +929,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 (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...0.27-dev
-[0.26.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.26.1
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.27.0...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.27.0...0.28-dev
+[0.27.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.27.0
 [0.26.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...v0.26.0
 [0.25.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.0...v0.25.1
 [0.25.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.24.0...v0.25.0

data/Rakefile

@@ -59,6 +59,8 @@ namespace :spec do
   end
 
   [
+    :action_pack,
+    :action_view,
     :active_model_serializers,
     :active_record,
     :active_support,
@@ -67,6 +69,7 @@ namespace :spec do
     :dalli,
     :delayed_job,
     :elasticsearch,
+    :ethon,
     :excon,
     :faraday,
     :grape,
@@ -186,52 +189,8 @@ end
 
 desc 'CI task; it runs all tests for current version of Ruby'
 task :ci do
-  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')
-    # 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
-      sh 'bundle exec appraisal contrib-old rake test:monkey'
-      sh 'bundle exec appraisal contrib-old rake test:sucker_punch'
-      # 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:active_support'
-      sh 'bundle exec appraisal contrib-old rake spec:aws'
-      sh 'bundle exec appraisal contrib-old rake spec:concurrent_ruby'
-      sh 'bundle exec appraisal contrib-old rake spec:dalli'
-      sh 'bundle exec appraisal contrib-old rake spec:delayed_job'
-      sh 'bundle exec appraisal contrib-old rake spec:elasticsearch'
-      sh 'bundle exec appraisal contrib-old rake spec:excon'
-      sh 'bundle exec appraisal contrib-old rake spec:faraday'
-      sh 'bundle exec appraisal contrib-old rake spec:http'
-      sh 'bundle exec appraisal contrib-old rake spec:mongodb'
-      sh 'bundle exec appraisal contrib-old rake spec:mysql2'
-      sh 'bundle exec appraisal contrib-old rake spec:rack'
-      sh 'bundle exec appraisal contrib-old rake spec:rake'
-      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:rest_client'
-      sh 'bundle exec appraisal contrib-old rake spec:sequel'
-      sh 'bundle exec appraisal contrib-old rake spec:sinatra'
-      # Rails minitests
-      sh 'bundle exec appraisal rails30-postgres rake test:rails'
-      sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
-      sh 'bundle exec appraisal rails32-mysql2 rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres rake test:rails'
-      sh 'bundle exec appraisal rails32-postgres-redis rake test:railsredis'
-      sh 'bundle exec appraisal rails32-postgres rake test:railsdisableenv'
-      # Rails specs
-      sh 'bundle exec appraisal rails30-postgres rake spec:rails'
-      sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
-      sh 'bundle exec appraisal rails32-postgres rake spec:rails'
-    end
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+    raise NotImplementedError, 'Ruby versions < 2.0.0 are not supported!'
   elsif Gem::Version.new('2.0.0') <= Gem::Version.new(RUBY_VERSION) \
         && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
     # Main library
@@ -265,6 +224,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:rest_client'
       sh 'bundle exec appraisal contrib-old rake spec:sequel'
       sh 'bundle exec appraisal contrib-old rake spec:sinatra'
+      sh 'bundle exec appraisal contrib-old rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
       sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
@@ -278,6 +238,11 @@ task :ci do
       sh 'bundle exec appraisal rails30-postgres rake spec:rails'
       sh 'bundle exec appraisal rails32-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails32-postgres rake spec:rails'
+      # Rails suite specs
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_pack'
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_view'
+      sh 'bundle exec appraisal rails32-mysql2 rake spec:active_record'
+      sh 'bundle exec appraisal rails32-postgres rake spec:active_support'
     end
   elsif Gem::Version.new('2.1.0') <= Gem::Version.new(RUBY_VERSION) \
         && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
@@ -313,6 +278,7 @@ task :ci do
       sh 'bundle exec appraisal contrib-old rake spec:rest_client'
       sh 'bundle exec appraisal contrib-old rake spec:sequel'
       sh 'bundle exec appraisal contrib-old rake spec:sinatra'
+      sh 'bundle exec appraisal contrib-old rake spec:ethon'
       # Rails minitests
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
       sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
@@ -332,6 +298,11 @@ task :ci do
       sh 'bundle exec appraisal rails32-postgres rake spec:rails'
       sh 'bundle exec appraisal rails4-mysql2 rake spec:rails'
       sh 'bundle exec appraisal rails4-postgres rake spec:rails'
+      # Rails suite specs
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_pack'
+      sh 'bundle exec appraisal rails32-postgres rake spec:action_view'
+      sh 'bundle exec appraisal rails32-mysql2 rake spec:active_record'
+      sh 'bundle exec appraisal rails32-postgres rake spec:active_support'
     end
   elsif Gem::Version.new('2.2.0') <= Gem::Version.new(RUBY_VERSION)\
         && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3.0')
@@ -347,6 +318,8 @@ task :ci do
       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'
@@ -371,6 +344,7 @@ task :ci do
       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
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
       sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
@@ -387,6 +361,7 @@ task :ci do
       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-redis-activesupport 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'
@@ -413,6 +388,8 @@ task :ci do
       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'
@@ -437,6 +414,7 @@ task :ci do
       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
       sh 'bundle exec appraisal rails30-postgres rake test:rails'
       sh 'bundle exec appraisal rails30-postgres rake test:railsdisableenv'
@@ -453,6 +431,7 @@ task :ci do
       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-redis-activesupport 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'
@@ -465,7 +444,8 @@ 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) \
+        && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5.0')
     # Main library
     sh 'bundle exec rake test:main'
     sh 'bundle exec rake spec:main'
@@ -473,11 +453,15 @@ task :ci do
     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'
@@ -502,8 +486,130 @@ task :ci do
       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 test:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport 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 rails5-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails5-postgres rake spec:rails'
+    end
+  elsif Gem::Version.new('2.5.0') <= Gem::Version.new(RUBY_VERSION) \
+        && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.6.0')
+    # 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'
+      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 test:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport 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 rails5-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails5-postgres rake spec:rails'
+    end
+  elsif Gem::Version.new('2.6.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'
+      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 test:railsredis'
+      sh 'bundle exec appraisal rails5-postgres-redis-activesupport 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 rails5-mysql2 rake spec:rails'
+      sh 'bundle exec appraisal rails5-postgres rake spec:rails'
     end
   end
 end

data/ddtrace.gemspec

@@ -7,7 +7,7 @@ require 'ddtrace/version'
 Gem::Specification.new do |spec|
   spec.name                  = 'ddtrace'
   spec.version               = Datadog::VERSION::STRING
-  spec.required_ruby_version = '>= 1.9.1'
+  spec.required_ruby_version = '>= 2.0.0'
   spec.authors               = ['Datadog, Inc.']
   spec.email                 = ['dev@datadoghq.com']
 

data/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.2'
 services:
-  tracer-1.9:
-    image: palazzem/docker-library:ddtrace_rb_1_9_3
+  tracer-2.0:
+    image: palazzem/docker-library:ddtrace_rb_2_0_0
     command: /bin/bash
     depends_on:
       - ddagent
@@ -26,10 +26,10 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-1.9:/usr/local/bundle
-      - gemfiles-1.9:/app/gemfiles
-  tracer-2.0:
-    image: palazzem/docker-library:ddtrace_rb_2_0_0
+      - bundle-2.0:/usr/local/bundle
+      - gemfiles-2.0:/app/gemfiles
+  tracer-2.1:
+    image: palazzem/docker-library:ddtrace_rb_2_1_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -54,10 +54,10 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-2.0:/usr/local/bundle
-      - gemfiles-2.0:/app/gemfiles
-  tracer-2.1:
-    image: palazzem/docker-library:ddtrace_rb_2_1_10
+      - bundle-2.1:/usr/local/bundle
+      - gemfiles-2.1:/app/gemfiles
+  tracer-2.2:
+    image: palazzem/docker-library:ddtrace_rb_2_2_10
     command: /bin/bash
     depends_on:
       - ddagent
@@ -82,10 +82,10 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-2.1:/usr/local/bundle
-      - gemfiles-2.1:/app/gemfiles
-  tracer-2.2:
-    image: palazzem/docker-library:ddtrace_rb_2_2_10
+      - bundle-2.2:/usr/local/bundle
+      - gemfiles-2.2:/app/gemfiles
+  tracer-2.3:
+    image: palazzem/docker-library:ddtrace_rb_2_3_8
     command: /bin/bash
     depends_on:
       - ddagent
@@ -110,10 +110,10 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-2.2:/usr/local/bundle
-      - gemfiles-2.2:/app/gemfiles
-  tracer-2.3:
-    image: palazzem/docker-library:ddtrace_rb_2_3_8
+      - bundle-2.3:/usr/local/bundle
+      - gemfiles-2.3:/app/gemfiles
+  tracer-2.4:
+    image: palazzem/docker-library:ddtrace_rb_2_4_6
     command: /bin/bash
     depends_on:
       - ddagent
@@ -138,10 +138,10 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-2.3:/usr/local/bundle
-      - gemfiles-2.3:/app/gemfiles
-  tracer-2.4:
-    image: palazzem/docker-library:ddtrace_rb_2_4_6
+      - bundle-2.4:/usr/local/bundle
+      - gemfiles-2.4:/app/gemfiles
+  tracer-2.5:
+    image: marcotc/docker-library:ddtrace_rb_2_5_6
     command: /bin/bash
     depends_on:
       - ddagent
@@ -166,8 +166,36 @@ services:
     tty: true
     volumes:
       - .:/app
-      - bundle-2.4:/usr/local/bundle
-      - gemfiles-2.4:/app/gemfiles
+      - bundle-2.5:/usr/local/bundle
+      - gemfiles-2.5:/app/gemfiles
+  tracer-2.6:
+    image: marcotc/docker-library:ddtrace_rb_2_6_4
+    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.6:/usr/local/bundle
+      - gemfiles-2.6:/app/gemfiles
   ddagent:
     image: datadog/docker-dd-agent
     environment:
@@ -232,15 +260,17 @@ services:
     ports:
       - "${TEST_REDIS_PORT}:6379"
 volumes:
-  bundle-1.9:
   bundle-2.0:
   bundle-2.1:
   bundle-2.2:
   bundle-2.3:
   bundle-2.4:
-  gemfiles-1.9:
+  bundle-2.5:
+  bundle-2.6:
   gemfiles-2.0:
   gemfiles-2.1:
   gemfiles-2.2:
   gemfiles-2.3:
   gemfiles-2.4:
+  gemfiles-2.5:
+  gemfiles-2.6: