ddtrace 0.12.0 → 0.12.1

data/CHANGELOG.md

@@ -4,6 +4,28 @@
 
 ## [Unreleased (beta)]
 
+## [0.12.1] - 2018-06-12
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.12.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.12.1
+
+### Changed
+ - Cache configuration `Proxy` objects (#446)
+ - `freeze` more constant strings, to improve memory usage (#446)
+ - `Utils#truncate` to use slightly less memory (#446)
+
+### Fixed
+ - Net/HTTP integration not permitting `service_name` to be overridden. (#407, #430) (@undergroundwebdesigns)
+ - Block not being passed through Elasticsearch client initialization. (#421) (@shayonj)
+ - Devise raising `NoMethodError` when bad login attempts are made. (#419, #420) (@frsantos)
+ - AWS spans using wrong resource name (#374, #377) (@jfrancoist)
+ - ActionView `NoMethodError` on very long traces. (#445, #447) (@jvalanen)
+
+### Refactored
+ - ActionController patching strategy using modules. (#439)
+ - ActionView tracing strategy. (#445, #447)
+
 ## [0.12.0] - 2018-05-08
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.12.0
@@ -285,8 +307,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.12.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...0.13-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.1...0.13-dev
+[0.12.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0...v0.12.1
 [0.12.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.4...v0.12.0
 [0.12.0.rc1]: https://github.com/DataDog/dd-trace-rb/compare/v0.11.4...v0.12.0.rc1
 [0.12.0.beta2]: https://github.com/DataDog/dd-trace-rb/compare/v0.12.0.beta1...v0.12.0.beta2

data/Rakefile

@@ -142,7 +142,7 @@ end
 if RUBY_VERSION >= '2.1.0'
   RuboCop::RakeTask.new(:rubocop) do |t|
     t.options << ['-D']
-    t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'Gemfile', 'Rakefile']
+    t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'spec/**/*.rb', 'Gemfile', 'Rakefile']
   end
 end
 
@@ -196,81 +196,262 @@ task :'release:docs' => :docs do
   sh "aws s3 cp --recursive doc/ s3://#{S3_BUCKET}/#{S3_DIR}/docs/"
 end
 
-desc 'CI dependent task; it runs all parallel tests'
+# rubocop:disable Style/YodaCondition
+desc 'CI task; it runs all tests for current version of Ruby'
 task :ci do
-  # CircleCI uses this environment to store the node index (starting from 0)
-  # check: https://circleci.com/docs/parallel-manual-setup/#env-splitting
-  case ENV['CIRCLE_NODE_INDEX'].to_i
-  when 0
-    sh 'rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS,$JRUBY_VERSIONS --verbose do rake test:main'
-    # RSpec
-    sh 'rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS,$JRUBY_VERSIONS --verbose do rake spec:main'
-  when 1
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:elasticsearch'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:http'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:sinatra'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:rack'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:grape'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:aws'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:mongodb'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:sucker_punch'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:resque'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:monkey'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:elasticsearch'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:http'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:sinatra'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:rack'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:aws'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:mongodb'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:sucker_punch'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:resque'
-    # RSpec
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:active_record'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:active_support'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:dalli'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:faraday'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:graphql'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:racecar'
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake spec:redis'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake spec:active_record'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake spec:active_support'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake spec:dalli'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake spec:faraday'
-    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake spec:redis'
-  when 2
-    sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:sidekiq'
-    sh 'rvm $SIDEKIQ_OLD_VERSIONS --verbose do appraisal contrib-old rake test:sidekiq'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails30-postgres rake test:rails'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails30-postgres rake test:railsdisableenv'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-mysql2 rake test:rails'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-postgres rake test:rails'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-postgres-redis rake test:railsredis'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-postgres rake test:railsdisableenv'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-mysql2 rake test:rails'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres rake test:rails'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres-redis rake test:railsredis'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres rake test:railsdisableenv'
-    sh 'rvm $RAILS3_SIDEKIQ_VERSIONS --verbose do appraisal rails30-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS3_SIDEKIQ_VERSIONS --verbose do appraisal rails32-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS4_SIDEKIQ_VERSIONS --verbose do appraisal rails4-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS4_SIDEKIQ_VERSIONS --verbose do appraisal rails4-postgres-sidekiq rake test:railsactivejob'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-mysql2 rake test:rails'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres rake test:rails'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres-redis rake test:railsredis'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres-sidekiq rake test:railsactivejob'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres rake test:railsdisableenv'
-    # RSpec
-    sh 'rvm $LAST_STABLE --verbose do rake benchmark'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails30-postgres rake spec:rails'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-mysql2 rake spec:rails'
-    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails32-postgres rake spec:rails'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-mysql2 rake spec:rails'
-    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres rake spec:rails'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-mysql2 rake spec:rails'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres rake spec:rails'
-  else
-    puts 'Too many workers than parallel tasks'
+  if RUBY_VERSION < '1.9.3'
+    raise NotImplementedError, 'Ruby versions < 1.9.3 are not supported!'
+  elsif '1.9.3' <= RUBY_VERSION && RUBY_VERSION < '2.0.0'
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib-old rake test:aws'
+      sh 'appraisal contrib-old rake test:elasticsearch'
+      sh 'appraisal contrib-old rake test:http'
+      sh 'appraisal contrib-old rake test:mongodb'
+      sh 'appraisal contrib-old rake test:monkey'
+      sh 'appraisal contrib-old rake test:rack'
+      sh 'appraisal contrib-old rake test:resque'
+      sh 'appraisal contrib-old rake test:sinatra'
+      sh 'appraisal contrib-old rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib-old rake spec:active_record'
+      sh 'appraisal contrib-old rake spec:active_support'
+      sh 'appraisal contrib-old rake spec:dalli'
+      sh 'appraisal contrib-old rake spec:faraday'
+      sh 'appraisal contrib-old rake spec:http'
+      sh 'appraisal contrib-old rake spec:redis'
+      # Rails minitests
+      sh 'appraisal rails30-postgres rake test:rails'
+      sh 'appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'appraisal rails32-mysql2 rake test:rails'
+      sh 'appraisal rails32-postgres rake test:rails'
+      sh 'appraisal rails32-postgres-redis rake test:railsredis'
+      sh 'appraisal rails32-postgres rake test:railsdisableenv'
+      # Rails specs
+      sh 'appraisal rails30-postgres rake spec:rails'
+      sh 'appraisal rails32-mysql2 rake spec:rails'
+      sh 'appraisal rails32-postgres rake spec:rails'
+    end
+  elsif '2.0.0' <= RUBY_VERSION && RUBY_VERSION < '2.1.0'
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib-old rake test:aws'
+      sh 'appraisal contrib-old rake test:elasticsearch'
+      sh 'appraisal contrib-old rake test:http'
+      sh 'appraisal contrib-old rake test:mongodb'
+      sh 'appraisal contrib-old rake test:monkey'
+      sh 'appraisal contrib-old rake test:rack'
+      sh 'appraisal contrib-old rake test:resque'
+      sh 'appraisal contrib-old rake test:sinatra'
+      sh 'appraisal contrib-old rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib-old rake spec:active_record'
+      sh 'appraisal contrib-old rake spec:active_support'
+      sh 'appraisal contrib-old rake spec:dalli'
+      sh 'appraisal contrib-old rake spec:faraday'
+      sh 'appraisal contrib-old rake spec:http'
+      sh 'appraisal contrib-old rake spec:redis'
+      # Rails minitests
+      sh 'appraisal contrib-old rake test:sidekiq'
+      sh 'appraisal rails30-postgres rake test:rails'
+      sh 'appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'appraisal rails32-mysql2 rake test:rails'
+      sh 'appraisal rails32-postgres rake test:rails'
+      sh 'appraisal rails32-postgres-redis rake test:railsredis'
+      sh 'appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'appraisal rails30-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails32-postgres-sidekiq rake test:railssidekiq'
+      # Rails specs
+      sh 'appraisal rails30-postgres rake spec:rails'
+      sh 'appraisal rails32-mysql2 rake spec:rails'
+      sh 'appraisal rails32-postgres rake spec:rails'
+    end
+  elsif '2.1.0' <= RUBY_VERSION && RUBY_VERSION < '2.2.0'
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib-old rake test:aws'
+      sh 'appraisal contrib-old rake test:elasticsearch'
+      sh 'appraisal contrib-old rake test:http'
+      sh 'appraisal contrib-old rake test:mongodb'
+      sh 'appraisal contrib-old rake test:monkey'
+      sh 'appraisal contrib-old rake test:rack'
+      sh 'appraisal contrib-old rake test:resque'
+      sh 'appraisal contrib-old rake test:sinatra'
+      sh 'appraisal contrib-old rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib-old rake spec:active_record'
+      sh 'appraisal contrib-old rake spec:active_support'
+      sh 'appraisal contrib-old rake spec:dalli'
+      sh 'appraisal contrib-old rake spec:faraday'
+      sh 'appraisal contrib-old rake spec:http'
+      sh 'appraisal contrib-old rake spec:redis'
+      # Rails minitests
+      sh 'appraisal contrib-old rake test:sidekiq'
+      sh 'appraisal rails30-postgres rake test:rails'
+      sh 'appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'appraisal rails32-mysql2 rake test:rails'
+      sh 'appraisal rails32-postgres rake test:rails'
+      sh 'appraisal rails32-postgres-redis rake test:railsredis'
+      sh 'appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'appraisal rails4-mysql2 rake test:rails'
+      sh 'appraisal rails4-postgres rake test:rails'
+      sh 'appraisal rails4-postgres-redis rake test:railsredis'
+      sh 'appraisal rails4-postgres rake test:railsdisableenv'
+      sh 'appraisal rails30-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails32-postgres-sidekiq rake test:railssidekiq'
+      # Rails specs
+      sh 'appraisal rails30-postgres rake spec:rails'
+      sh 'appraisal rails32-mysql2 rake spec:rails'
+      sh 'appraisal rails32-postgres rake spec:rails'
+      sh 'appraisal rails4-mysql2 rake spec:rails'
+      sh 'appraisal rails4-postgres rake spec:rails'
+    end
+  elsif '2.2.0' <= RUBY_VERSION && RUBY_VERSION < '2.3.0'
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib rake test:aws'
+      sh 'appraisal contrib rake test:elasticsearch'
+      sh 'appraisal contrib rake test:grape'
+      sh 'appraisal contrib rake test:http'
+      sh 'appraisal contrib rake test:mongodb'
+      sh 'appraisal contrib rake test:rack'
+      sh 'appraisal contrib rake test:resque'
+      sh 'appraisal contrib rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib rake spec:active_record'
+      sh 'appraisal contrib rake spec:active_support'
+      sh 'appraisal contrib rake spec:dalli'
+      sh 'appraisal contrib rake spec:faraday'
+      sh 'appraisal contrib rake spec:graphql'
+      sh 'appraisal contrib rake spec:http'
+      sh 'appraisal contrib rake spec:racecar'
+      sh 'appraisal contrib rake spec:redis'
+      # Rails minitests
+      sh 'appraisal contrib rake test:sidekiq'
+      sh 'appraisal rails30-postgres rake test:rails'
+      sh 'appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'appraisal rails32-mysql2 rake test:rails'
+      sh 'appraisal rails32-postgres rake test:rails'
+      sh 'appraisal rails32-postgres-redis rake test:railsredis'
+      sh 'appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'appraisal rails4-mysql2 rake test:rails'
+      sh 'appraisal rails4-postgres rake test:rails'
+      sh 'appraisal rails4-postgres-redis rake test:railsredis'
+      sh 'appraisal rails4-postgres rake test:railsdisableenv'
+      sh 'appraisal rails4-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails4-postgres-sidekiq rake test:railsactivejob'
+      sh 'appraisal rails5-mysql2 rake test:rails'
+      sh 'appraisal rails5-postgres rake test:rails'
+      sh 'appraisal rails5-postgres-redis rake test:railsredis'
+      sh 'appraisal rails5-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails5-postgres-sidekiq rake test:railsactivejob'
+      sh 'appraisal rails5-postgres rake test:railsdisableenv'
+      # Rails specs
+      sh 'appraisal rails30-postgres rake spec:rails'
+      sh 'appraisal rails32-mysql2 rake spec:rails'
+      sh 'appraisal rails32-postgres rake spec:rails'
+      sh 'appraisal rails4-mysql2 rake spec:rails'
+      sh 'appraisal rails4-postgres rake spec:rails'
+      sh 'appraisal rails5-mysql2 rake spec:rails'
+      sh 'appraisal rails5-postgres rake spec:rails'
+    end
+  elsif '2.3.0' <= RUBY_VERSION && RUBY_VERSION < '2.4.0'
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib rake test:aws'
+      sh 'appraisal contrib rake test:elasticsearch'
+      sh 'appraisal contrib rake test:grape'
+      sh 'appraisal contrib rake test:http'
+      sh 'appraisal contrib rake test:mongodb'
+      sh 'appraisal contrib rake test:rack'
+      sh 'appraisal contrib rake test:resque'
+      sh 'appraisal contrib rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib rake spec:active_record'
+      sh 'appraisal contrib rake spec:active_support'
+      sh 'appraisal contrib rake spec:dalli'
+      sh 'appraisal contrib rake spec:faraday'
+      sh 'appraisal contrib rake spec:graphql'
+      sh 'appraisal contrib rake spec:graphql'
+      sh 'appraisal contrib rake spec:racecar'
+      sh 'appraisal contrib rake spec:redis'
+      # Rails minitests
+      sh 'appraisal contrib rake test:sidekiq'
+      sh 'appraisal rails30-postgres rake test:rails'
+      sh 'appraisal rails30-postgres rake test:railsdisableenv'
+      sh 'appraisal rails32-mysql2 rake test:rails'
+      sh 'appraisal rails32-postgres rake test:rails'
+      sh 'appraisal rails32-postgres-redis rake test:railsredis'
+      sh 'appraisal rails32-postgres rake test:railsdisableenv'
+      sh 'appraisal rails4-mysql2 rake test:rails'
+      sh 'appraisal rails4-postgres rake test:rails'
+      sh 'appraisal rails4-postgres-redis rake test:railsredis'
+      sh 'appraisal rails4-postgres rake test:railsdisableenv'
+      sh 'appraisal rails4-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails4-postgres-sidekiq rake test:railsactivejob'
+      sh 'appraisal rails5-mysql2 rake test:rails'
+      sh 'appraisal rails5-postgres rake test:rails'
+      sh 'appraisal rails5-postgres-redis rake test:railsredis'
+      sh 'appraisal rails5-postgres-sidekiq rake test:railssidekiq'
+      sh 'appraisal rails5-postgres-sidekiq rake test:railsactivejob'
+      sh 'appraisal rails5-postgres rake test:railsdisableenv'
+      # Rails specs
+      sh 'appraisal rails30-postgres rake spec:rails'
+      sh 'appraisal rails32-mysql2 rake spec:rails'
+      sh 'appraisal rails32-postgres rake spec:rails'
+      sh 'appraisal rails4-mysql2 rake spec:rails'
+      sh 'appraisal rails4-postgres rake spec:rails'
+      sh 'appraisal rails5-mysql2 rake spec:rails'
+      sh 'appraisal rails5-postgres rake spec:rails'
+    end
+  elsif '2.4.0' <= RUBY_VERSION
+    # Main library
+    sh 'rake test:main'
+    sh 'rake spec:main'
+
+    if RUBY_PLATFORM != 'java'
+      # Contrib minitests
+      sh 'appraisal contrib rake test:aws'
+      sh 'appraisal contrib rake test:elasticsearch'
+      sh 'appraisal contrib rake test:grape'
+      sh 'appraisal contrib rake test:http'
+      sh 'appraisal contrib rake test:mongodb'
+      sh 'appraisal contrib rake test:rack'
+      sh 'appraisal contrib rake test:resque'
+      sh 'appraisal contrib rake test:sucker_punch'
+      # Contrib specs
+      sh 'appraisal contrib rake spec:active_record'
+      sh 'appraisal contrib rake spec:active_support'
+      sh 'appraisal contrib rake spec:dalli'
+      sh 'appraisal contrib rake spec:faraday'
+      sh 'appraisal contrib rake spec:graphql'
+      sh 'appraisal contrib rake spec:graphql'
+      sh 'appraisal contrib rake spec:racecar'
+      sh 'appraisal contrib rake spec:redis'
+      # Rails minitests
+      sh 'appraisal contrib rake test:sidekiq'
+      sh 'rake benchmark'
+    end
   end
 end
 

data/ddtrace.gemspec

@@ -6,17 +6,17 @@ require 'ddtrace/version'
 
 Gem::Specification.new do |spec|
   spec.name                  = 'ddtrace'
-  spec.version               = "#{Datadog::VERSION::STRING}#{ENV['VERSION_SUFFIX']}"
+  spec.version               = Datadog::VERSION::STRING
   spec.required_ruby_version = '>= 1.9.1'
   spec.authors               = ['Datadog, Inc.']
   spec.email                 = ['dev@datadoghq.com']
 
   spec.summary     = 'Datadog tracing code for your Ruby applications'
-  spec.description = <<-EOS
-ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
-as they flow across web servers, databases and microservices so that developers
-have great visiblity into bottlenecks and troublesome requests.
-EOS
+  spec.description = <<-EOS.gsub(/^[\s]+/, '')
+    ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
+    as they flow across web servers, databases and microservices so that developers
+    have great visiblity into bottlenecks and troublesome requests.
+  EOS
 
   spec.homepage = 'https://github.com/DataDog/dd-trace-rb'
   spec.license  = 'BSD-3-Clause'

data/docker-compose.yml

@@ -1,52 +1,237 @@
-# remember to use this compose file __ONLY__ for development/testing purposes
-postgres:
-    image: postgres:9.6
+version: '3.2'
+services:
+  tracer-1.9:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-1.9.3
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
     environment:
-        - POSTGRES_PASSWORD=$TEST_POSTGRES_PASSWORD
-        - POSTGRES_USER=$TEST_POSTGRES_USER
-        - POSTGRES_DB=$TEST_POSTGRES_DB
-    ports:
-        - "127.0.0.1:${TEST_POSTGRES_PORT}:5432"
-
-mysql:
-    image: mysql:5.6
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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-1.9:/usr/local/bundle
+  tracer-2.0:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-2.0.0
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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.0:/usr/local/bundle
+  tracer-2.1:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-2.1.10
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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.1:/usr/local/bundle
+  tracer-2.2:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-2.2.10
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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.2:/usr/local/bundle
+  tracer-2.3:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-2.3.7
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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.3:/usr/local/bundle
+  tracer-2.4:
+    build:
+      context: ./.circleci/images/primary
+      dockerfile: Dockerfile-2.4.4
+    command: /bin/bash
+    depends_on:
+      - ddagent
+      - elasticsearch
+      - memcached
+      - mongodb
+      - mysql
+      - postgres
+      - redis
+    env_file: ./.env
+    environment:
+      - TEST_DATADOG_INTEGRATION=1
+      - TEST_DDAGENT_HOST=ddagent
+      - 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.4:/usr/local/bundle
+  ddagent:
+    image: datadog/docker-dd-agent
     environment:
-        - MYSQL_ROOT_PASSWORD=$TEST_MYSQL_ROOT_PASSWORD
-        - MYSQL_PASSWORD=$TEST_MYSQL_PASSWORD
-        - MYSQL_USER=$TEST_MYSQL_USER
+      - DD_APM_ENABLED=true
+      - DD_BIND_HOST=0.0.0.0
+      - DD_API_KEY=invalid_key_but_this_is_fine
+    expose:
+      - "8126"
     ports:
-        - "127.0.0.1:${TEST_MYSQL_PORT}:3306"
-
-elasticsearch:
+      - "${TEST_DDAGENT_PORT}:8126"
+  elasticsearch:
     # Note: ES 5.0 dies with error:
     # max virtual memory areas vm.max_map_count [65530] is too low, increase to at least [262144]
     # see https://github.com/docker-library/elasticsearch/issues/98 for details
     # For now, just rely on a 2.X server.
     image: elasticsearch:2.4
+    expose:
+      - "9200"
+      - "9300"
     ports:
-        - "127.0.0.1:${TEST_ELASTICSEARCH_REST_PORT}:9200"
-        - "127.0.0.1:${TEST_ELASTICSEARCH_NATIVE_PORT}:9300"
-
-redis:
-    image: redis:3.0
+      - "${TEST_ELASTICSEARCH_REST_PORT}:9200"
+      - "${TEST_ELASTICSEARCH_NATIVE_PORT}:9300"
+  memcached:
+    image: memcached:1.5-alpine
+    expose:
+      - "11211"
     ports:
-        - "127.0.0.1:${TEST_REDIS_PORT}:6379"
-
-mongodb:
+      - "${TEST_MEMCACHED_PORT}:11211"
+  mongodb:
     image: mongo:3.5
+    expose:
+      - "27017"
     ports:
-        - "127.0.0.1:${TEST_MONGODB_PORT}:27017"
-
-memcached:
-    image: memcached:1.5-alpine
+      - "${TEST_MONGODB_PORT}:27017"
+  mysql:
+    image: mysql:5.6
+    environment:
+      - MYSQL_ROOT_PASSWORD=$TEST_MYSQL_ROOT_PASSWORD
+      - MYSQL_PASSWORD=$TEST_MYSQL_PASSWORD
+      - MYSQL_USER=$TEST_MYSQL_USER
+    expose:
+      - "3306"
     ports:
-        - "127.0.0.1:${TEST_MEMCACHED_PORT}:11211"
-
-ddagent:
-    image: datadog/docker-dd-agent
+      - "${TEST_MYSQL_PORT}:3306"
+  postgres:
+    image: postgres:9.6
     environment:
-        - DD_APM_ENABLED=true
-        - DD_BIND_HOST=0.0.0.0
-        - DD_API_KEY=invalid_key_but_this_is_fine
+      - POSTGRES_PASSWORD=$TEST_POSTGRES_PASSWORD
+      - POSTGRES_USER=$TEST_POSTGRES_USER
+      - POSTGRES_DB=$TEST_POSTGRES_DB
+    expose:
+      - "5432"
+    ports:
+      - "${TEST_POSTGRES_PORT}:5432"
+  redis:
+    image: redis:3.0
+    expose:
+      - "6379"
     ports:
-        - "127.0.0.1:8126:8126"
+      - "${TEST_REDIS_PORT}:6379"
+volumes:
+  bundle-1.9:
+  bundle-2.0:
+  bundle-2.1:
+  bundle-2.2:
+  bundle-2.3:
+  bundle-2.4: