datadog 2.19.0 → 2.21.0

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

@@ -20,7 +20,7 @@ module Datadog
           register_as :sidekiq
 
           def self.version
-            Gem.loaded_specs['sidekiq'] && Gem.loaded_specs['sidekiq'].version
+            Gem.loaded_specs['sidekiq']&.version
           end
 
           def self.loaded?

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

@@ -25,7 +25,7 @@ module Datadog
               job['class'].to_s
             end
           rescue => e
-            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job['jid']}): #{e}" }
+            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job["jid"]}): #{e}" }
 
             job['class'].to_s
           end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :sinatra
 
           def self.version
-            Gem.loaded_specs['sinatra'] && Gem.loaded_specs['sinatra'].version
+            Gem.loaded_specs['sinatra']&.version
           end
 
           def self.loaded?

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

@@ -28,63 +28,61 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span|
-              begin
-                # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
-                # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
-                span.resource = nil
+              # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
+              # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
+              span.resource = nil
 
-                Sinatra::Env.set_datadog_span(env, span)
+              Sinatra::Env.set_datadog_span(env, span)
 
-                response = @app.call(env)
-              ensure
-                Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
+              response = @app.call(env)
+            ensure
+              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)
+              span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+              span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-                request = ::Sinatra::Request.new(env)
+              request = ::Sinatra::Request.new(env)
 
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
 
-                datadog_route = Sinatra::Env.route_path(env)
+              datadog_route = Sinatra::Env.route_path(env)
 
-                span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
+              span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
 
-                if request.script_name && !request.script_name.empty?
-                  span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
-                end
+              if request.script_name && !request.script_name.empty?
+                span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
+              end
 
-                # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
-                # resource; if no resource was set, let's use a fallback
-                span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+              # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
+              # resource; if no resource was set, let's use a fallback
+              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
 
-                rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
+              rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
 
-                # This propagates the Sinatra resource to the Rack span,
-                # since the latter is unaware of what the resource might be
-                # and would fallback to a generic resource name when unset
-                rack_request_span.resource ||= span.resource if rack_request_span
+              # This propagates the Sinatra resource to the Rack span,
+              # since the latter is unaware of what the resource might be
+              # and would fallback to a generic resource name when unset
+              rack_request_span.resource ||= span.resource if rack_request_span
 
-                if response
-                  if (status = response[0])
-                    sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
+              if response
+                if (status = response[0])
+                  sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
 
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
-                    span.set_error(env['sinatra.error']) if sinatra_response.server_error?
-                  end
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
+                  span.set_error(env['sinatra.error']) if sinatra_response.server_error?
+                end
 
-                  if (headers = response[1])
-                    Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
-                  end
+                if (headers = response[1])
+                  Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
                 end
+              end
 
-                # Set analytics sample rate
-                Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+              # Set analytics sample rate
+              Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-                # Measure service stats
-                Contrib::Analytics.set_measured(span)
-              end
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
             end
           end
           # rubocop:enable Metrics/MethodLength

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :sneakers, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sneakers'] && Gem.loaded_specs['sneakers'].version
+            Gem.loaded_specs['sneakers']&.version
           end
 
           def self.loaded?

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

@@ -11,7 +11,7 @@ module Datadog
         NO_SOURCE = [].freeze
 
         def self.fetch_service_name(env, default)
-          ENV.fetch(env) do
+          DATADOG_ENV.fetch(env) do
             if Datadog.configuration.tracing.contrib.global_default_service_name.enabled
               return Datadog.configuration.service
             end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :stripe
 
           def self.version
-            Gem.loaded_specs['stripe'] && Gem.loaded_specs['stripe'].version
+            Gem.loaded_specs['stripe']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/stripe/request.rb

@@ -54,7 +54,7 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_METHOD, event.method)
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug(e.message)
           end
 

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :sucker_punch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sucker_punch'] && Gem.loaded_specs['sucker_punch'].version
+            Gem.loaded_specs['sucker_punch']&.version
           end
 
           def self.loaded?

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

@@ -19,7 +19,7 @@ module Datadog
           TAG_COMPONENT = 'trilogy'
           TAG_OPERATION_QUERY = 'query'
           TAG_SYSTEM = 'mysql'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
+          PEER_SERVICE_SOURCES = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :trilogy
 
           def self.version
-            Gem.loaded_specs['trilogy'] && Gem.loaded_specs['trilogy'].version
+            Gem.loaded_specs['trilogy']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/utils/quantization/hash.rb

@@ -21,7 +21,7 @@ module Datadog
             def format(hash_obj, options = {})
               options ||= {}
               format!(hash_obj, options)
-            rescue StandardError
+            rescue
               options[:placeholder] || PLACEHOLDER
             end
 
@@ -66,7 +66,7 @@ module Datadog
             def format_array(value, options)
               if value.any? { |v| v.class <= ::Hash || v.class <= Array }
                 first_entry = format_value(value.first, options)
-                value.size > 1 ? [first_entry, options[:placeholder]] : [first_entry]
+                (value.size > 1) ? [first_entry, options[:placeholder]] : [first_entry]
                 # Otherwise short-circuit and return single placeholder
               else
                 [options[:placeholder]]
@@ -77,19 +77,19 @@ module Datadog
               {}.tap do |options|
                 # Show
                 # If either is :all, value becomes :all
-                options[:show] =  if original[:show] == :all || additional[:show] == :all
-                                    :all
-                                  else
-                                    (original[:show] || []).dup.concat(additional[:show] || []).uniq
-                                  end
+                options[:show] = if original[:show] == :all || additional[:show] == :all
+                  :all
+                else
+                  (original[:show] || []).dup.concat(additional[:show] || []).uniq
+                end
 
                 # Exclude
                 # If either is :all, value becomes :all
                 options[:exclude] = if original[:exclude] == :all || additional[:exclude] == :all
-                                      :all
-                                    else
-                                      (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
-                                    end
+                  :all
+                else
+                  (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
+                end
 
                 options[:placeholder] = additional[:placeholder] || original[:placeholder]
               end

data/lib/datadog/tracing/contrib/utils/quantization/http.rb

@@ -16,16 +16,16 @@ module Datadog
             # but adjusted to parse only <scheme>://<host>:<port>/ components
             # and stop there, since we don't care about the path, query string,
             # and fragment components
-            RFC3986_URL_BASE = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)))(?:\/|\z)/.freeze # rubocop:disable Style/RegexpLiteral, Layout/LineLength
+            RFC3986_URL_BASE = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)))(?:\/|\z)/.freeze # rubocop:disable Layout/LineLength
 
             module_function
 
             def url(url, options = {})
               url!(url, options)
-            rescue StandardError
+            rescue
               placeholder = options[:placeholder] || PLACEHOLDER
 
-              options[:base] == :exclude ? placeholder : "#{base_url(url)}/#{placeholder}"
+              (options[:base] == :exclude) ? placeholder : "#{base_url(url)}/#{placeholder}"
             end
 
             def base_url(url, options = {})
@@ -43,7 +43,7 @@ module Datadog
                 # Format the query string
                 if uri.query
                   query = query(uri.query, options[:query])
-                  uri.query = (!query.nil? && query.empty? ? nil : query)
+                  uri.query = ((!query.nil? && query.empty?) ? nil : query)
                 end
 
                 # Remove any URI fragments
@@ -59,7 +59,7 @@ module Datadog
 
             def query(query, options = {})
               query!(query, options)
-            rescue StandardError
+            rescue
               options[:placeholder] || PLACEHOLDER
             end
 
@@ -78,7 +78,7 @@ module Datadog
                   if options[:exclude].include?(key)
                     [nil, nil]
                   else
-                    value = options[:show] == :all || options[:show].include?(key) ? value : nil
+                    value = (options[:show] == :all || options[:show].include?(key)) ? value : nil
                     [key, value]
                   end
                 end

data/lib/datadog/tracing/diagnostics/environment_logger.rb

@@ -86,7 +86,11 @@ module Datadog
             sampler = Datadog.configuration.tracing.sampler
             return Datadog.configuration.tracing.sampling.default_rate unless sampler
 
-            sampler.sample_rate(nil) rescue nil
+            begin
+              sampler.sample_rate(nil)
+            rescue
+              nil
+            end
           end
 
           # DEV: We currently only support SimpleRule instances.

data/lib/datadog/tracing/distributed/b3_single.rb

@@ -28,7 +28,7 @@ module Datadog
           span_id = digest.span_id || 0 # Fall back to zero (invalid) if not present
 
           # DEV: We need these to be hex encoded
-          value = "#{format('%032x', digest.trace_id)}-#{format('%016x', span_id)}"
+          value = "#{format("%032x", digest.trace_id)}-#{format("%016x", span_id)}"
 
           if digest.trace_sampling_priority
             sampling_priority = Helpers.clamp_sampling_priority(

data/lib/datadog/tracing/distributed/baggage.rb

@@ -17,15 +17,18 @@ module Datadog
         BAGGAGE_KEY = 'baggage'
         DD_TRACE_BAGGAGE_MAX_ITEMS = 64
         DD_TRACE_BAGGAGE_MAX_BYTES = 8192
+        BAGGAGE_TAG_KEYS_MATCH_ALL = ['*'].freeze
         SAFE_CHARACTERS_KEY = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$!#&'*+-.^_`|~"
         SAFE_CHARACTERS_VALUE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789$!#&'()*+-./:<>?@[]^_`{|}~"
 
         def initialize(
           fetcher:,
-          baggage_key: BAGGAGE_KEY
+          baggage_key: BAGGAGE_KEY,
+          baggage_tag_keys: ::Datadog.configuration.tracing.baggage_tag_keys
         )
           @baggage_key = baggage_key
           @fetcher = fetcher
+          @baggage_tag_keys = baggage_tag_keys
         end
 
         def inject!(digest, data)
@@ -36,7 +39,13 @@ module Datadog
 
           begin
             if baggage_items.size > DD_TRACE_BAGGAGE_MAX_ITEMS
-              ::Datadog.logger.warn('Baggage item limit exceeded, dropping excess items')
+              ::Datadog.logger.warn("Baggage item limit (#{DD_TRACE_BAGGAGE_MAX_ITEMS}) exceeded, dropping excess items")
+              # Record telemetry for item count truncation
+              record_telemetry_metric(
+                'context_header.truncated',
+                1,
+                {'header_style' => 'baggage', 'truncation_reason' => 'baggage_item_count_exceeded'}
+              )
               baggage_items = baggage_items.first(DD_TRACE_BAGGAGE_MAX_ITEMS)
             end
 
@@ -47,7 +56,13 @@ module Datadog
               item = "#{encode_item(key, SAFE_CHARACTERS_KEY)}=#{encode_item(value, SAFE_CHARACTERS_VALUE)}"
               item_size = item.bytesize + (encoded_items.empty? ? 0 : 1) # +1 for comma if not first item
               if total_size + item_size > DD_TRACE_BAGGAGE_MAX_BYTES
-                ::Datadog.logger.warn('Baggage header size exceeded, dropping excess items')
+                ::Datadog.logger.warn("Baggage header size (#{DD_TRACE_BAGGAGE_MAX_BYTES}) exceeded, dropping excess items")
+                # Record telemetry for byte count truncation
+                record_telemetry_metric(
+                  'context_header.truncated',
+                  1,
+                  {'header_style' => 'baggage', 'truncation_reason' => 'baggage_byte_count_exceeded'}
+                )
                 break # stop adding items when size limit is reached
               end
               encoded_items << item
@@ -57,10 +72,12 @@ module Datadog
             # edge case where a single item is too large
             return if encoded_items.empty?
 
-            header_value = encoded_items.join(',')
-            data[@baggage_key] = header_value
+            data[@baggage_key] = encoded_items.join(',')
+
+            # Record telemetry for successful injection
+            record_telemetry_metric('context_header_style.injected', 1, {'header_style' => 'baggage'})
           rescue => e
-            ::Datadog.logger.warn("Failed to encode and inject baggage header: #{e.message}")
+            ::Datadog.logger.warn("Failed to encode and inject baggage header: #{e.class}: #{e}")
           end
         end
 
@@ -72,8 +89,17 @@ module Datadog
           baggage = parse_baggage_header(fetcher[@baggage_key])
           return unless baggage
 
+          # Convert selected baggage items to span tags based on configuration
+          baggage_tags = build_baggage_tags(baggage)
+
+          # Record telemetry for successful extraction only if baggage is not empty
+          unless baggage.empty?
+            record_telemetry_metric('context_header_style.extracted', 1, {'header_style' => 'baggage'})
+          end
+
           TraceDigest.new(
             baggage: baggage,
+            trace_distributed_tags: baggage_tags
           )
         end
 
@@ -115,16 +141,55 @@ module Datadog
           baggages.each do |key_value|
             key, value = key_value.split('=', 2)
             # If baggage is malformed, return an empty hash
-            return {} unless key && value
+            if key.nil? || value.nil?
+              # Record telemetry for malformed header
+              record_telemetry_metric('context_header_style.malformed', 1, {'header_style' => 'baggage'})
+              return {}
+            end
 
             key = URI.decode_www_form_component(key.strip)
             value = URI.decode_www_form_component(value.strip)
-            return {} if key.empty? || value.empty?
+            if key.empty? || value.empty?
+              # Record telemetry for malformed header
+              record_telemetry_metric('context_header_style.malformed', 1, {'header_style' => 'baggage'})
+              return {}
+            end
 
             baggage[key] = value
           end
           baggage
         end
+
+        # Convert selected baggage items to span tags
+        # Baggage carries important contextual information (like user.id, session.id) across distributed services,
+        # but isn't searchable by default.
+        def build_baggage_tags(baggage)
+          return {} if baggage.empty?
+
+          # Get the configuration for which baggage keys should become span tags
+          baggage_tag_keys = @baggage_tag_keys
+          return {} if baggage_tag_keys.empty?
+
+          # If wildcard is specified, use all baggage keys
+          baggage_tag_keys = baggage if baggage_tag_keys == BAGGAGE_TAG_KEYS_MATCH_ALL
+
+          tags = {}
+
+          baggage_tag_keys.each do |key, _| # rubocop:disable Style/HashEachMethods
+            value = baggage[key]
+            next if value.nil? || value.empty?
+
+            tags["baggage.#{key}"] = value
+          end
+
+          tags
+        end
+
+        # Record telemetry metrics for baggage operations
+        def record_telemetry_metric(metric_name, value, tags)
+          telemetry = ::Datadog.send(:components).telemetry
+          telemetry.inc('instrumentation_telemetry_data.tracers', metric_name, value, tags: tags)
+        end
       end
     end
   end

data/lib/datadog/tracing/distributed/datadog.rb

@@ -55,17 +55,16 @@ module Datadog
         def extract(data)
           fetcher = @fetcher.new(data)
 
-          trace_id  = parse_trace_id(fetcher)
+          trace_id = parse_trace_id(fetcher)
           parent_id = parse_parent_id(fetcher)
 
           sampling_priority = Helpers.parse_decimal_id(fetcher[@sampling_priority_key])
           origin = fetcher[@origin_key]
 
           # Return early if this propagation is not valid
-          # DEV: To be valid we need to have a trace id and a parent id
-          #      or when it is a synthetics trace, just the trace id.
+          # DEV: To be valid we need to have a trace id and a parent id or an origin id.
           # DEV: `Fetcher#id` will not return 0
-          return unless (trace_id && parent_id) || (origin && trace_id)
+          return if trace_id.nil? || parent_id.nil? && origin.nil?
 
           trace_distributed_tags = extract_tags(fetcher)
 
@@ -173,7 +172,7 @@ module Datadog
 
         def set_tags_propagation_error(reason:)
           active_trace = Tracing.active_trace
-          active_trace.set_tag('_dd.propagation_error', reason) if active_trace
+          active_trace&.set_tag('_dd.propagation_error', reason)
           nil
         end
 

data/lib/datadog/tracing/distributed/datadog_tags_codec.rb

@@ -31,19 +31,17 @@ module Datadog
         # @return [String] serialized tags hash
         # @raise [EncodingError] if tags cannot be serialized to the `x-datadog-tags` format
         def self.encode(tags)
-          begin
-            tags.map do |raw_key, raw_value|
-              key = raw_key.to_s
-              value = raw_value.to_s
+          tags.map do |raw_key, raw_value|
+            key = raw_key.to_s
+            value = raw_value.to_s
 
-              raise EncodingError, "Invalid key `#{key}` for value `#{value}`" unless VALID_KEY_CHARS.match?(key)
-              raise EncodingError, "Invalid value `#{value}` for key `#{key}`" unless VALID_VALUE_CHARS.match?(value)
+            raise EncodingError, "Invalid key `#{key}` for value `#{value}`" unless VALID_KEY_CHARS.match?(key)
+            raise EncodingError, "Invalid value `#{value}` for key `#{key}`" unless VALID_VALUE_CHARS.match?(value)
 
-              "#{key}=#{value.strip}"
-            end.join(',')
-          rescue => e
-            raise EncodingError, "Error encoding tags `#{tags}`: `#{e}`"
-          end
+            "#{key}=#{value.strip}"
+          end.join(',')
+        rescue => e
+          raise EncodingError, "Error encoding tags `#{tags}`: `#{e}`"
         end
 
         # Deserializes a `x-datadog-tags`-formatted String into a {Hash<String,String>}.
@@ -52,7 +50,7 @@ module Datadog
         # @return [Hash<String,String>] decoded input as a hash of strings
         # @raise [DecodingError] if string does not conform to the `x-datadog-tags` format
         def self.decode(string)
-          result = Hash[string.split(',').map do |raw_tag|
+          result = (string.split(',').map do |raw_tag|
             raw_tag.split('=', 2).tap do |raw_key, raw_value|
               key = raw_key.to_s
               value = raw_value.to_s
@@ -62,7 +60,7 @@ module Datadog
 
               value.strip!
             end
-          end]
+          end).to_h
 
           raise DecodingError, "Invalid empty tags: #{string}" if result.empty? && !string.empty?
 

data/lib/datadog/tracing/distributed/helpers.rb

@@ -25,7 +25,7 @@ module Datadog
 
           value = value.to_s
 
-          num   = value.to_i
+          num = value.to_i
 
           # Ensure the parsed number is the same as the original string value
           # e.g. We want to make sure to throw away `'nan'.to_i == 0`

data/lib/datadog/tracing/distributed/none.rb

@@ -8,10 +8,12 @@ module Datadog
       # @see https://github.com/open-telemetry/opentelemetry-specification/blob/255a6c52b8914a2ed7e26bb5585abecab276aafc/specification/sdk-environment-variables.md?plain=1#L88
       class None
         # No-op
-        def inject!(_digest, _data); end
+        def inject!(_digest, _data)
+        end
 
         # No-op
-        def extract(_data); end
+        def extract(_data)
+        end
       end
     end
   end

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

@@ -155,7 +155,10 @@ module Datadog
             # Merge with baggage if present
             digest = @baggage_propagator.extract(data)
             if digest
-              extracted_trace_digest.merge(baggage: digest.baggage)
+              extracted_trace_digest.merge(
+                baggage: digest.baggage,
+                trace_distributed_tags: digest.trace_distributed_tags
+              )
             else
               extracted_trace_digest
             end

data/lib/datadog/tracing/distributed/propagation_policy.rb

@@ -31,7 +31,7 @@ module Datadog
             return false
           end
 
-          return pin_config[:distributed_tracing] if pin_config && pin_config.key?(:distributed_tracing)
+          return pin_config[:distributed_tracing] if pin_config&.key?(:distributed_tracing)
           return global_config[:distributed_tracing] if global_config
 
           true