Skip to content
Merged
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/5793.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
`opentelemetry-propagator-jaeger`: Accept a URL-encoded `uber-trace-id` header on extract
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,11 @@ def _parse_trace_id_header(
if header is None:
return invalid_header_result

# some Jaeger clients URL-encode the header value, including the ":"
# delimiter, so decode it when no plain delimiter can be found
if ":" not in header:
Comment thread
herin049 marked this conversation as resolved.
header = urllib.parse.unquote(header)

fields = header.split(":")
if len(fields) != 4:
return invalid_header_result
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ def test_extract_valid_span(self):
self.assertEqual(span_context.trace_id, self.trace_id)
self.assertEqual(span_context.span_id, self.span_id)

def test_extract_url_encoded_span(self):
# some Jaeger clients URL-encode the ':' delimiter of uber-trace-id
old_carrier = {FORMAT.TRACE_ID_KEY: self.serialized_uber_trace_id.replace(":", "%3A")}
ctx = FORMAT.extract(old_carrier)
span_context = trace_api.get_current_span(ctx).get_span_context()
self.assertEqual(span_context.trace_id, self.trace_id)
self.assertEqual(span_context.span_id, self.span_id)

def test_missing_carrier(self):
old_carrier = {}
ctx = FORMAT.extract(old_carrier)
Expand Down
Loading