ddtrace 1.2.0 → 1.3.0

data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb

@@ -1,10 +1,9 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sidekiq/ext'
-require 'datadog/tracing/contrib/sidekiq/tracing'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'tracing'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sidekiq/ext.rb

@@ -16,8 +16,11 @@ module Datadog
           SPAN_PUSH = 'sidekiq.push'.freeze
           SPAN_JOB = 'sidekiq.job'.freeze
           SPAN_JOB_FETCH = 'sidekiq.job_fetch'.freeze
+          SPAN_REDIS_INFO = 'sidekiq.redis_info'.freeze
           SPAN_HEARTBEAT = 'sidekiq.heartbeat'.freeze
           SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'.freeze
+          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'.freeze
+          SPAN_STOP = 'sidekiq.stop'.freeze
           TAG_JOB_DELAY = 'sidekiq.job.delay'.freeze
           TAG_JOB_ID = 'sidekiq.job.id'.freeze
           TAG_JOB_QUEUE = 'sidekiq.job.queue'.freeze
@@ -29,8 +32,11 @@ module Datadog
           TAG_OPERATION_PUSH = 'push'.freeze
           TAG_OPERATION_JOB = 'job'.freeze
           TAG_OPERATION_JOB_FETCH = 'job_fetch'.freeze
+          TAG_OPERATION_REDIS_INFO = 'redis_info'.freeze
           TAG_OPERATION_HEARTBEAT = 'heartbeat'.freeze
           TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'.freeze
+          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'.freeze
+          TAG_OPERATION_STOP = 'stop'.freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/sidekiq/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sidekiq/configuration/settings'
-require 'datadog/tracing/contrib/sidekiq/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sidekiq/patcher.rb

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -17,8 +17,8 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/sidekiq/client_tracer'
-            require 'datadog/tracing/contrib/sidekiq/server_tracer'
+            require_relative 'client_tracer'
+            require_relative 'server_tracer'
 
             ::Sidekiq.configure_client do |config|
               config.client_middleware do |chain|
@@ -45,24 +45,31 @@ module Datadog
             patch_server_heartbeat
             patch_server_job_fetch
             patch_server_scheduled_push
+            patch_redis_info
           end
 
           def patch_server_heartbeat
-            require 'datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat'
+            require_relative 'server_internal_tracer/heartbeat'
 
             ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
           end
 
           def patch_server_job_fetch
-            require 'datadog/tracing/contrib/sidekiq/server_internal_tracer/job_fetch'
+            require_relative 'server_internal_tracer/job_fetch'
 
             ::Sidekiq::Processor.prepend(ServerInternalTracer::JobFetch)
           end
 
           def patch_server_scheduled_push
-            require 'datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_push'
+            require_relative 'server_internal_tracer/scheduled_poller'
 
-            ::Sidekiq::Scheduled::Poller.prepend(ServerInternalTracer::ScheduledPush)
+            ::Sidekiq::Scheduled::Poller.prepend(ServerInternalTracer::ScheduledPoller)
+          end
+
+          def patch_redis_info
+            require_relative 'server_internal_tracer/redis_info'
+
+            ::Sidekiq.singleton_class.prepend(ServerInternalTracer::RedisInfo)
           end
         end
       end

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/heartbeat.rb

@@ -7,9 +7,27 @@ module Datadog
         module ServerInternalTracer
           # Trace when a Sidekiq process has a heartbeat
           module Heartbeat
+            def stop
+              configuration = Datadog.configuration.tracing[:sidekiq]
+
+              Datadog::Tracing.trace(Ext::SPAN_STOP, service: configuration[:service_name]) do |span|
+                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_STOP)
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                super
+              end
+            end
+
             private
 
-            def ❤ # rubocop:disable Naming/AsciiIdentifiers, Naming/MethodName
+            def heartbeat
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/{scheduled_push.rb → redis_info.rb}

@@ -5,17 +5,16 @@ module Datadog
     module Contrib
       module Sidekiq
         module ServerInternalTracer
-          # Trace when Sidekiq checks to see if there are scheduled jobs that need to be worked
-          # https://github.com/mperham/sidekiq/wiki/Scheduled-Jobs
-          module ScheduledPush
-            def enqueue
+          # Trace when Sidekiq gets Redis info on startup
+          module RedisInfo
+            def redis_info
               configuration = Datadog.configuration.tracing[:sidekiq]
 
-              Datadog::Tracing.trace(Ext::SPAN_SCHEDULED_PUSH, service: configuration[:service_name]) do |span|
+              Datadog::Tracing.trace(Ext::SPAN_REDIS_INFO, service: configuration[:service_name]) do |span|
                 span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SCHEDULED_PUSH)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REDIS_INFO)
 
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(configuration[:analytics_enabled])

data/lib/datadog/tracing/contrib/sidekiq/server_internal_tracer/scheduled_poller.rb

@@ -0,0 +1,53 @@
+# typed: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Sidekiq
+        module ServerInternalTracer
+          # Trace when Sidekiq checks to see if there are scheduled jobs that need to be worked
+          # https://github.com/mperham/sidekiq/wiki/Scheduled-Jobs
+          module ScheduledPoller
+            def enqueue
+              configuration = Datadog.configuration.tracing[:sidekiq]
+
+              Datadog::Tracing.trace(Ext::SPAN_SCHEDULED_PUSH, service: configuration[:service_name]) do |span|
+                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SCHEDULED_PUSH)
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                super
+              end
+            end
+
+            private
+
+            def wait
+              configuration = Datadog.configuration.tracing[:sidekiq]
+
+              Datadog::Tracing.trace(Ext::SPAN_SCHEDULED_WAIT, service: configuration[:service_name]) do |span|
+                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SCHEDULED_WAIT)
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb

@@ -1,11 +1,10 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sidekiq/ext'
-require 'datadog/tracing/contrib/sidekiq/tracing'
-require 'datadog/tracing/contrib/utils/quantization/hash'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'tracing'
+require_relative '../utils/quantization/hash'
 
 module Datadog
   module Tracing

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

@@ -2,8 +2,8 @@
 
 require 'yaml'
 
-require 'datadog/core'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../../core'
+require_relative 'ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/sinatra/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/env.rb

@@ -2,8 +2,8 @@
 
 require 'time'
 
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/sinatra/ext'
+require_relative '../../metadata/ext'
+require_relative 'ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/framework.rb

@@ -1,7 +1,5 @@
 # typed: false
 
-require 'datadog/tracing'
-
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/sinatra/headers.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/tracing/metadata/ext'
+require_relative '../../metadata/ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sinatra/configuration/settings'
-require 'datadog/tracing/contrib/sinatra/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/patcher.rb

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/core/utils/only_once'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/rack/middlewares'
-require 'datadog/tracing/contrib/sinatra/framework'
+require_relative '../../../core/utils/only_once'
+require_relative '../patcher'
+require_relative '../rack/middlewares'
+require_relative 'framework'
 
 module Datadog
   module Tracing
@@ -50,7 +50,7 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/sinatra/tracer'
+            require_relative 'tracer'
             register_tracer
 
             patch_default_middlewares

data/lib/datadog/tracing/contrib/sinatra/tracer.rb

@@ -2,14 +2,13 @@
 
 require 'sinatra/base'
 
-require 'datadog/core/utils/only_once'
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sinatra/env'
-require 'datadog/tracing/contrib/sinatra/ext'
-require 'datadog/tracing/contrib/sinatra/tracer_middleware'
+require_relative '../../../core/utils/only_once'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'env'
+require_relative 'ext'
+require_relative 'tracer_middleware'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb

@@ -1,12 +1,11 @@
 # typed: false
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/rack/ext'
-require 'datadog/tracing/contrib/sinatra/env'
-require 'datadog/tracing/contrib/sinatra/ext'
-require 'datadog/tracing/contrib/sinatra/headers'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative '../rack/ext'
+require_relative 'env'
+require_relative 'ext'
+require_relative 'headers'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sneakers/configuration/settings.rb

@@ -2,8 +2,8 @@
 
 # typed: false
 
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sneakers/integration.rb

@@ -2,10 +2,10 @@
 
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sneakers/ext'
-require 'datadog/tracing/contrib/sneakers/configuration/settings'
-require 'datadog/tracing/contrib/sneakers/patcher'
+require_relative '../integration'
+require_relative 'ext'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sneakers/patcher.rb

@@ -2,8 +2,8 @@
 
 # typed: false
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/sneakers/tracer'
+require_relative '../patcher'
+require_relative 'tracer'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sneakers/tracer.rb

@@ -2,9 +2,8 @@
 
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/status_code_matcher.rb

@@ -2,8 +2,8 @@
 
 require 'set'
 
-require 'datadog/core'
-require 'datadog/tracing/metadata/ext'
+require_relative '../../core'
+require_relative '../metadata/ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sucker_punch/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/sucker_punch/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb

@@ -2,10 +2,9 @@
 
 require 'sucker_punch'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sucker_punch/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sucker_punch/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sucker_punch/configuration/settings'
-require 'datadog/tracing/contrib/sucker_punch/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb

@@ -1,8 +1,7 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/sucker_punch/ext'
+require_relative '../patcher'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -20,8 +19,8 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/sucker_punch/exception_handler'
-            require 'datadog/tracing/contrib/sucker_punch/instrumentation'
+            require_relative 'exception_handler'
+            require_relative 'instrumentation'
 
             ExceptionHandler.patch!
             Instrumentation.patch!

data/lib/datadog/tracing/contrib.rb

@@ -1,8 +1,8 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/registry'
-require 'datadog/tracing/contrib/extensions'
+require_relative '../tracing'
+require_relative 'contrib/registry'
+require_relative 'contrib/extensions'
 
 module Datadog
   module Tracing
@@ -30,48 +30,48 @@ module Datadog
   end
 end
 
-require 'datadog/tracing/contrib/action_cable/integration'
-require 'datadog/tracing/contrib/action_mailer/integration'
-require 'datadog/tracing/contrib/action_pack/integration'
-require 'datadog/tracing/contrib/action_view/integration'
-require 'datadog/tracing/contrib/active_model_serializers/integration'
-require 'datadog/tracing/contrib/active_job/integration'
-require 'datadog/tracing/contrib/active_record/integration'
-require 'datadog/tracing/contrib/active_support/integration'
-require 'datadog/tracing/contrib/aws/integration'
-require 'datadog/tracing/contrib/concurrent_ruby/integration'
-require 'datadog/tracing/contrib/dalli/integration'
-require 'datadog/tracing/contrib/delayed_job/integration'
-require 'datadog/tracing/contrib/elasticsearch/integration'
-require 'datadog/tracing/contrib/ethon/integration'
-require 'datadog/tracing/contrib/excon/integration'
-require 'datadog/tracing/contrib/faraday/integration'
-require 'datadog/tracing/contrib/grape/integration'
-require 'datadog/tracing/contrib/graphql/integration'
-require 'datadog/tracing/contrib/grpc/integration'
-require 'datadog/tracing/contrib/http/integration'
-require 'datadog/tracing/contrib/httpclient/integration'
-require 'datadog/tracing/contrib/httprb/integration'
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/kafka/integration'
-require 'datadog/tracing/contrib/lograge/integration'
-require 'datadog/tracing/contrib/mongodb/integration'
-require 'datadog/tracing/contrib/mysql2/integration'
-require 'datadog/tracing/contrib/pg/integration'
-require 'datadog/tracing/contrib/presto/integration'
-require 'datadog/tracing/contrib/qless/integration'
-require 'datadog/tracing/contrib/que/integration'
-require 'datadog/tracing/contrib/racecar/integration'
-require 'datadog/tracing/contrib/rack/integration'
-require 'datadog/tracing/contrib/rails/integration'
-require 'datadog/tracing/contrib/rake/integration'
-require 'datadog/tracing/contrib/redis/integration'
-require 'datadog/tracing/contrib/resque/integration'
-require 'datadog/tracing/contrib/rest_client/integration'
-require 'datadog/tracing/contrib/semantic_logger/integration'
-require 'datadog/tracing/contrib/sequel/integration'
-require 'datadog/tracing/contrib/shoryuken/integration'
-require 'datadog/tracing/contrib/sidekiq/integration'
-require 'datadog/tracing/contrib/sinatra/integration'
-require 'datadog/tracing/contrib/sneakers/integration'
-require 'datadog/tracing/contrib/sucker_punch/integration'
+require_relative 'contrib/action_cable/integration'
+require_relative 'contrib/action_mailer/integration'
+require_relative 'contrib/action_pack/integration'
+require_relative 'contrib/action_view/integration'
+require_relative 'contrib/active_model_serializers/integration'
+require_relative 'contrib/active_job/integration'
+require_relative 'contrib/active_record/integration'
+require_relative 'contrib/active_support/integration'
+require_relative 'contrib/aws/integration'
+require_relative 'contrib/concurrent_ruby/integration'
+require_relative 'contrib/dalli/integration'
+require_relative 'contrib/delayed_job/integration'
+require_relative 'contrib/elasticsearch/integration'
+require_relative 'contrib/ethon/integration'
+require_relative 'contrib/excon/integration'
+require_relative 'contrib/faraday/integration'
+require_relative 'contrib/grape/integration'
+require_relative 'contrib/graphql/integration'
+require_relative 'contrib/grpc/integration'
+require_relative 'contrib/http/integration'
+require_relative 'contrib/httpclient/integration'
+require_relative 'contrib/httprb/integration'
+require_relative 'contrib/integration'
+require_relative 'contrib/kafka/integration'
+require_relative 'contrib/lograge/integration'
+require_relative 'contrib/mongodb/integration'
+require_relative 'contrib/mysql2/integration'
+require_relative 'contrib/pg/integration'
+require_relative 'contrib/presto/integration'
+require_relative 'contrib/qless/integration'
+require_relative 'contrib/que/integration'
+require_relative 'contrib/racecar/integration'
+require_relative 'contrib/rack/integration'
+require_relative 'contrib/rails/integration'
+require_relative 'contrib/rake/integration'
+require_relative 'contrib/redis/integration'
+require_relative 'contrib/resque/integration'
+require_relative 'contrib/rest_client/integration'
+require_relative 'contrib/semantic_logger/integration'
+require_relative 'contrib/sequel/integration'
+require_relative 'contrib/shoryuken/integration'
+require_relative 'contrib/sidekiq/integration'
+require_relative 'contrib/sinatra/integration'
+require_relative 'contrib/sneakers/integration'
+require_relative 'contrib/sucker_punch/integration'

data/lib/datadog/tracing/correlation.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../core'
 
 module Datadog
   module Tracing