ddtrace 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36285521893bb7e1b8ceaa8f28d5d0b2b5103239
-  data.tar.gz: 0108b54ce0043a1ac7acd4412ea8cae915e5fdd2
+  metadata.gz: be21d892e040ade90a13ed979fa5e6ab7e0a580b
+  data.tar.gz: d5964cdb669c87cec23248d797104c19c065dd9e
 SHA512:
-  metadata.gz: 1e41922419e9d96624ced8d265301dd1bf4aa2bb487b083a768ffb3282280e5c2f5a8551179016e87b53bd681bd26af9be69bb22e710db1b3bc0d77c3a53ef5d
-  data.tar.gz: c02b8907da2873100ba44f4abeee8ff9c2034869adea96406b69a8ff79357339bfdfc5da8c1d172d92b976f8232de0436d7d14104019405573e8ef7aaa6150fd
+  metadata.gz: 9afe3f5cc5bd6704d7b66a5c6a12cec4c6c66152b75ae38a96030419ef32552c826770e047e77d27b6cb2c614871971580aabe7bd8347b6a52fec57b77f2aa33
+  data.tar.gz: 11c875488d99ec5920af2b055b2079f7e1b6a170be9bc3b162b5b5987280b2228ee70980af68071a16d1eff0faf2a67c386b461bf027ffa649f64b23f1023e71

data/.gitignore

@@ -54,3 +54,6 @@ build-iPhoneSimulator/
 # lock files
 Gemfile.lock
 gemfiles/*.lock
+
+# bundle config
+gemfiles/.bundle

data/circle.yml

@@ -24,7 +24,7 @@ dependencies:
     - pip install docker-compose==1.7.1
     - docker-compose up -d | cat
     # installing dev dependencies
-    - gem update --system
+    - gem update --system=2.6.11
     - gem install builder
     - gem update bundler
     - bundle install
@@ -32,7 +32,7 @@ dependencies:
     - rvm get head
     - rvm install $MRI_VERSIONS
   override:
-    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do gem update --system
+    - rvm $MRI_VERSIONS,$MRI_OLD_VERSIONS --verbose do gem update --system=2.6.11
     - 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

data/ddtrace.gemspec

@@ -35,7 +35,7 @@ EOS
 
   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 'minitest', '= 5.10.1'
   spec.add_development_dependency 'appraisal', '~> 2.1'
   spec.add_development_dependency 'yard', '~> 0.9'
 end

data/docs/GettingStarted.md

@@ -23,15 +23,15 @@ We strongly suggest pinning the version of the library you deploy.
 The easiest way to get started with the tracing client is to instrument your web application. ``ddtrace`` gem
 provides auto instrumentation for the following web frameworks and libraries:
 
-* [Ruby on Rails](#label-Ruby+on+Rails)
-* [Sidekiq](#label-Sidekiq)
-* [Sinatra](#label-Sinatra)
-* [Rack](#label-Rack)
-* [Grape](#label-Grape)
-* [Active Record](#label-Active+Record)
-* [Elastic Search](#label-Elastic+Search)
-* [Net/HTTP](#label-Net/HTTP)
-* [Redis](#label-Redis)
+* [Ruby on Rails](#Ruby_on_Rails)
+* [Sidekiq](#Sidekiq)
+* [Sinatra](#Sinatra)
+* [Rack](#Rack)
+* [Grape](#Grape)
+* [Active Record](#Active_Record)
+* [Elastic Search](#Elastic_Search)
+* [Net/HTTP](#Net_HTTP)
+* [Redis](#Redis)
 
 ## Web Frameworks
 

data/gemfiles/contrib.gemfile

@@ -13,4 +13,4 @@ gem "sqlite3"
 gem "activerecord"
 gem "sidekiq"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/contrib_old.gemfile

@@ -12,4 +12,4 @@ gem "sqlite3"
 gem "activerecord", "3.2.22.5"
 gem "sidekiq", "4.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails3_mysql2.gemfile

@@ -4,8 +4,8 @@ source "https://rubygems.org"
 
 gem "test-unit"
 gem "rails", "3.2.22.5"
-gem "mysql2", "0.3.21", :platform => :ruby
-gem "activerecord-mysql-adapter", :platform => :ruby
-gem "activerecord-jdbcmysql-adapter", :platform => :jruby
+gem "mysql2", "0.3.21", platform: :ruby
+gem "activerecord-mysql-adapter", platform: :ruby
+gem "activerecord-jdbcmysql-adapter", platform: :jruby
 
-gemspec :path => "../"
+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", "0.15.1", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+gem "pg", "0.15.1", platform: :ruby
+gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails3_postgres_redis.gemfile

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

data/gemfiles/rails3_postgres_sidekiq.gemfile

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

data/gemfiles/rails4_mysql2.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.7.1"
-gem "mysql2", :platform => :ruby
-gem "activerecord-jdbcmysql-adapter", :platform => :jruby
+gem "mysql2", platform: :ruby
+gem "activerecord-jdbcmysql-adapter", platform: :jruby
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4_postgres.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.7.1"
-gem "pg", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+gem "pg", platform: :ruby
+gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4_postgres_redis.gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.7.1"
-gem "pg", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+gem "pg", platform: :ruby
+gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "redis-rails"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails4_postgres_sidekiq.gemfile

@@ -3,9 +3,9 @@
 source "https://rubygems.org"
 
 gem "rails", "4.2.7.1"
-gem "pg", :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+gem "pg", platform: :ruby
+gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 gem "sidekiq"
 gem "activejob"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5_mysql2.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails", "5.0.1"
-gem "mysql2", :platform => :ruby
+gem "mysql2", platform: :ruby
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5_postgres.gemfile

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

data/gemfiles/rails5_postgres_redis.gemfile

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "rails", "5.0.1"
-gem "pg", :platform => :ruby
+gem "pg", platform: :ruby
 gem "redis-rails"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails5_postgres_sidekiq.gemfile

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

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

@@ -43,31 +43,60 @@ module Datadog
             hostname: user_config[:trace_agent_hostname],
             port: user_config[:trace_agent_port]
           )
-
-          # configure Sidekiq service
-          @tracer.set_service_info(
-            @sidekiq_service,
-            'sidekiq',
-            Datadog::Ext::AppTypes::WORKER
-          )
         end
 
         def call(worker, job, queue)
-          @tracer.trace('sidekiq.job', service: @sidekiq_service, span_type: 'job') do |span|
-            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
+          # If class is wrapping something else, the interesting resource info
+          # is the underlying, wrapped class, and not the wrapper.
+          resource = if job['wrapped']
+                       job['wrapped']
+                     else
+                       job['class']
+                     end
+
+          # configure Sidekiq service
+          service = sidekiq_service(resource_worker(resource))
+          set_service_info(service)
+
+          @tracer.trace('sidekiq.job', service: service, span_type: 'job') do |span|
+            span.resource = resource
             span.set_tag('sidekiq.job.id', job['jid'])
             span.set_tag('sidekiq.job.retry', job['retry'])
             span.set_tag('sidekiq.job.queue', job['queue'])
+            span.set_tag('sidekiq.job.wrapper', job['class']) if job['wrapped']
+
             yield
           end
         end
+
+        private
+
+        # rubocop:disable Lint/HandleExceptions
+        def resource_worker(resource)
+          Object.const_get(resource)
+        rescue NameError
+        end
+
+        def worker_config(worker)
+          if worker.respond_to?(:datadog_tracer_config)
+            worker.datadog_tracer_config
+          else
+            {}
+          end
+        end
+
+        def sidekiq_service(resource)
+          worker_config(resource).fetch(:service, @sidekiq_service)
+        end
+
+        def set_service_info(service)
+          return if @tracer.services[service]
+          @tracer.set_service_info(
+            service,
+            'sidekiq',
+            Datadog::Ext::AppTypes::WORKER
+          )
+        end
       end
     end
   end

data/lib/ddtrace/transport.rb

@@ -14,6 +14,9 @@ module Datadog
     # seconds before the transport timeout
     TIMEOUT = 1
 
+    # header containing the number of traces in a payload
+    TRACE_COUNT_HEADER = 'X-Datadog-Trace-Count'.freeze
+
     def initialize(hostname, port, options = {})
       @hostname = hostname
       @port = port
@@ -41,8 +44,9 @@ module Datadog
         payload = @encoder.encode_services(data)
         status_code = post(@services_endpoint, payload)
       when :traces
+        count = data.length
         payload = @encoder.encode_traces(data)
-        status_code = post(@traces_endpoint, payload)
+        status_code = post(@traces_endpoint, payload, count)
       else
         Datadog::Tracer.log.error("Unsupported endpoint: #{endpoint}")
         return nil
@@ -56,9 +60,11 @@ module Datadog
     end
 
     # send data to the trace-agent; the method is thread-safe
-    def post(url, data)
+    def post(url, data, count = nil)
       Datadog::Tracer.log.debug("Sending data from process: #{Process.pid}")
-      request = Net::HTTP::Post.new(url, @headers)
+      headers = count.nil? ? {} : { TRACE_COUNT_HEADER => count.to_s }
+      headers = headers.merge(@headers)
+      request = Net::HTTP::Post.new(url, headers)
       request.body = data
 
       response = Net::HTTP.start(@hostname, @port, read_timeout: TIMEOUT) { |http| http.request(request) }

data/lib/ddtrace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -56,16 +56,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 5.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +192,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