ddtrace 0.32.0 → 0.33.0

data/lib/ddtrace/contrib/sidekiq/configuration/settings.rb

@@ -17,6 +17,11 @@ module Datadog
             o.lazy
           end
 
+          option :tag_args do |o|
+            o.default { env_to_bool(Ext::ENV_TAG_JOB_ARGS, false) }
+            o.lazy
+          end
+
           option :service_name, default: Ext::SERVICE_NAME
           option :client_service_name, default: Ext::CLIENT_SERVICE_NAME
         end

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

@@ -7,6 +7,7 @@ module Datadog
         CLIENT_SERVICE_NAME = 'sidekiq-client'.freeze
         ENV_ANALYTICS_ENABLED = 'DD_SIDEKIQ_ANALYTICS_ENABLED'.freeze
         ENV_ANALYTICS_SAMPLE_RATE = 'DD_SIDEKIQ_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'.freeze
         SERVICE_NAME = 'sidekiq'.freeze
         SPAN_PUSH = 'sidekiq.push'.freeze
         SPAN_JOB = 'sidekiq.job'.freeze
@@ -15,6 +16,7 @@ module Datadog
         TAG_JOB_QUEUE = 'sidekiq.job.queue'.freeze
         TAG_JOB_RETRY = 'sidekiq.job.retry'.freeze
         TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'.freeze
+        TAG_JOB_ARGS = 'sidekiq.job.args'.freeze
       end
     end
   end

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

@@ -15,8 +15,8 @@ module Datadog
           Gem.loaded_specs['sidekiq'] && Gem.loaded_specs['sidekiq'].version
         end
 
-        def self.present?
-          super && defined?(::Sidekiq)
+        def self.loaded?
+          defined?(::Sidekiq)
         end
 
         def self.compatible?

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

@@ -16,7 +16,8 @@ module Datadog
         def call(worker, job, queue)
           resource = job_resource(job)
 
-          service = service_from_worker_config(resource) || @sidekiq_service
+          service = worker_config(resource, :service_name) || @sidekiq_service
+          tag_args = worker_config(resource, :tag_args) || configuration[:tag_args]
 
           @tracer.trace(Ext::SPAN_JOB, service: service, span_type: Datadog::Ext::AppTypes::WORKER) do |span|
             span.resource = resource
@@ -29,6 +30,9 @@ module Datadog
             span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
             span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
             span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Time.now.utc.to_f - job['enqueued_at'].to_f))
+            if tag_args && !job['args'].nil? && !job['args'].empty?
+              span.set_tag(Ext::TAG_JOB_ARGS, job['args'])
+            end
 
             yield
           end
@@ -40,7 +44,7 @@ module Datadog
           Datadog.configuration[:sidekiq]
         end
 
-        def service_from_worker_config(resource)
+        def worker_config(resource, key)
           # Try to get the Ruby class from the resource name.
           worker_klass = begin
             Object.const_get(resource)
@@ -49,7 +53,7 @@ module Datadog
           end
 
           if worker_klass.respond_to?(:datadog_tracer_config)
-            worker_klass.datadog_tracer_config[:service_name]
+            worker_klass.datadog_tracer_config[key]
           end
         end
       end

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

@@ -1,6 +1,8 @@
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/sidekiq/ext'
 
+require 'yaml'
+
 module Datadog
   module Contrib
     module Sidekiq
@@ -17,10 +19,25 @@ module Datadog
         # primarily to support `ActiveJob`.
         def job_resource(job)
           if job['wrapped']
-            job['wrapped']
+            job['wrapped'].to_s
+          elsif job['class'] == 'Sidekiq::Extensions::DelayedClass'
+            delay_extension_class(job).to_s
           else
-            job['class']
+            job['class'].to_s
           end
+        rescue => e
+          Datadog::Logger.log.debug { "Error retrieving Sidekiq job class name (jid:#{job['jid']}): #{e}" }
+
+          job['class'].to_s
+        end
+
+        #
+        def delay_extension_class(job)
+          clazz, method = YAML.parse(job['args'].first).children.first.children
+
+          method = method.value[1..-1] # Remove leading `:` from method symbol
+
+          "#{clazz.value}.#{method}"
         end
       end
     end

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

@@ -15,8 +15,8 @@ module Datadog
           Gem.loaded_specs['sinatra'] && Gem.loaded_specs['sinatra'].version
         end
 
-        def self.present?
-          super && defined?(::Sinatra)
+        def self.loaded?
+          defined?(::Sinatra)
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/sucker_punch/integration.rb

@@ -15,12 +15,12 @@ module Datadog
           Gem.loaded_specs['sucker_punch'] && Gem.loaded_specs['sucker_punch'].version
         end
 
-        def self.present?
-          super && defined?(::SuckerPunch)
+        def self.loaded?
+          defined?(::SuckerPunch)
         end
 
         def self.compatible?
-          super && Gem::Version.new(::SuckerPunch::VERSION) >= Gem::Version.new('2.0.0')
+          super && version >= Gem::Version.new('2.0.0')
         end
 
         def default_configuration

data/lib/ddtrace/runtime/metrics.rb

@@ -19,7 +19,7 @@ module Datadog
       end
 
       def associate_with_span(span)
-        return if span.nil?
+        return if !enabled? || span.nil?
 
         # Register service as associated with metrics
         register_service(span.service) unless span.service.nil?
@@ -30,7 +30,7 @@ module Datadog
 
       # Associate service with runtime metrics
       def register_service(service)
-        return if service.nil?
+        return if !enabled? || service.nil?
 
         service = service.to_s
 

data/lib/ddtrace/sampling/rule_sampler.rb

@@ -16,6 +16,8 @@ module Datadog
     class RuleSampler
       extend Forwardable
 
+      AGENT_RATE_METRIC_KEY = '_dd.agent_psr'.freeze
+
       attr_reader :rules, :rate_limiter, :default_sampler
 
       # @param rules [Array<Rule>] ordered list of rules to be applied to a span
@@ -68,14 +70,26 @@ module Datadog
       end
 
       def sample!(span)
-        sampled = sample_span(span) { |s| @default_sampler.sample!(s) }
+        sampled = sample_span(span) do |s|
+          @default_sampler.sample!(s).tap do
+            # We want to make sure the span is tagged with the agent-derived
+            # service rate. Retrieve this from the rate by service sampler.
+            # Only do this if it was set by a RateByServiceSampler.
+            if @default_sampler.is_a?(RateByServiceSampler)
+              s.set_metric(AGENT_RATE_METRIC_KEY, @default_sampler.sample_rate(span))
+            end
+          end
+        end
 
         sampled.tap do
           span.sampled = sampled
         end
       end
 
-      def_delegators :@default_sampler, :update
+      def update(*args)
+        return false unless @default_sampler.respond_to?(:update)
+        @default_sampler.update(*args)
+      end
 
       private
 

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 32
+    MINOR = 33
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -290,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.9.2
-- !ruby/object:Gem::Dependency
-  name: warning
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   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
@@ -512,6 +498,11 @@ files:
 - lib/ddtrace/contrib/mysql2/patcher.rb
 - lib/ddtrace/contrib/patchable.rb
 - lib/ddtrace/contrib/patcher.rb
+- lib/ddtrace/contrib/presto/configuration/settings.rb
+- lib/ddtrace/contrib/presto/ext.rb
+- lib/ddtrace/contrib/presto/instrumentation.rb
+- lib/ddtrace/contrib/presto/integration.rb
+- lib/ddtrace/contrib/presto/patcher.rb
 - lib/ddtrace/contrib/racecar/configuration/settings.rb
 - lib/ddtrace/contrib/racecar/event.rb
 - lib/ddtrace/contrib/racecar/events.rb
@@ -539,12 +530,14 @@ files:
 - lib/ddtrace/contrib/rake/instrumentation.rb
 - lib/ddtrace/contrib/rake/integration.rb
 - lib/ddtrace/contrib/rake/patcher.rb
+- lib/ddtrace/contrib/redis/configuration/resolver.rb
 - lib/ddtrace/contrib/redis/configuration/settings.rb
 - lib/ddtrace/contrib/redis/ext.rb
 - lib/ddtrace/contrib/redis/integration.rb
 - lib/ddtrace/contrib/redis/patcher.rb
 - lib/ddtrace/contrib/redis/quantize.rb
 - lib/ddtrace/contrib/redis/tags.rb
+- lib/ddtrace/contrib/redis/vendor/resolver.rb
 - lib/ddtrace/contrib/registerable.rb
 - lib/ddtrace/contrib/registry.rb
 - lib/ddtrace/contrib/resque/configuration/settings.rb
@@ -714,9 +707,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications