ddtrace 1.1.0 → 1.12.1

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

@@ -1,10 +1,10 @@
-# typed: true
+# frozen_string_literal: 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 'distributed/propagation'
+require_relative 'ext'
+require_relative 'utils'
 
 module Datadog
   module Tracing
@@ -12,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]
@@ -23,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])
@@ -46,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,8 +1,8 @@
-# typed: false
+# frozen_string_literal: true
 
-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
@@ -36,6 +36,7 @@ module Datadog
             option :client_service_name
             option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
             option :quantize, default: {}
+            option :distributed_tracing, default: false
           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,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -16,8 +14,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 +30,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,6 @@
-# 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
@@ -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,6 +1,6 @@
-# typed: false
+# frozen_string_literal: true
 
-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,43 @@ 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/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
-            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'
+
+            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
@@ -9,12 +9,39 @@ module Datadog
           module Heartbeat
             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|
                 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)
+
+                # 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
+
+          # This implementation is identical to `Heartbeat`, but patching `beat` method instead.
+          module Beat
+            private
+
+            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/{scheduled_push.rb → redis_info.rb}

@@ -1,21 +1,22 @@
-# typed: true
+# frozen_string_literal: 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 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(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)
+                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,57 @@
+# frozen_string_literal: 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(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)
+
+                # 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(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)
+
+                # 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_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

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

@@ -1,11 +1,11 @@
-# typed: true
+# frozen_string_literal: 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 'utils'
+require_relative '../utils/quantization/hash'
+require_relative 'distributed/propagation'
 
 module Datadog
   module Tracing
@@ -13,7 +13,7 @@ module Datadog
       module Sidekiq
         # Tracer is a Sidekiq server-side middleware which traces executed jobs
         class ServerTracer
-          include Tracing
+          include Utils
 
           QUANTIZE_SHOW_ALL = { args: { show: :all } }.freeze
 
@@ -22,9 +22,16 @@ module Datadog
             @error_handler = options[:error_handler] || configuration[:error_handler]
           end
 
+          # rubocop:disable Metrics/MethodLength
+          # rubocop:disable Metrics/AbcSize
           def call(worker, job, queue)
             resource = job_resource(job)
 
+            if configuration[:distributed_tracing]
+              trace_digest = propagation.extract(job)
+              Datadog::Tracing.continue_trace!(trace_digest)
+            end
+
             service = worker_config(resource, :service_name) || @sidekiq_service
             # DEV-2.0: Remove `tag_args`, as `quantize` can fulfill the same contract
             tag_args = worker_config(resource, :tag_args) || configuration[:tag_args]
@@ -38,9 +45,16 @@ module Datadog
             ) do |span|
               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_JOB)
 
+              span.set_tag(
+                Datadog::Tracing::Metadata::Ext::TAG_KIND,
+                Datadog::Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER
+              )
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
@@ -64,10 +78,16 @@ module Datadog
 
               yield
             end
+            # rubocop:enable Metrics/MethodLength
+            # rubocop:enable Metrics/AbcSize
           end
 
           private
 
+          def propagation
+            @propagation ||= Contrib::Sidekiq::Distributed::Propagation.new
+          end
+
           def quantize_args(quantize, args)
             quantize_options = quantize && quantize[:args]
             quantize_options ||= {}

data/lib/datadog/tracing/contrib/sidekiq/{tracing.rb → utils.rb}

@@ -1,16 +1,16 @@
-# typed: true
+# frozen_string_literal: true
 
 require 'yaml'
 
-require 'datadog/core'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../../core'
+require_relative 'ext'
 
 module Datadog
   module Tracing
     module Contrib
       module Sidekiq
         # Common functionality used by both client-side and server-side tracers.
-        module Tracing
+        module Utils
           protected
 
           # If class is wrapping something else, the interesting resource info

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

@@ -1,7 +1,5 @@
-# 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

@@ -1,9 +1,7 @@
-# typed: true
-
 require 'time'
 
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/sinatra/ext'
+require_relative '../../metadata/ext'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -13,14 +11,12 @@ module Datadog
         module Env
           module_function
 
-          def datadog_span(env, app)
-            request_span = env[Ext::RACK_ENV_REQUEST_SPAN]
-            request_span && request_span[app]
+          def datadog_span(env)
+            env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN]
           end
 
-          def set_datadog_span(env, app, span)
-            hash = (env[Ext::RACK_ENV_REQUEST_SPAN] ||= {})
-            hash[app] = span
+          def set_datadog_span(env, span)
+            env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN] = span
           end
 
           def request_header_tags(env, headers)
@@ -40,24 +36,15 @@ module Datadog
             "HTTP_#{name.to_s.upcase.gsub(/[-\s]/, '_')}"
           end
 
-          # Was a Sinatra already traced in this request?
-          # We don't want to create spans for intermediate Sinatra
-          # middlewares that don't match the request at hand.
-          def middleware_traced?(env)
-            env[Ext::RACK_ENV_MIDDLEWARE_TRACED]
-          end
-
-          def set_middleware_traced(env, bool)
-            env[Ext::RACK_ENV_MIDDLEWARE_TRACED] = bool
-          end
+          def route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
+            return unless env['sinatra.route']
 
-          # The start time of the top-most Sinatra middleware.
-          def middleware_start_time(env)
-            env[Ext::RACK_ENV_MIDDLEWARE_START_TIME]
-          end
-
-          def set_middleware_start_time(env, time = Time.now.utc)
-            env[Ext::RACK_ENV_MIDDLEWARE_START_TIME] = time
+            _, path = env['sinatra.route'].split(' ', 2)
+            if use_script_names
+              env['SCRIPT_NAME'].to_s + path
+            else
+              path
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -10,9 +8,7 @@ module Datadog
           ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'.freeze
-          RACK_ENV_REQUEST_SPAN = 'datadog.sinatra_request_span'.freeze
-          RACK_ENV_MIDDLEWARE_START_TIME = 'datadog.sinatra_middleware_start_time'.freeze
-          RACK_ENV_MIDDLEWARE_TRACED = 'datadog.sinatra_middleware_traced'.freeze
+          RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'.freeze
           SPAN_RENDER_TEMPLATE = 'sinatra.render_template'.freeze
           SPAN_REQUEST = 'sinatra.request'.freeze
           SPAN_ROUTE = 'sinatra.route'.freeze
@@ -25,6 +21,12 @@ module Datadog
           TAG_SCRIPT_NAME = 'sinatra.script_name'.freeze
           TAG_TEMPLATE_ENGINE = 'sinatra.template_engine'.freeze
           TAG_TEMPLATE_NAME = 'sinatra.template_name'.freeze
+
+          # === Deprecated: To be removed ===
+          RACK_ENV_REQUEST_SPAN = 'datadog.sinatra_request_span'.freeze
+          RACK_ENV_MIDDLEWARE_START_TIME = 'datadog.sinatra_middleware_start_time'.freeze
+          RACK_ENV_MIDDLEWARE_TRACED = 'datadog.sinatra_middleware_traced'.freeze
+          # === Deprecated: To be removed ===
         end
       end
     end

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

@@ -1,7 +1,3 @@
-# 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
+# frozen_string_literal: true
 
-require 'datadog/tracing/metadata/ext'
+require_relative '../../metadata/ext'
 
 module Datadog
   module Tracing