ddtrace 1.4.2 → 1.19.0

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,14 +7,14 @@ module Datadog
         # Sequel integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_QUERY = 'sequel.query'.freeze
-          TAG_DB_VENDOR = 'sequel.db.vendor'.freeze
-          TAG_PREPARED_NAME = 'sequel.prepared.name'.freeze
-          TAG_COMPONENT = 'sequel'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
+          ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'
+          SPAN_QUERY = 'sequel.query'
+          TAG_DB_VENDOR = 'sequel.db.vendor'
+          TAG_PREPARED_NAME = 'sequel.prepared.name'
+          TAG_COMPONENT = 'sequel'
+          TAG_OPERATION_QUERY = 'query'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative 'patcher'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'database'

data/lib/datadog/tracing/contrib/sequel/utils.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../metadata/ext'
 require_relative '../utils/database'
 
@@ -51,16 +49,19 @@ module Datadog
             end
 
             def set_common_tags(span, db)
+              # Tag original global service name if not used
+              if span.service != Datadog.configuration.service
+                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
               # TODO: Extract host for Sequel with JDBC. The easiest way seem to be through
               # TODO: the database URI. Unfortunately, JDBC URIs do not work with `URI.parse`.
               # host, _port = extract_host_port_from_uri(db.uri)
-              # span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, db.opts[:host]) if db.opts[:host]
+              # span.set_tag(Tracing::Metadata::Ext::TAG_DESTINATION_NAME, host)
+              span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME, db.opts[:host]) if db.opts[:host]
 
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../../span_operation'
 require_relative '../../configuration/settings'
@@ -13,23 +13,29 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
-            option :tag_body, default: false
+            option :error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
+            option :tag_body, default: false, type: :bool
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,17 +7,18 @@ module Datadog
         # Shoryuken integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SHORYUKEN_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE'.freeze
-          SERVICE_NAME = 'shoryuken'.freeze
-          SPAN_JOB = 'shoryuken.job'.freeze
-          TAG_JOB_ID = 'shoryuken.id'.freeze
-          TAG_JOB_QUEUE = 'shoryuken.queue'.freeze
-          TAG_JOB_ATTRIBUTES = 'shoryuken.attributes'.freeze
-          TAG_JOB_BODY = 'shoryuken.body'.freeze
-          TAG_COMPONENT = 'shoryuken'.freeze
-          TAG_OPERATION_JOB = 'job'.freeze
+          ENV_ENABLED = 'DD_TRACE_SHORYUKEN_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SHORYUKEN_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SHORYUKEN_ANALYTICS_SAMPLE_RATE'
+          SERVICE_NAME = 'shoryuken'
+          SPAN_JOB = 'shoryuken.job'
+          TAG_JOB_ID = 'shoryuken.id'
+          TAG_JOB_QUEUE = 'shoryuken.queue'
+          TAG_JOB_ATTRIBUTES = 'shoryuken.attributes'
+          TAG_JOB_BODY = 'shoryuken.body'
+          TAG_COMPONENT = 'shoryuken'
+          TAG_OPERATION_JOB = 'job'
+          TAG_MESSAGING_SYSTEM = 'amazonsqs'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'ext'
 require_relative 'configuration/settings'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative 'tracer'
 

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../analytics'
 
@@ -20,6 +20,8 @@ module Datadog
               span_type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
               on_error: @error_handler
             ) do |span|
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
 
@@ -37,6 +39,8 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_ATTRIBUTES, sqs_msg.attributes) if sqs_msg.respond_to?(:attributes)
               span.set_tag(Ext::TAG_JOB_BODY, body) if configuration[:tag_body]
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               yield
             end
           end

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

@@ -1,9 +1,10 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../../metadata/ext'
 require_relative '../analytics'
+require_relative 'distributed/propagation'
 require_relative 'ext'
-require_relative 'tracing'
+require_relative 'utils'
 
 module Datadog
   module Tracing
@@ -11,7 +12,7 @@ module Datadog
       module Sidekiq
         # Tracer is a Sidekiq client-side middleware which traces job enqueues/pushes
         class ClientTracer
-          include Tracing
+          include Utils
 
           def initialize(options = {})
             @sidekiq_service = options[:client_service_name] || configuration[:client_service_name]
@@ -22,12 +23,21 @@ module Datadog
           def call(worker_class, job, queue, redis_pool)
             resource = job_resource(job)
 
-            Datadog::Tracing.trace(Ext::SPAN_PUSH, service: @sidekiq_service) do |span|
+            Datadog::Tracing.trace(Ext::SPAN_PUSH, service: @sidekiq_service) do |span, trace_op|
+              propagation.inject!(trace_op, job) if configuration[:distributed_tracing]
+
               span.resource = resource
 
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_PUSH)
 
+              span.set_tag(
+                Datadog::Tracing::Metadata::Ext::TAG_KIND,
+                Datadog::Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER
+              )
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
@@ -45,6 +55,10 @@ module Datadog
           def configuration
             Datadog.configuration.tracing[:sidekiq]
           end
+
+          def propagation
+            @propagation ||= Contrib::Sidekiq::Distributed::Propagation.new
+          end
         end
       end
     end

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../../span_operation'
 require_relative '../../configuration/settings'
@@ -13,29 +13,37 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :tag_args do |o|
-              o.default { env_to_bool(Ext::ENV_TAG_JOB_ARGS, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_TAG_JOB_ARGS
+              o.default false
             end
 
             option :service_name
             option :client_service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
-            option :quantize, default: {}
+            option :error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
+            option :quantize, default: {}, type: :hash
+            option :distributed_tracing, default: false, type: :bool
           end
         end
       end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative '../../../distributed/fetcher'
+require_relative '../../../distributed/propagation'
+require_relative '../../../distributed/b3_multi'
+require_relative '../../../distributed/b3_single'
+require_relative '../../../distributed/datadog'
+require_relative '../../../distributed/none'
+require_relative '../../../distributed/trace_context'
+require_relative '../../../configuration/ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Sidekiq
+        module Distributed
+          # Extracts and injects propagation through HTTP headers.
+          class Propagation < Tracing::Distributed::Propagation
+            def initialize
+              super(
+                propagation_styles: {
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_MULTI_HEADER =>
+                    Tracing::Distributed::B3Multi.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER =>
+                    Tracing::Distributed::B3Single.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG =>
+                    Tracing::Distributed::Datadog.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT =>
+                    Tracing::Distributed::TraceContext.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new
+                })
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,36 +7,36 @@ module Datadog
         # Sidekiq integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          CLIENT_SERVICE_NAME = 'sidekiq-client'.freeze
-          ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_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
-          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
-          TAG_JOB_RETRY = 'sidekiq.job.retry'.freeze
-          TAG_JOB_RETRY_COUNT = 'sidekiq.job.retry_count'.freeze
-          TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'.freeze
-          TAG_JOB_ARGS = 'sidekiq.job.args'.freeze
-          TAG_COMPONENT = 'sidekiq'.freeze
-          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
+          CLIENT_SERVICE_NAME = 'sidekiq-client'
+          ENV_ENABLED = 'DD_TRACE_SIDEKIQ_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
+          ENV_TAG_JOB_ARGS = 'DD_SIDEKIQ_TAG_JOB_ARGS'
+          SERVICE_NAME = 'sidekiq'
+          SPAN_PUSH = 'sidekiq.push'
+          SPAN_JOB = 'sidekiq.job'
+          SPAN_JOB_FETCH = 'sidekiq.job_fetch'
+          SPAN_REDIS_INFO = 'sidekiq.redis_info'
+          SPAN_HEARTBEAT = 'sidekiq.heartbeat'
+          SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'
+          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'
+          SPAN_STOP = 'sidekiq.stop'
+          TAG_JOB_DELAY = 'sidekiq.job.delay'
+          TAG_JOB_ID = 'sidekiq.job.id'
+          TAG_JOB_QUEUE = 'sidekiq.job.queue'
+          TAG_JOB_RETRY = 'sidekiq.job.retry'
+          TAG_JOB_RETRY_COUNT = 'sidekiq.job.retry_count'
+          TAG_JOB_WRAPPER = 'sidekiq.job.wrapper'
+          TAG_JOB_ARGS = 'sidekiq.job.args'
+          TAG_COMPONENT = 'sidekiq'
+          TAG_OPERATION_PUSH = 'push'
+          TAG_OPERATION_JOB = 'job'
+          TAG_OPERATION_JOB_FETCH = 'job_fetch'
+          TAG_OPERATION_REDIS_INFO = 'redis_info'
+          TAG_OPERATION_HEARTBEAT = 'heartbeat'
+          TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'
+          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'
+          TAG_OPERATION_STOP = 'stop'
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative 'patcher'
@@ -14,6 +12,7 @@ module Datadog
 
           MINIMUM_VERSION = Gem::Version.new('3.5.4')
           MINIMUM_SERVER_INTERNAL_TRACING_VERSION = Gem::Version.new('5.2.4')
+          MINIMUM_CAPSULE_VERSION = Gem::Version.new('7.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sidekiq
@@ -39,6 +38,13 @@ module Datadog
             version >= MINIMUM_SERVER_INTERNAL_TRACING_VERSION
           end
 
+          # Capsules are a new way of configuring Sidekiq that was introduced in version 7
+          # that change the way some of the configuration data is exposed. Certain patches
+          # are applied differently for versions of Sidekiq that support capsules.
+          def self.supports_capsules?
+            version >= MINIMUM_CAPSULE_VERSION
+          end
+
           def new_configuration
             Configuration::Settings.new
           end

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../patcher'
 
@@ -49,9 +49,17 @@ module Datadog
           end
 
           def patch_server_heartbeat
+            require_relative 'server_internal_tracer/stop'
             require_relative 'server_internal_tracer/heartbeat'
 
-            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
+            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Stop)
+
+            # Sidekiq 7 changed method `heartbeat` to `beat`
+            if ::Sidekiq::Launcher.private_method_defined? :heartbeat
+              ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
+            end
+
+            ::Sidekiq::Launcher.prepend(ServerInternalTracer::Beat) if ::Sidekiq::Launcher.private_method_defined? :beat
           end
 
           def patch_server_job_fetch
@@ -69,7 +77,11 @@ module Datadog
           def patch_redis_info
             require_relative 'server_internal_tracer/redis_info'
 
-            ::Sidekiq.singleton_class.prepend(ServerInternalTracer::RedisInfo)
+            if Integration.supports_capsules?
+              ::Sidekiq::Config.prepend(ServerInternalTracer::RedisInfo)
+            else
+              ::Sidekiq.singleton_class.prepend(ServerInternalTracer::RedisInfo)
+            end
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,14 +7,18 @@ module Datadog
         module ServerInternalTracer
           # Trace when a Sidekiq process has a heartbeat
           module Heartbeat
-            def stop
+            private
+
+            def heartbeat
               configuration = Datadog.configuration.tracing[:sidekiq]
 
-              Datadog::Tracing.trace(Ext::SPAN_STOP, service: configuration[:service_name]) do |span|
+              Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|
                 span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
+                span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 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)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HEARTBEAT)
 
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
@@ -24,15 +28,20 @@ module Datadog
                 super
               end
             end
+          end
 
+          # This implementation is identical to `Heartbeat`, but patching `beat` method instead.
+          module Beat
             private
 
-            def heartbeat
+            def beat
               configuration = Datadog.configuration.tracing[:sidekiq]
 
               Datadog::Tracing.trace(Ext::SPAN_HEARTBEAT, service: configuration[:service_name]) do |span|
                 span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
+                span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_HEARTBEAT)
 

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -15,6 +15,8 @@ module Datadog
               Datadog::Tracing.trace(Ext::SPAN_JOB_FETCH, service: configuration[:service_name]) do |span|
                 span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
+                span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB_FETCH)
 

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -13,6 +13,8 @@ module Datadog
               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(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REDIS_INFO)
 

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -14,6 +14,8 @@ module Datadog
               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(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 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)
 
@@ -34,6 +36,8 @@ module Datadog
               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(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
                 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)
 

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Sidekiq
+        module ServerInternalTracer
+          # Trace when Sidekiq stops
+          module Stop
+            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(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
+                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
+          end
+        end
+      end
+    end
+  end
+end