Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/5557.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`opentelemetry-propagator-jaeger`: strip only the leading `uberctx-` prefix when extracting a baggage key, so a carrier key that repeats the prefix keeps its inner literal (`uberctx-a-uberctx-b` now yields `a-uberctx-b` rather than `a-b`).
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def _extract_baggage(
if value is None:
continue
context = baggage.set_baggage(
key.replace(self.BAGGAGE_PREFIX, ""),
key[len(self.BAGGAGE_PREFIX) :],
urllib.parse.unquote(value).strip(),
context=context,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ def get_context_new_carrier(old_carrier, carrier_baggage=None):


class TestJaegerPropagator(TestCase):
# pylint: disable=too-many-public-methods

@classmethod
def setUpClass(cls):
generator = id_generator.RandomIdGenerator()
Expand Down Expand Up @@ -134,6 +136,14 @@ def test_extract_empty_baggage_value(self):
context = FORMAT.extract(old_carrier)
self.assertDictEqual({"key3": "value3"}, context[_BAGGAGE_KEY])

def test_extract_strips_only_the_leading_baggage_prefix(self):
old_carrier = {
FORMAT.TRACE_ID_KEY: self.serialized_uber_trace_id,
"uberctx-a-uberctx-b": "value",
}
context = FORMAT.extract(old_carrier)
self.assertDictEqual({"a-uberctx-b": "value"}, context[_BAGGAGE_KEY])

def test_extract_invalid_uber_trace_id(self):
old_carrier = {
"uber-trace-id": "000000000000000000000000deadbeef:00000000deadbef0:00",
Expand Down