ddtrace 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80f9cffb7ec1f57e9215784dd53d859b6a9ffae7
-  data.tar.gz: 348d67544886fa8762b2c2125dd8033a766d5f62
+  metadata.gz: c166ccd4553aa6b0a63817846b4aca66a7d74f92
+  data.tar.gz: bd1cdacc971045e137b14a5714d0659747e442f2
 SHA512:
-  metadata.gz: e6795138d773ce92ba5123d9fbbe42a84c49a66800a9ab2a487f5c73900059b5197dbae0768e055fd11b9990fed3e1c812cf5f0637c87de7f7b56fa0ec1ba242
-  data.tar.gz: 1658c85972eb0be8ecc6941382558623d2ba54407e3d28874efe5c6e0936510e108512ee6314cf8d483796a903e71af77a4b47057441d2ff25e35e3174c4dfc5
+  metadata.gz: 94e7ee6857c01885d16ada253e8d6cab86704c321e8fa114e6a7fbfb716e940d5aaad62261f9486b44ecb2cdc01bd7992e0dd8d6473c23758c82d8a909344d5e
+  data.tar.gz: 338c3d27571dc226d6c8dede32fb497b90a6a67d7985542fb74b1f0c0dd2d40e9e914eb50e64bd85dfb2c559fe97cdcca7cbccf12c0d36a8ceab444e4009b614

data/.rubocop.yml

@@ -50,3 +50,8 @@ Metrics/PerceivedComplexity:
 
 Lint/UnusedMethodArgument:
     Enabled: false
+
+# Disabling advices that would lead to incompatible Ruby 1.9 code
+Style/SymbolArray:
+  Enabled: false
+

data/Appraisals

@@ -1,90 +1,113 @@
-if RUBY_VERSION < "2.4.0"
-  appraise "rails3-postgres" do
-    gem "test-unit"
-    gem "rails", "3.2.22.5"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+if RUBY_VERSION < '2.4.0'
+  if RUBY_VERSION >= '1.9.1'
+    appraise 'rails3-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
+    end
   end
 
-  appraise "rails4-postgres" do
-    gem "rails", "4.2.7.1"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-  end
+  if RUBY_VERSION >= '1.9.1'
+    appraise 'rails3-postgres' do
+      gem 'test-unit'
+      gem 'rails', '3.2.22.5'
+      gem 'pg', '0.15.1', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    end
 
-  appraise "rails3-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
-  end
+    appraise 'rails3-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'
+    end
 
-  appraise "rails4-mysql2" do
-    gem "rails", "4.2.7.1"
-    gem "mysql2", platform: :ruby
-    gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+    appraise 'rails3-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'
+    end
   end
 
-  appraise "rails3-postgres-redis" do
-    gem "test-unit"
-    gem "rails", "3.2.22.5"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    gem "redis-rails"
-  end
+  if RUBY_VERSION >= '2.1.10'
+    appraise 'rails4-mysql2' do
+      gem 'rails', '4.2.7.1'
+      gem 'mysql2', platform: :ruby
+      gem 'activerecord-jdbcmysql-adapter', platform: :jruby
+    end
 
-  appraise "rails4-postgres-redis" do
-    gem "rails", "4.2.7.1"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    gem "redis-rails"
-  end
-  appraise "rails3-postgres-sidekiq" do
-    gem "test-unit"
-    gem "rails", "3.2.22.5"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    gem "sidekiq"
-  end
+    appraise 'rails4-postgres' do
+      gem 'rails', '4.2.7.1'
+      gem 'pg', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+    end
+
+    appraise 'rails4-postgres-redis' do
+      gem 'rails', '4.2.7.1'
+      gem 'pg', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+      gem 'redis-rails'
+    end
 
-  appraise "rails4-postgres-sidekiq" do
-    gem "rails", "4.2.7.1"
-    gem "pg", platform: :ruby
-    gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
-    gem "sidekiq"
+    appraise 'rails4-postgres-sidekiq' do
+      gem 'rails', '4.2.7.1'
+      gem 'pg', platform: :ruby
+      gem 'activerecord-jdbcpostgresql-adapter', platform: :jruby
+      gem 'sidekiq'
+      gem 'activejob'
+    end
   end
 
-  if RUBY_VERSION >= "2.2.2" && RUBY_PLATFORM != "java"
-    appraise "rails5-postgres" do
-      gem "rails", "5.0.1"
-      gem "pg", platform: :ruby
+  if RUBY_VERSION >= '2.2.2' && RUBY_PLATFORM != 'java'
+    appraise 'rails5-mysql2' do
+      gem 'rails', '5.0.1'
+      gem 'mysql2', platform: :ruby
     end
 
-    appraise "rails5-mysql2" do
-      gem "rails", "5.0.1"
-      gem "mysql2", platform: :ruby
+    appraise 'rails5-postgres' do
+      gem 'rails', '5.0.1'
+      gem 'pg', platform: :ruby
     end
 
-    appraise "rails5-postgres-redis" do
-      gem "rails", "5.0.1"
-      gem "pg", platform: :ruby
-      gem "redis-rails"
+    appraise 'rails5-postgres-redis' do
+      gem 'rails', '5.0.1'
+      gem 'pg', platform: :ruby
+      gem 'redis-rails'
     end
 
-    appraise "rails5-postgres-sidekiq" do
-      gem "rails", "5.0.1"
-      gem "pg", platform: :ruby
-      gem "sidekiq"
+    appraise 'rails5-postgres-sidekiq' do
+      gem 'rails', '5.0.1'
+      gem 'pg', platform: :ruby
+      gem 'sidekiq'
+      gem "activejob"
     end
   end
 end
 
-appraise "contrib" do
-  gem "elasticsearch-transport"
-  gem "redis"
-  gem "hiredis"
-  gem "rack-test"
-  gem "sinatra"
-  gem "sidekiq"
+if RUBY_VERSION >= '2.2.2'
+  appraise 'contrib' do
+    gem 'elasticsearch-transport'
+    gem 'redis'
+    gem 'hiredis'
+    gem 'rack-test'
+    gem 'sinatra'
+    gem 'activerecord'
+    gem 'sidekiq'
+  end
+else
+  appraise 'contrib-old' do
+    gem 'elasticsearch-transport'
+    gem 'redis'
+    gem 'hiredis'
+    gem 'rack-test', '0.6.2'
+    gem 'rack', '1.4.7'
+    gem 'sinatra', '1.4.5'
+    gem 'activerecord', '3.2.22.5'
+    gem 'sidekiq', '4.0.0'
+  end
 end

data/Rakefile

@@ -1,12 +1,14 @@
 require 'bundler/gem_tasks'
 require 'ddtrace/version'
-require 'rubocop/rake_task'
+require 'rubocop/rake_task' if RUBY_VERSION >= '2.1.0'
 require 'rake/testtask'
 require 'appraisal'
 require 'yard'
 
 namespace :test do
-  task all: [:main, :rails, :railsredis, :elasticsearch, :http, :redis, :sidekiq, :sinatra, :monkey]
+  task all: [:main,
+             :rails, :railsredis, :railssidekiq, :railsactivejob,
+             :elasticsearch, :http, :redis, :sidekiq, :sinatra, :monkey]
 
   Rake::TestTask.new(:main) do |t|
     t.libs << %w(test lib)
@@ -22,7 +24,8 @@ namespace :test do
     t.libs << %w(test lib)
     t.test_files = FileList['test/contrib/rails/**/*_test.rb'].reject do |path|
       path.include?('redis') ||
-        path.include?('sidekiq')
+        path.include?('sidekiq') ||
+        path.include?('active_job')
     end
   end
 
@@ -36,6 +39,11 @@ namespace :test do
     t.test_files = FileList['test/contrib/rails/**/*sidekiq*_test.rb']
   end
 
+  Rake::TestTask.new(:railsactivejob) do |t|
+    t.libs << %w(test lib)
+    t.test_files = FileList['test/contrib/rails/**/*active_job*_test.rb']
+  end
+
   [:elasticsearch, :http, :redis, :sinatra, :sidekiq].each do |contrib|
     Rake::TestTask.new(contrib) do |t|
       t.libs << %w(test lib)
@@ -54,9 +62,11 @@ Rake::TestTask.new(:benchmark) do |t|
   t.test_files = FileList['test/benchmark_test.rb']
 end
 
-RuboCop::RakeTask.new(:rubocop) do |t|
-  t.options << ['-D']
-  t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'Gemfile', 'Rakefile']
+if RUBY_VERSION >= '2.1.0'
+  RuboCop::RakeTask.new(:rubocop) do |t|
+    t.options << ['-D']
+    t.patterns = ['lib/**/*.rb', 'test/**/*.rb', 'Gemfile', 'Rakefile']
+  end
 end
 
 YARD::Rake::YardocTask.new(:docs) do |t|
@@ -113,7 +123,7 @@ task :ci do
   # check: https://circleci.com/docs/parallel-manual-setup/#env-splitting
   case ENV['CIRCLE_NODE_INDEX'].to_i
   when 0
-    sh 'rvm $MRI_VERSIONS --verbose do rake test:main'
+    sh 'rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do rake test:main'
     sh 'rvm $LAST_STABLE --verbose do rake benchmark'
   when 1
     sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:monkey'
@@ -122,19 +132,28 @@ task :ci do
     sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:redis'
     sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:sinatra'
     sh 'rvm $MRI_VERSIONS --verbose do appraisal contrib rake test:sidekiq'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails3-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails4-postgres-sidekiq rake test:railssidekiq'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres-sidekiq rake test:railssidekiq'
+    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:redis'
+    sh 'rvm $MRI_OLD_VERSIONS --verbose do appraisal contrib-old rake test:sinatra'
+    sh 'rvm $SIDEKIQ_OLD_VERSIONS --verbose do appraisal contrib-old rake test:sidekiq'
   when 2
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails3-postgres rake test:rails'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails3-mysql2 rake test:rails'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails4-postgres rake test:rails'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails4-mysql2 rake test:rails'
-    sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-postgres rake test:rails'
+    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails3-mysql2 rake test:rails'
+    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails3-postgres rake test:rails'
+    sh 'rvm $RAILS3_VERSIONS --verbose do appraisal rails3-postgres-redis rake test:railsredis'
+    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'
+    # Test Rails3/Sidekiq with Rails4 versions (3 vs 4) as Sidekiq requires >= 2.0 and Rails3 should support 1.9
+    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails3-postgres-sidekiq rake test:railssidekiq'
+    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres-sidekiq rake test:railssidekiq'
+    sh 'rvm $RAILS4_VERSIONS --verbose do appraisal rails4-postgres-sidekiq rake test:railsactivejob'
     sh 'rvm $RAILS5_VERSIONS --verbose do appraisal rails5-mysql2 rake test:rails'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails3-postgres-redis rake test:railsredis'
-    sh 'rvm $RAILS_VERSIONS --verbose do appraisal rails4-postgres-redis rake test:railsredis'
+    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'
   else
     puts 'Too many workers than parallel tasks'
   end

data/circle.yml

@@ -4,9 +4,12 @@ machine:
   environment:
     # FIXME: Disabled $JRUBY_VERSIONS tests because of a Java incompatibility
     LAST_STABLE: 2.4.0
-    EARLY_STABLE: 2.1.10
-    MRI_VERSIONS: 2.4.0,2.3.3,2.2.6,2.1.10
-    RAILS_VERSIONS: 2.3.3,2.2.6,2.1.10
+    EARLY_STABLE: 2.2.6
+    MRI_VERSIONS: 2.4.0,2.3.3,2.2.6
+    MRI_OLD_VERSIONS: 2.1.10,2.0.0,1.9.3
+    SIDEKIQ_OLD_VERSIONS: 2.1.10,2.0.0
+    RAILS3_VERSIONS: 2.3.3,2.2.6,2.1.10,2.0.0,1.9.3
+    RAILS4_VERSIONS: 2.3.3,2.2.6,2.1.10
     RAILS5_VERSIONS: 2.3.3,2.2.6
     AGENT_BUILD_PATH: "/home/ubuntu/agent"
     TEST_DATADOG_INTEGRATION: 1
@@ -29,10 +32,10 @@ dependencies:
     - rvm get head
     - rvm install $MRI_VERSIONS
   override:
-    - rvm $MRI_VERSIONS --verbose do gem update --system
-    - rvm $MRI_VERSIONS --verbose do gem install bundler
-    - rvm $MRI_VERSIONS --verbose do bundle install
-    - rvm $MRI_VERSIONS --verbose do appraisal install
+    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do gem update --system
+    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do gem install bundler
+    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do bundle install
+    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do appraisal install
 
 test:
   override:

data/ddtrace.gemspec

@@ -4,38 +4,38 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ddtrace/version'
 
 Gem::Specification.new do |spec|
-  spec.name                  = "ddtrace"
+  spec.name                  = 'ddtrace'
   spec.version               = "#{Datadog::VERSION::STRING}#{ENV['VERSION_SUFFIX']}"
-  spec.required_ruby_version = '>= 2.1.0'
-  spec.authors               = ["Datadog, Inc."]
-  spec.email                 = ["dev@datadoghq.com"]
+  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.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.homepage = "https://github.com/DataDog/dd-trace-rb"
-  spec.license  = "BSD-3-Clause"
+  spec.homepage = 'https://github.com/DataDog/dd-trace-rb'
+  spec.license  = 'BSD-3-Clause'
 
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
   else
-    raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "msgpack"
+  spec.add_dependency 'msgpack'
 
-  spec.add_development_dependency "rake", "~> 12.0"
-  spec.add_development_dependency "rubocop", "~> 0.47"
-  spec.add_development_dependency "minitest", "~> 5.10"
-  spec.add_development_dependency "appraisal", "~> 2.1"
-  spec.add_development_dependency "yard", "~> 0.9"
+  spec.add_development_dependency 'rake', '~> 10.5'
+  spec.add_development_dependency('rubocop', '~> 0.47') if RUBY_VERSION >= '2.1.0'
+  spec.add_development_dependency 'minitest', '~> 5.10'
+  spec.add_development_dependency 'appraisal', '~> 2.1'
+  spec.add_development_dependency 'yard', '~> 0.9'
 end

data/docs/GettingStarted.md

@@ -403,6 +403,9 @@ overhead.
 
 The Datadog Trace Client has been tested with the following Ruby versions:
 
+* Ruby MRI 1.9.1 (experimental)
+* Ruby MRI 1.9.3
+* Ruby MRI 2.0
 * Ruby MRI 2.1
 * Ruby MRI 2.2
 * Ruby MRI 2.3

data/gemfiles/contrib.gemfile

@@ -7,6 +7,7 @@ gem "redis"
 gem "hiredis"
 gem "rack-test"
 gem "sinatra"
+gem "activerecord"
 gem "sidekiq"
 
 gemspec :path => "../"

data/gemfiles/contrib_old.gemfile

@@ -0,0 +1,14 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "elasticsearch-transport"
+gem "redis"
+gem "hiredis"
+gem "rack-test", "0.6.2"
+gem "rack", "1.4.7"
+gem "sinatra", "1.4.5"
+gem "activerecord", "3.2.22.5"
+gem "sidekiq", "4.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails3_postgres.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "test-unit"
 gem "rails", "3.2.22.5"
-gem "pg", :platform => :ruby
+gem "pg", "0.15.1", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
 
 gemspec :path => "../"

data/gemfiles/rails3_postgres_redis.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "test-unit"
 gem "rails", "3.2.22.5"
-gem "pg", :platform => :ruby
+gem "pg", "0.15.1", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
 gem "redis-rails"
 

data/gemfiles/rails3_postgres_sidekiq.gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gem "test-unit"
 gem "rails", "3.2.22.5"
-gem "pg", :platform => :ruby
+gem "pg", "0.15.1", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
 gem "sidekiq"
 

data/gemfiles/rails4_postgres_sidekiq.gemfile

@@ -6,5 +6,6 @@ gem "rails", "4.2.7.1"
 gem "pg", :platform => :ruby
 gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
 gem "sidekiq"
+gem "activejob"
 
 gemspec :path => "../"

data/gemfiles/rails5_postgres_sidekiq.gemfile

@@ -5,5 +5,6 @@ source "https://rubygems.org"
 gem "rails", "5.0.1"
 gem "pg", :platform => :ruby
 gem "sidekiq"
+gem "activejob"
 
 gemspec :path => "../"

data/lib/ddtrace/contrib/elasticsearch/patcher.rb

@@ -3,6 +3,14 @@
 module Datadog
   module Contrib
     module Elasticsearch
+      URL = 'elasticsearch.url'.freeze
+      METHOD = 'elasticsearch.method'.freeze
+      PARAMS = 'elasticsearch.params'.freeze
+      BODY = 'elasticsearch.body'.freeze
+
+      SERVICE = 'elasticsearch'.freeze
+      SPAN_TYPE = 'elasticsearch'.freeze
+
       # Patcher enables patching of 'elasticsearch/transport' module.
       # This is used in monkey.rb to automatically apply patches
       module Patcher
@@ -15,8 +23,15 @@ module Datadog
           if !@patched && (defined?(::Elasticsearch::Transport::VERSION) && \
                            Gem::Version.new(::Elasticsearch::Transport::VERSION) >= Gem::Version.new('1.0.0'))
             begin
-              require 'ddtrace/contrib/elasticsearch/core'
-              ::Elasticsearch::Transport::Client.prepend Datadog::Contrib::Elasticsearch::TracedClient
+              require 'uri'
+              require 'json'
+              require 'ddtrace/monkey'
+              require 'ddtrace/pin'
+              require 'ddtrace/ext/app_types'
+              require 'ddtrace/contrib/elasticsearch/quantize'
+
+              patch_elasticsearch_transport_client()
+
               @patched = true
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Elastic Search integration: #{e}")
@@ -25,6 +40,63 @@ module Datadog
           @patched
         end
 
+        # rubocop:disable Metrics/MethodLength
+        def patch_elasticsearch_transport_client
+          ::Elasticsearch::Transport::Client.class_eval do
+            alias_method :initialize_without_datadog, :initialize
+            Datadog::Monkey.without_warnings do
+              remove_method :initialize
+            end
+
+            def initialize(*args)
+              pin = Datadog::Pin.new(SERVICE, app: 'elasticsearch', app_type: Datadog::Ext::AppTypes::DB)
+              pin.onto(self)
+              initialize_without_datadog(*args)
+            end
+
+            alias_method :perform_request_without_datadog, :perform_request
+            remove_method :perform_request
+
+            def perform_request(*args)
+              pin = Datadog::Pin.get_from(self)
+              return perform_request_without_datadog(*args) unless pin && pin.tracer
+
+              method = args[0]
+              path = args[1]
+              params = args[2]
+              body = args[3]
+              full_url = URI.parse(path)
+
+              url = full_url.path
+              response = nil
+              pin.tracer.trace('elasticsearch.query') do |span|
+                begin
+                  span.service = pin.service
+                  span.span_type = SPAN_TYPE
+
+                  # load JSON for the following fields unless they're already strings
+                  params = JSON.generate(params) if params && !params.is_a?(String)
+                  body = JSON.generate(body) if body && !body.is_a?(String)
+
+                  span.set_tag(METHOD, method)
+                  span.set_tag(URL, url)
+                  span.set_tag(PARAMS, params) if params
+                  span.set_tag(BODY, body) if body
+
+                  quantized_url = Datadog::Contrib::Elasticsearch::Quantize.format_url(url)
+                  span.resource = "#{method} #{quantized_url}"
+                rescue StandardError => e
+                  Datadog::Tracer.log.error(e.message)
+                ensure
+                  # the call is still executed
+                  response = perform_request_without_datadog(*args)
+                end
+              end
+              response
+            end
+          end
+        end
+
         # patched? tells wether patch has been successfully applied
         def patched?
           @patched

data/lib/ddtrace/contrib/http/patcher.rb

@@ -18,7 +18,7 @@ module Datadog
         # we don't want to trace our own call to the API (they use net/http)
         # when we know the host & port (from the URI) we use it, else (most-likely
         # called with a block) rely on the URL at the end.
-        if req.uri
+        if req.respond_to?(:uri) && req.uri
           if req.uri.host.to_s == transport.hostname.to_s &&
              req.uri.port.to_i == transport.port.to_i
             return true
@@ -96,14 +96,14 @@ module Datadog
                 span.service = pin.service
                 span.span_type = Datadog::Ext::HTTP::TYPE
 
-                span.resource = req.path
-                # *NOT* filling Datadog::Ext::HTTP::URL as it's already in resource.
-                # The agent can then decide to quantize the URL and store the original,
-                # untouched data in http.url but the client should not send redundant fields.
+                span.resource = req.method
+                # Using the method as a resource, as URL/path can trigger
+                # a possibly infinite number of resources.
+                span.set_tag(Datadog::Ext::HTTP::URL, req.path)
                 span.set_tag(Datadog::Ext::HTTP::METHOD, req.method)
                 response = request_without_datadog(req, body, &block)
                 span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.code)
-                if req.uri
+                if req.respond_to?(:uri) && req.uri
                   span.set_tag(Datadog::Ext::NET::TARGET_HOST, req.uri.host)
                   span.set_tag(Datadog::Ext::NET::TARGET_PORT, req.uri.port.to_s)
                 else

data/lib/ddtrace/contrib/rails/action_controller.rb

@@ -51,17 +51,22 @@ module Datadog
             if payload[:exception].nil?
               # [christian] in some cases :status is not defined,
               # rather than firing an error, simply acknowledge we don't know it.
-              span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, payload.fetch(:status, '?').to_s)
+              status = payload.fetch(:status, '?').to_s
+              if status.starts_with?('5')
+                span.status = 1
+                span.set_tag(Datadog::Ext::Errors::STACK, caller().join('\n'))
+              end
+              span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, status)
             else
               error = payload[:exception]
-              # TODO[manu]: it's right to have a 500? there are cases in Rails that let
-              # user to recover the error after this point?
               span.status = 1
               span.set_tag(Datadog::Ext::Errors::TYPE, error[0])
               span.set_tag(Datadog::Ext::Errors::MSG, error[1])
-              span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, '500')
+              span.set_tag(Datadog::Ext::Errors::STACK, caller().join('\n'))
+              # [manu,christian]: it's right to have a 500? there are cases in Rails that let
+              # user to recover the error after this point?
+              span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, payload.fetch(:status, '500').to_s)
             end
-
           ensure
             span.start_time = start
             span.finish_at(finish)

data/lib/ddtrace/contrib/rails/action_view.rb

@@ -81,7 +81,6 @@ module Datadog
               span.set_tag(Datadog::Ext::Errors::TYPE, error[0])
               span.set_tag(Datadog::Ext::Errors::MSG, error[1])
             end
-
           ensure
             span.start_time = start
             span.finish_at(finish)
@@ -110,7 +109,6 @@ module Datadog
               span.set_tag(Datadog::Ext::Errors::TYPE, error[0])
               span.set_tag(Datadog::Ext::Errors::MSG, error[1])
             end
-
           ensure
             span.start_time = start
             span.finish_at(finish)

data/lib/ddtrace/contrib/rails/active_record.rb

@@ -31,11 +31,20 @@ module Datadog
             span_type: span_type
           )
 
+          # find out if the SQL query has been cached in this request. This meta is really
+          # helpful to users because some spans may have 0ns of duration because the query
+          # is simply cached from memory, so the notification is fired with start == finish.
+          # TODO[manu]: this feature has been merged into master but has not yet released.
+          # We're supporting this action as a best effort, but we should add a test after
+          # a new version of Rails is out.
+          cached = payload[:cached]
+
           # the span should have the query ONLY in the Resource attribute,
           # so that the ``sql.query`` tag will be set in the agent with an
           # obfuscated version
           span.span_type = Datadog::Ext::SQL::TYPE
           span.set_tag('rails.db.vendor', adapter_name)
+          span.set_tag('rails.db.cached', cached) if cached
           span.start_time = start
           span.finish_at(finish)
         rescue StandardError => e

data/lib/ddtrace/contrib/rails/active_support.rb

@@ -104,7 +104,6 @@ module Datadog
               span.set_tag(Datadog::Ext::Errors::TYPE, error[0])
               span.set_tag(Datadog::Ext::Errors::MSG, error[1])
             end
-
           ensure
             span.start_time = start
             span.finish_at(finish)

data/lib/ddtrace/contrib/rails/core_extensions.rb

@@ -1,106 +1,112 @@
 module Datadog
-  # TODO[manu]: write docs
-  module RendererExtension
-    def render_template(*args)
-      ActiveSupport::Notifications.instrument('start_render_template.action_view')
-      super(*args)
-    end
-  end
-
-  # TODO[manu]: write docs
-  module PartialRendererExtension
-    def render_partial(*args)
-      ActiveSupport::Notifications.instrument('start_render_partial.action_view')
-      super(*args)
-    end
-  end
-
-  # CacheStoreReadExtension contains a new read function that notifies
-  # the framework of a read, then calls read.
-  module CacheStoreReadExtension
-    def read(*args)
-      ActiveSupport::Notifications.instrument('start_cache_read.active_support')
-      super(*args)
-    end
-  end
-
-  # CacheStoreFetchExtension contains a new fetch function that notifies
-  # the framework of a fetch, then calls fetch.
-  module CacheStoreFetchExtension
-    # It might seem redundant to instrument both read and fetch since
-    # fetch very often calls read. But there's no garantee of this, in
-    # some cases fetch can call directly read_entry without calling read.
-    def fetch(*args)
-      ActiveSupport::Notifications.instrument('start_cache_fetch.active_support')
-      super(*args)
-    end
-  end
+  # RailsPatcher contains function to patch the Rails libraries.
+  module RailsPatcher
+    module_function
 
-  # CacheWriteReadExtension contains a new read function that notifies
-  # the framework of a write, then calls write.
-  module CacheStoreWriteExtension
-    def write(*args)
-      ActiveSupport::Notifications.instrument('start_cache_write.active_support')
-      super(*args)
+    def patch_renderer
+      patch_renderer_render_template
+      patch_renderer_render_partial
     end
-  end
 
-  # CacheDeleteExtension contains a new read function that notifies
-  # the framework of a delete, then calls delete.
-  module CacheStoreDeleteExtension
-    def delete(*args)
-      ActiveSupport::Notifications.instrument('start_cache_delete.active_support')
-      super(*args)
+    def patch_cache_store
+      patch_cache_store_read
+      patch_cache_store_fetch
+      patch_cache_store_write
+      patch_cache_store_delete
+      patch_cache_store_instrument
     end
-  end
 
-  # CacheInstrumentExtension prepends the instrument function that Rails 3.x uses
-  # to know if the underlying cache should be instrumented or not. By default,
-  # we force that instrumentation if the Rails application is auto instrumented.
-  module CacheInstrumentExtension
-    def instrument
-      true
+    def patch_renderer_render_template
+      ::ActionView::Renderer.class_eval do
+        alias_method :render_template_without_datadog, :render_template
+        def render_template(*args, &block)
+          ActiveSupport::Notifications.instrument('start_render_template.action_view')
+          render_template_without_datadog(*args, &block)
+        end
+      end
     end
-  end
 
-  # RailsPatcher contains function to patch the Rails libraries.
-  module RailsPatcher
-    module_function
-
-    def patch_renderer
-      ::ActionView::Renderer.prepend Datadog::RendererExtension
-      ::ActionView::PartialRenderer.prepend Datadog::PartialRendererExtension
+    def patch_renderer_render_partial
+      ::ActionView::PartialRenderer.class_eval do
+        alias_method :render_partial_without_datadog, :render_partial
+        def render_partial(*args, &block)
+          ActiveSupport::Notifications.instrument('start_render_partial.action_view')
+          render_partial_without_datadog(*args, &block)
+        end
+      end
     end
 
-    def patch_cache_store
+    def cache_store_class(k)
       # When Redis is used, we can't only patch Cache::Store as it is
       # Cache::RedisStore, a sub-class of it that is used, in practice.
       # We need to do a per-method monkey patching as some of them might
       # be redefined, and some of them not. The latest version of redis-activesupport
       # redefines write but leaves untouched read and delete:
       # https://github.com/redis-store/redis-activesupport/blob/master/lib/active_support/cache/redis_store.rb
+      c = if defined?(::ActiveSupport::Cache::RedisStore) &&
+             ::ActiveSupport::Cache::RedisStore.instance_methods(false).include?(k)
+            ::ActiveSupport::Cache::RedisStore
+          else
+            ::ActiveSupport::Cache::Store
+          end
+      c
+    end
 
-      { read: Datadog::CacheStoreReadExtension,
-        fetch: Datadog::CacheStoreFetchExtension,
-        write: Datadog::CacheStoreWriteExtension,
-        delete: Datadog::CacheStoreDeleteExtension }.each do |k, v|
-        c = if defined?(::ActiveSupport::Cache::RedisStore) &&
-               ::ActiveSupport::Cache::RedisStore.instance_methods(false).include?(k)
-              ::ActiveSupport::Cache::RedisStore
-            else
-              ::ActiveSupport::Cache::Store
-            end
-        Datadog::Tracer.log.debug("monkey patching #{c}.#{k} with #{v}.#{k}")
-        c.prepend v
+    def patch_cache_store_read
+      cache_store_class(:read).class_eval do
+        alias_method :read_without_datadog, :read
+        def read(*args, &block)
+          ActiveSupport::Notifications.instrument('start_cache_read.active_support')
+          read_without_datadog(*args, &block)
+        end
       end
+    end
 
+    def patch_cache_store_fetch
+      cache_store_class(:fetch).class_eval do
+        alias_method :fetch_without_datadog, :fetch
+        def fetch(*args, &block)
+          ActiveSupport::Notifications.instrument('start_cache_fetch.active_support')
+          fetch_without_datadog(*args, &block)
+        end
+      end
+    end
+
+    def patch_cache_store_write
+      cache_store_class(:write).class_eval do
+        alias_method :write_without_datadog, :write
+        def write(*args, &block)
+          ActiveSupport::Notifications.instrument('start_cache_write.active_support')
+          write_without_datadog(*args, &block)
+        end
+      end
+    end
+
+    def patch_cache_store_delete
+      cache_store_class(:delete).class_eval do
+        alias_method :delete_without_datadog, :delete
+        def delete(*args, &block)
+          ActiveSupport::Notifications.instrument('start_cache_delete.active_support')
+          delete_without_datadog(*args, &block)
+        end
+      end
+    end
+
+    def patch_cache_store_instrument
       # by default, Rails 3 doesn't instrument the cache system so we should turn it on
       # using the ActiveSupport::Cache::Store.instrument= function. Unfortunately, early
       # versions of Rails use a Thread.current store that is not compatible with some
       # application servers like Passenger.
       # More details: https://github.com/rails/rails/blob/v3.2.22.5/activesupport/lib/active_support/cache.rb#L175-L177
       return unless ::Rails::VERSION::MAJOR.to_i == 3
-      ::ActiveSupport::Cache::Store.singleton_class.prepend Datadog::CacheInstrumentExtension
+      ::ActiveSupport::Cache::Store.singleton_class.class_eval do
+        # Add the instrument function that Rails 3.x uses
+        # to know if the underlying cache should be instrumented or not. By default,
+        # we force that instrumentation if the Rails application is auto instrumented.
+        def instrument
+          true
+        end
+      end
     end
   end
 end

data/lib/ddtrace/contrib/rails/utils.rb

@@ -23,6 +23,7 @@ module Datadog
           return name.to_s
         end
 
+        # TODO: Consider moving this out of Rails.
         # Return a canonical name for a type of database
         def self.normalize_vendor(vendor)
           case vendor

data/lib/ddtrace/contrib/sidekiq/tracer.rb

@@ -25,7 +25,7 @@ module Datadog
 
       # Middleware is a Sidekiq server-side middleware which traces executed jobs
       class Tracer
-        def initialize(options)
+        def initialize(options = {})
           # check if Rails configuration is available and use it to override
           # Sidekiq defaults
           rails_config = ::Rails.configuration.datadog_trace rescue {}
@@ -54,7 +54,14 @@ module Datadog
 
         def call(worker, job, queue)
           @tracer.trace('sidekiq.job', service: @sidekiq_service, span_type: 'job') do |span|
-            span.resource = job['class']
+            if job['wrapped']
+              # If class is wrapping something else, the interesting resource info
+              # is the underlying, wrapped class, and not the wrapper.
+              span.resource = job['wrapped']
+              span.set_tag('sidekiq.job.wrapper', job['class'])
+            else
+              span.resource = job['class']
+            end
             span.set_tag('sidekiq.job.id', job['jid'])
             span.set_tag('sidekiq.job.retry', job['retry'])
             span.set_tag('sidekiq.job.queue', job['queue'])

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -35,7 +35,7 @@ module Datadog
           @cfg = DEFAULT_CFG.dup()
         end
 
-        def configure(**args)
+        def configure(args = {})
           args.each do |name, value|
             self[name] = value
           end

data/lib/ddtrace/monkey.rb

@@ -48,7 +48,7 @@ module Datadog
 
     def get_patched_modules
       patched = autopatch_modules
-      @autopatch_modules.each do |k, v|
+      @patchers.each do |k, v|
         @mutex.synchronize do
           if v
             patcher = @patchers[k]

data/lib/ddtrace/pin.rb

@@ -17,13 +17,14 @@ module Datadog
     attr_accessor :name
     attr_accessor :tracer
 
-    def initialize(service, app: nil, tags: nil, app_type: nil, tracer: Datadog.tracer)
+    # [ruby19] named parameters would be more idiomatic here, but would break backward compatibility
+    def initialize(service, options = { app: nil, tags: nil, app_type: nil, tracer: nil })
       @service = service
-      @app = app
-      @tags = tags
-      @app_type = app_type
+      @app = options[:app]
+      @tags = options[:tags]
+      @app_type = options[:app_type]
       @name = nil # this would rarely be overriden as it's really span-specific
-      @tracer = tracer
+      @tracer = options[:tracer] || Datadog.tracer
     end
 
     def enabled?

data/lib/ddtrace/span.rb

@@ -86,7 +86,7 @@ module Datadog
       @status = 1
       @meta[Datadog::Ext::Errors::MSG] = e.message if e.respond_to?(:message) && e.message
       @meta[Datadog::Ext::Errors::TYPE] = e.class.to_s
-      @meta[Datadog::Ext::Errors::STACK] = e.backtrace.join("\n") if e.respond_to?(:backtrace) && e.backtrace
+      @meta[Datadog::Ext::Errors::STACK] = e.backtrace.join('\n') if e.respond_to?(:backtrace) && e.backtrace
     end
 
     # Mark the span finished at the current time and submit it.

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +118,7 @@ files:
 - docker-compose.yml
 - docs/GettingStarted.md
 - gemfiles/contrib.gemfile
+- gemfiles/contrib_old.gemfile
 - gemfiles/rails3_mysql2.gemfile
 - gemfiles/rails3_postgres.gemfile
 - gemfiles/rails3_postgres_redis.gemfile
@@ -132,7 +133,6 @@ files:
 - gemfiles/rails5_postgres_sidekiq.gemfile
 - lib/ddtrace.rb
 - lib/ddtrace/buffer.rb
-- lib/ddtrace/contrib/elasticsearch/core.rb
 - lib/ddtrace/contrib/elasticsearch/patcher.rb
 - lib/ddtrace/contrib/elasticsearch/quantize.rb
 - lib/ddtrace/contrib/http/patcher.rb
@@ -179,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

data/lib/ddtrace/contrib/elasticsearch/core.rb

@@ -1,66 +0,0 @@
-require 'uri'
-require 'ddtrace/pin'
-require 'ddtrace/ext/app_types'
-require 'json'
-require 'ddtrace/contrib/elasticsearch/quantize'
-
-module Datadog
-  module Contrib
-    module Elasticsearch
-      URL = 'elasticsearch.url'.freeze
-      METHOD = 'elasticsearch.method'.freeze
-      PARAMS = 'elasticsearch.params'.freeze
-      BODY = 'elasticsearch.body'.freeze
-
-      SERVICE = 'elasticsearch'.freeze
-      SPAN_TYPE = 'elasticsearch'.freeze
-
-      # Datadog APM Elastic Search integration.
-      module TracedClient
-        def initialize(*)
-          pin = Datadog::Pin.new(SERVICE, app: 'elasticsearch', app_type: Datadog::Ext::AppTypes::DB)
-          pin.onto(self)
-          super
-        end
-
-        def perform_request(*args)
-          pin = Datadog::Pin.get_from(self)
-          return super unless pin && pin.tracer
-
-          method = args[0]
-          path = args[1]
-          params = args[2]
-          body = args[3]
-          full_url = URI.parse(path)
-
-          url = full_url.path
-          response = nil
-          pin.tracer.trace('elasticsearch.query') do |span|
-            begin
-              span.service = pin.service
-              span.span_type = SPAN_TYPE
-
-              # load JSON for the following fields unless they're already strings
-              params = JSON.generate(params) if params && !params.is_a?(String)
-              body = JSON.generate(body) if body && !body.is_a?(String)
-
-              span.set_tag(METHOD, method)
-              span.set_tag(URL, url)
-              span.set_tag(PARAMS, params) if params
-              span.set_tag(BODY, body) if body
-
-              quantized_url = Datadog::Contrib::Elasticsearch::Quantize.format_url(url)
-              span.resource = "#{method} #{quantized_url}"
-            rescue StandardError => e
-              Datadog::Tracer.log.error(e.message)
-            ensure
-              # the call is still executed
-              response = super(*args)
-            end
-          end
-          response
-        end
-      end
-    end
-  end
-end