ddtrace 1.12.1 → 1.18.0

data/lib/datadog/tracing/contrib/rest_client/request_patch.rb

@@ -34,16 +34,23 @@ module Datadog
             def datadog_tag_request(uri, span)
               span.resource = method.to_s.upcase
 
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_service]
+                )
+              end
+
+              # 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_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-              # Tag as an external peer service
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
 
               # Set analytics sample rate
@@ -53,6 +60,13 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method.to_s.upcase)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(
+                  Core::Utils::Hash::CaseInsensitiveWrapper.new(processed_headers)
+                )
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def datadog_trace_request(uri)
@@ -71,6 +85,12 @@ module Datadog
                 # If so, add additional tags.
                 if response.is_a?(::RestClient::Response)
                   span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
+
+                  span.set_tags(
+                    Datadog.configuration.tracing.header_tags.response_tags(
+                      Core::Utils::Hash::CaseInsensitiveWrapper.new(response.net_http_res.to_hash)
+                    )
+                  )
                 end
               end
             rescue ::RestClient::ExceptionWithResponse => e

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

@@ -11,18 +11,21 @@ module Datadog
           # Custom settings for the Roda integration
           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

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

@@ -12,8 +12,9 @@ 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
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,7 +7,7 @@ module Datadog
         # SemanticLogger integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEMANTIC_LOGGER_ENABLED'.freeze
+          ENV_ENABLED = 'DD_TRACE_SEMANTIC_LOGGER_ENABLED'
         end
       end
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/logging/ext'
-
 module Datadog
   module Tracing
     module Contrib
@@ -15,6 +13,7 @@ module Datadog
           # Instance methods for configuration
           module InstanceMethods
             def log(log, message = nil, progname = nil, &block)
+              return super unless Datadog.configuration.tracing.log_injection
               return super unless Datadog.configuration.tracing[:semantic_logger].enabled
               return super unless log.is_a?(::SemanticLogger::Log)
 
@@ -22,25 +21,10 @@ module Datadog
 
               # Retrieves trace information for current thread
               correlation = Tracing.correlation
-              # merge original lambda with datadog context
-
-              datadog_trace_log_hash = {
-                # Adds IDs as tags to log output
-                dd: {
-                  # To preserve precision during JSON serialization, use strings for large numbers
-                  trace_id: correlation.trace_id.to_s,
-                  span_id: correlation.span_id.to_s,
-                  env: correlation.env.to_s,
-                  service: correlation.service.to_s,
-                  version: correlation.version.to_s
-                },
-                ddsource: Core::Logging::Ext::DD_SOURCE
-              }
 
-              # # if the user already has conflicting log_tags
-              # # we want them to clobber ours, because we should allow them to override
-              # # if needed.
-              log.named_tags = datadog_trace_log_hash.merge(original_named_tags)
+              # if the user already has conflicting log_tags
+              # we want them to clobber ours, because we should allow them to override if needed.
+              log.named_tags = correlation.to_h.merge(original_named_tags)
               super(log, message, progname, &block)
             end
           end

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

@@ -12,18 +12,21 @@ 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
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,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/utils.rb

@@ -49,19 +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
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               # 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

@@ -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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,18 +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
-          TAG_MESSAGING_SYSTEM = 'amazonsqs'.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/sidekiq/configuration/settings.rb

@@ -13,30 +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 :distributed_tracing, default: false
+            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/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,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/sinatra/configuration/settings.rb

@@ -14,23 +14,25 @@ module Datadog
             }.freeze
 
             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, nil) }
-              o.lazy
+              o.type :bool, nilable: true
+              o.env Ext::ENV_ANALYTICS_ENABLED
             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 :distributed_tracing, default: true
-            option :headers, default: DEFAULT_HEADERS
-            option :resource_script_names, default: false
+            option :distributed_tracing, default: true, type: :bool
+            option :headers, default: DEFAULT_HEADERS, type: :hash
+            option :resource_script_names, default: false, type: :bool
 
             option :service_name
           end

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

@@ -19,23 +19,6 @@ module Datadog
             env[Ext::RACK_ENV_SINATRA_REQUEST_SPAN] = span
           end
 
-          def request_header_tags(env, headers)
-            headers ||= []
-
-            {}.tap do |result|
-              headers.each do |header|
-                rack_header = header_to_rack_header(header)
-                if env.key?(rack_header)
-                  result[Tracing::Metadata::Ext::HTTP::RequestHeaders.to_tag(header)] = env[rack_header]
-                end
-              end
-            end
-          end
-
-          def header_to_rack_header(name)
-            "HTTP_#{name.to_s.upcase.gsub(/[-\s]/, '_')}"
-          end
-
           def route_path(env, use_script_names: Datadog.configuration.tracing[:sinatra][:resource_script_names])
             return unless env['sinatra.route']
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,27 +7,27 @@ module Datadog
         # Sinatra integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          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_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
-          TAG_APP_NAME = 'sinatra.app.name'.freeze
-          TAG_COMPONENT = 'sinatra'.freeze
-          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
-          TAG_OPERATION_ROUTE = 'route'.freeze
-          TAG_ROUTE_PATH = 'sinatra.route.path'.freeze
-          TAG_SCRIPT_NAME = 'sinatra.script_name'.freeze
-          TAG_TEMPLATE_ENGINE = 'sinatra.template_engine'.freeze
-          TAG_TEMPLATE_NAME = 'sinatra.template_name'.freeze
+          ENV_ENABLED = 'DD_TRACE_SINATRA_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SINATRA_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SINATRA_ANALYTICS_SAMPLE_RATE'
+          RACK_ENV_SINATRA_REQUEST_SPAN = 'datadog.sinatra_request_span'
+          SPAN_RENDER_TEMPLATE = 'sinatra.render_template'
+          SPAN_REQUEST = 'sinatra.request'
+          SPAN_ROUTE = 'sinatra.route'
+          TAG_APP_NAME = 'sinatra.app.name'
+          TAG_COMPONENT = 'sinatra'
+          TAG_OPERATION_RENDER_TEMPLATE = 'render_template'
+          TAG_OPERATION_REQUEST = 'request'
+          TAG_OPERATION_ROUTE = 'route'
+          TAG_ROUTE_PATH = 'sinatra.route.path'
+          TAG_SCRIPT_NAME = 'sinatra.script_name'
+          TAG_TEMPLATE_ENGINE = 'sinatra.template_engine'
+          TAG_TEMPLATE_NAME = 'sinatra.template_name'
 
           # === 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
+          RACK_ENV_REQUEST_SPAN = 'datadog.sinatra_request_span'
+          RACK_ENV_MIDDLEWARE_START_TIME = 'datadog.sinatra_middleware_start_time'
+          RACK_ENV_MIDDLEWARE_TRACED = 'datadog.sinatra_middleware_traced'
           # === Deprecated: To be removed ===
         end
       end

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

@@ -3,9 +3,9 @@
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative '../rack/ext'
+require_relative '../rack/header_tagging'
 require_relative 'env'
 require_relative 'ext'
-require_relative 'headers'
 
 module Datadog
   module Tracing
@@ -20,8 +20,6 @@ module Datadog
 
           # rubocop:disable Metrics/AbcSize
           # rubocop:disable Metrics/MethodLength
-          # rubocop:disable Metrics/CyclomaticComplexity
-          # rubocop:disable Metrics/PerceivedComplexity
           def call(env)
             # Set the trace context (e.g. distributed tracing)
             if configuration[:distributed_tracing] && Tracing.active_trace.nil?
@@ -45,9 +43,7 @@ module Datadog
 
                 response = @app.call(env)
               ensure
-                Sinatra::Env.request_header_tags(env, configuration[:headers][:request]).each do |name, value|
-                  span.set_tag(name, value) if span.get_tag(name).nil?
-                end
+                Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
@@ -85,12 +81,7 @@ module Datadog
                   end
 
                   if (headers = response[1])
-                    Sinatra::Headers.response_header_tags(
-                      headers,
-                      configuration[:headers][:response]
-                    ).each do |name, value|
-                      span.set_tag(name, value) if span.get_tag(name).nil?
-                    end
+                    Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
                   end
                 end
 
@@ -104,8 +95,6 @@ module Datadog
           end
           # rubocop:enable Metrics/AbcSize
           # rubocop:enable Metrics/MethodLength
-          # rubocop:enable Metrics/CyclomaticComplexity
-          # rubocop:enable Metrics/PerceivedComplexity
 
           private
 

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

@@ -11,23 +11,29 @@ module Datadog
           # Default settings for the Shoryuken integration
           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