comment updates, use URI, fix typing issue

Author: ZStriker19

lib/datadog/tracing/distributed/baggage.rb

@@ -80,10 +80,9 @@ def extract(data)
 
         private
 
-        # We can't use uri encode because it incorrectly encodes some characters
         def encode_item(item, safe_characters)
-          # Strip whitespace and URL-encode the item
-          result = CGI.escape(item.strip)
+          # Use URI encoding as base, then apply W3C Baggage specific transformations
+          result = URI.encode_www_form_component(item.strip)
           # Replace '+' with '%20' for space encoding consistency with W3C spec
           result = result.gsub('+', '%20')
           # Selectively decode percent-encoded characters that are considered "safe" in W3C Baggage spec

lib/datadog/tracing/distributed/propagation.rb

@@ -63,7 +63,7 @@ def inject!(digest, data)
 
           digest = digest.to_digest if digest.respond_to?(:to_digest)
           if digest.trace_id.nil? && digest.baggage.nil?
-            ::Datadog.logger.debug('Cannot inject distributed trace data: digest.trace_id is nil.')
+            ::Datadog.logger.debug('Cannot inject distributed trace data: digest.trace_id and digest.baggage are both nil.')
             return nil
           end
 
@@ -142,7 +142,7 @@ def extract(data)
               "Error extracting distributed trace data. Cause: #{e} Location: #{Array(e.backtrace).first}"
             )
           end
-          # Handle baggage after all other styles if present
+          # Handle baggage after all other styles
           extracted_trace_digest = propagate_baggage(data, extracted_trace_digest) if @baggage_propagator
 
           extracted_trace_digest