opentelemetry-propagator-xray 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37138890a1f8a087cbc71dfaa0414769db2623732dd79604da90e3eeef97de57
-  data.tar.gz: 6a4211c77df3b7b4916015339d761ffbee303590947d766fd8ba52110f8d3b66
+  metadata.gz: 7a8c7896357a650015a8d008da4faf15b525b783fbe7a894042251cdafcfd7b1
+  data.tar.gz: 921e90d4e947e60fc777cd48c762cf86bdb0c7c971b7e120117434d85bd5de73
 SHA512:
-  metadata.gz: 9bece17356a7fdd2eef0c0a9ce874d9c332a1408835d150931613f6841a22fd0f4147bbefe757df68d26c7d792bb9e0281925000139d95b52bb0002d58805854
-  data.tar.gz: d8e9479299857e615ed428ae1af4a8e38e318f15756cc0d6d2ed11710a7609a5791c14efc815975f3f6d4facba08f04f68b2eb988d94fa529b1f3d96a0976e31
+  metadata.gz: 1e703d3c64879aa9e67c6e4489733e0c37559c7f869e88145f0907434d4fbad5c122827ee9aeb2a311a5ceb05808abd08bc14a50ff6ae0a27abfef15bb05a862
+  data.tar.gz: c3cf2ba012c420c6407ab357db1b2a2a6674e7dad6f60caf738a2c97dffe082d7b7c622672e545ed70d64350e854f6215ca4dd04db3aacb073660d11e078fa07

data/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Release History: opentelemetry-propagator-xray
 
+### v0.26.1 / 2026-02-24
+
+* FIXED: Handle `Self` field in X-Amzn-Trace-Id header (#1958)
+* FIXED: Parse X-Amzn-Trace-Id header fields individually by name
+
 ### v0.26.0 / 2025-10-22
 
 * BREAKING CHANGE: Min Ruby Version 3.2
-
 * ADDED: Min Ruby Version 3.2
 
 ### v0.25.0 / 2025-09-30
@@ -17,7 +21,6 @@
 ### v0.23.0 / 2025-01-16
 
 * BREAKING CHANGE: Set minimum supported version to Ruby 3.1
-
 * ADDED: Set minimum supported version to Ruby 3.1
 
 ### v0.22.3 / 2024-11-26
@@ -34,14 +37,13 @@
 
 ### v0.22.0 / 2023-04-17
 
-* BREAKING CHANGE: Drop support for EoL Ruby 2.7 
-
-* ADDED: Drop support for EoL Ruby 2.7 
+* BREAKING CHANGE: Drop support for EoL Ruby 2.7
+* ADDED: Drop support for EoL Ruby 2.7
 
 ### v0.21.1 / 2023-01-14
 
-* DOCS: Fix gem homepage 
-* DOCS: More gem documentation fixes 
+* DOCS: Fix gem homepage
+* DOCS: More gem documentation fixes
 
 ### v0.21.0 / 2022-06-09
 
@@ -53,12 +55,12 @@
 
 ### v0.20.0 / 2021-08-12
 
-* ADDED: Xray compliant ids 
+* ADDED: Xray compliant ids
 
 ### v0.19.0 / 2021-06-23
 
 * FIXED: XRay propagator null exception (#833)
-* ADDED: Add Tracer.non_recording_span to API 
+* ADDED: Add Tracer.non_recording_span to API
 
 ### v0.18.0 / 2021-05-21
 

data/lib/opentelemetry/propagator/xray/text_map_propagator.rb

@@ -18,11 +18,23 @@ module OpenTelemetry
       # Propagates context in carriers in the xray single header format
       class TextMapPropagator
         XRAY_CONTEXT_KEY = 'X-Amzn-Trace-Id'
-        XRAY_CONTEXT_REGEX = /\ARoot=(?<trace_id>([a-z0-9\-]{35}))(?:;Parent=(?<span_id>([a-z0-9]{16})))?(?:;Sampled=(?<sampling_state>[01d](?![0-9a-f])))?(?:;(?<trace_state>.*))?\Z/ # rubocop:disable Lint/MixedRegexpCaptureTypes
         SAMPLED_VALUES = %w[1 d].freeze
         FIELDS = [XRAY_CONTEXT_KEY].freeze
 
-        private_constant :XRAY_CONTEXT_KEY, :XRAY_CONTEXT_REGEX, :SAMPLED_VALUES, :FIELDS
+        # Header parsing constants
+        KV_PAIR_DELIMITER = ';'
+        KEY_AND_VALUE_DELIMITER = '='
+        TRACE_ID_KEY = 'Root'
+        PARENT_ID_KEY = 'Parent'
+        SAMPLED_FLAG_KEY = 'Sampled'
+        TRACE_ID_LENGTH = 35
+        SPAN_ID_LENGTH = 16
+        VALID_SAMPLED_VALUES = %w[0 1 d].freeze
+
+        private_constant :XRAY_CONTEXT_KEY, :SAMPLED_VALUES, :FIELDS,
+                         :KV_PAIR_DELIMITER, :KEY_AND_VALUE_DELIMITER,
+                         :TRACE_ID_KEY, :PARENT_ID_KEY, :SAMPLED_FLAG_KEY,
+                         :TRACE_ID_LENGTH, :SPAN_ID_LENGTH, :VALID_SAMPLED_VALUES
 
         # Extract trace context from the supplied carrier.
         # If extraction fails, the original context will be returned
@@ -90,11 +102,56 @@ module OpenTelemetry
         private
 
         def parse_header(header)
-          return nil unless (match = header.match(XRAY_CONTEXT_REGEX))
-          return nil unless match['trace_id']
-          return nil unless match['span_id']
+          trace_id = nil
+          span_id = nil
+          sampling_state = nil
+          trace_state_parts = []
+
+          header.split(KV_PAIR_DELIMITER).each do |pair|
+            # Split only on first '=' to handle values that might contain '='
+            key, value = pair.split(KEY_AND_VALUE_DELIMITER, 2)
+            next unless key && value
+
+            case key
+            when TRACE_ID_KEY
+              trace_id = value if valid_trace_id?(value)
+            when PARENT_ID_KEY
+              span_id = value if valid_span_id?(value)
+            when SAMPLED_FLAG_KEY
+              sampling_state = value if valid_sampling_state?(value)
+            when 'Self'
+              # Ignore Self field added by load balancers
+              next
+            else
+              # Collect other fields as potential tracestate
+              trace_state_parts << pair
+            end
+          end
+
+          return nil unless trace_id && span_id
+
+          {
+            'trace_id' => trace_id,
+            'span_id' => span_id,
+            'sampling_state' => sampling_state,
+            'trace_state' => trace_state_parts.empty? ? nil : trace_state_parts.join(KV_PAIR_DELIMITER)
+          }
+        end
+
+        def valid_trace_id?(value)
+          return false unless value.length == TRACE_ID_LENGTH
+          return false unless value.start_with?('1-')
+          return false unless value[10] == '-'
+
+          true
+        end
+
+        def valid_span_id?(value)
+          value.length == SPAN_ID_LENGTH && value.match?(/\A[a-f0-9]+\z/)
+        end
 
-          match
+        def valid_sampling_state?(value)
+          VALID_SAMPLED_VALUES.include?(value)
         end
 
         # Convert an id from a hex encoded string to byte array. Assumes the input id has already been

data/lib/opentelemetry/propagator/xray/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Propagator
     module XRay
-      VERSION = '0.26.0'
+      VERSION = '0.26.1'
     end
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-propagator-xray
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - OpenTelemetry Authors
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -45,10 +44,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-propagator-xray/0.26.0/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-propagator-xray/0.26.1/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/propagator/xray
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-propagator-xray/0.26.0
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-propagator-xray/0.26.1
 post_install_message: ''
 rdoc_options: []
 require_paths:
@@ -64,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: XRay Context Propagation Extension for the OpenTelemetry framework
 test_files: []