opentelemetry-propagator-jaeger 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717594e7126f585dbf8820c1fb057b1af00102e75af09314758190d7a8063a16
-  data.tar.gz: cda00e0cdbda813cc913f6fb0eaa9ea0c4d898ebf964860e79a276de281cd951
+  metadata.gz: 0c9797fc20399bbc7314cbdf397822443b340f929995d4dee351c95a1d6fcbae
+  data.tar.gz: 924be198477b03252c17bfa987804d9ebc57786878ba54f055ef5785fb91239a
 SHA512:
-  metadata.gz: fa6391bca2f3af7657e2f5f88821d6bd2004a3a07ffcb7259e0e44ace0d3090570e53f39f8fdac5d3320ecf0888f7b0a38e9221afefeea2ed215a725bd45e9d2
-  data.tar.gz: e26597ec7f56885749ebf3bb99db74489bd567ed0e08a0571fad7426b93f798af17a50546a67c313ed092e85d351e87c102a02f8c70f135f975ddb01abb73300
+  metadata.gz: c283c3371e5fba81c0ec21d124b637121fa66a8ed8307adc788ffd3746191d976831c982331e637c7dee4b008a58736c7b401ac49ee4ab2b231a48f0703d75e6
+  data.tar.gz: c42a65b3ca93b3cd1ec3a15fd664e3e2c99e905b4f954328b97fc515bdc13d899599b0e2e58a2b98250d12a159fe4cbf3bf5ddcd65eb8e7cc442a85c252a4036

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-propagator-jaeger
 
+### v0.25.2 / 2026-09-15
+
+* FIXED: Enforce baggage limits on the Jaeger extract path (#2299)
+
 ### v0.25.1 / 2026-07-08
 
 * DOCS: Update source for gemspec links to RubyDoc (#2123)

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

@@ -26,10 +26,14 @@ module OpenTelemetry
         FIELDS = [IDENTITY_KEY].freeze
         TRACE_SPAN_IDENTITY_REGEX = /\A(?<trace_id>(?:[0-9a-f]){1,32}):(?<span_id>(?:[0-9a-f]){1,16}):(?:[0-9a-f]){1,16}:(?<sampling_flags>[0-9a-f]{1,2})\z/
         ZERO_ID_REGEX = /^0+$/
+        BAGGAGE_KEY_PREFIX = 'uberctx-'
+        MAX_BAGGAGE_ENTRIES = 180
+        MAX_BAGGAGE_ENTRY_BYTES = 4096
+        MAX_BAGGAGE_TOTAL_BYTES = 8192
 
-        private_constant \
-          :IDENTITY_KEY, :DEFAULT_FLAG_BIT, :SAMPLED_FLAG_BIT, :DEBUG_FLAG_BIT,
-          :FIELDS, :TRACE_SPAN_IDENTITY_REGEX, :ZERO_ID_REGEX
+        private_constant :IDENTITY_KEY, :DEFAULT_FLAG_BIT, :SAMPLED_FLAG_BIT, :DEBUG_FLAG_BIT, :FIELDS,
+                         :TRACE_SPAN_IDENTITY_REGEX, :ZERO_ID_REGEX, :BAGGAGE_KEY_PREFIX,
+                         :MAX_BAGGAGE_ENTRIES, :MAX_BAGGAGE_ENTRY_BYTES, :MAX_BAGGAGE_TOTAL_BYTES
 
         # Extract trace context from the supplied carrier.
         # If extraction fails, the original context will be returned
@@ -73,11 +77,7 @@ module OpenTelemetry
             span_context.hex_trace_id, span_context.hex_span_id, '0', flags
           ].join(':')
           setter.set(carrier, IDENTITY_KEY, trace_span_identity_value)
-          OpenTelemetry::Baggage.values(context: context).each do |key, value|
-            baggage_key = "uberctx-#{key}"
-            encoded_value = URI.encode_uri_component(value)
-            setter.set(carrier, baggage_key, encoded_value)
-          end
+          inject_baggage(carrier, context, setter)
           carrier
         end
 
@@ -102,20 +102,49 @@ module OpenTelemetry
           OpenTelemetry::Trace.non_recording_span(span_context)
         end
 
+        def inject_baggage(carrier, context, setter)
+          count = 0
+          total_bytes = 0
+          OpenTelemetry::Baggage.values(context: context).each do |key, value|
+            break unless count < MAX_BAGGAGE_ENTRIES
+
+            encoded_value = URI.encode_uri_component(value)
+            entry_bytes = key.to_s.bytesize + encoded_value.bytesize
+            next unless within_baggage_limits?(entry_bytes, total_bytes)
+
+            setter.set(carrier, "#{BAGGAGE_KEY_PREFIX}#{key}", encoded_value)
+            count += 1
+            total_bytes += entry_bytes
+          end
+        end
+
         def context_with_extracted_baggage(carrier, context, getter)
-          baggage_key_prefix = 'uberctx-'
           OpenTelemetry::Baggage.build(context: context) do |b|
+            count = 0
+            total_bytes = 0
             getter.keys(carrier).each do |carrier_key|
-              baggage_key = carrier_key.start_with?(baggage_key_prefix) && carrier_key[baggage_key_prefix.length..-1]
+              break unless count < MAX_BAGGAGE_ENTRIES
+
+              baggage_key = carrier_key.start_with?(BAGGAGE_KEY_PREFIX) && carrier_key[BAGGAGE_KEY_PREFIX.length..]
               next unless baggage_key
 
               raw_value = getter.get(carrier, carrier_key)
-              value = URI.decode_uri_component(raw_value)
-              b.set_value(baggage_key, value)
+              next unless raw_value
+
+              entry_bytes = baggage_key.bytesize + raw_value.bytesize
+              next unless within_baggage_limits?(entry_bytes, total_bytes)
+
+              b.set_value(baggage_key, URI.decode_uri_component(raw_value))
+              count += 1
+              total_bytes += entry_bytes
             end
           end
         end
 
+        def within_baggage_limits?(entry_bytes, total_bytes)
+          entry_bytes <= MAX_BAGGAGE_ENTRY_BYTES && total_bytes + entry_bytes <= MAX_BAGGAGE_TOTAL_BYTES
+        end
+
         def to_jaeger_flags(context, span_context)
           if span_context.trace_flags == Trace::TraceFlags::SAMPLED
             if Jaeger.debug?(context)
@@ -129,7 +158,7 @@ module OpenTelemetry
         end
 
         def to_trace_flags(sampling_flags)
-          if (sampling_flags & SAMPLED_FLAG_BIT) != 0
+          if sampling_flags.anybits?(SAMPLED_FLAG_BIT)
             Trace::TraceFlags::SAMPLED
           else
             Trace::TraceFlags::DEFAULT

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Propagator
     module Jaeger
-      VERSION = '0.25.1'
+      VERSION = '0.25.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-propagator-jaeger
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
@@ -42,10 +42,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-propagator-jaeger/0.25.1/file/CHANGELOG.md
-  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/opentelemetry-propagator-jaeger/v0.25.1/propagator/jaeger
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-propagator-jaeger/0.25.2/file/CHANGELOG.md
+  source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/opentelemetry-propagator-jaeger/v0.25.2/propagator/jaeger
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-propagator-jaeger/0.25.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-propagator-jaeger/0.25.2
 rdoc_options: []
 require_paths:
 - lib
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Jaeger Context Propagation Extension for the OpenTelemetry framework
 test_files: []