Skip to content

Commit 8fc5428

Browse files
committed
fix: Ensure extraction of headers from dictionary
Signed-off-by: Ferenc Géczi <[email protected]>
1 parent eb5f7bc commit 8fc5428

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/instana/propagators/base_propagator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def __init__(self):
6666
self._ts = Tracestate()
6767

6868
@staticmethod
69-
def _extract_headers_dict(carrier):
69+
def extract_headers_dict(carrier):
7070
"""
7171
This method converts the incoming carrier into a dict
7272
:param carrier:
@@ -278,7 +278,7 @@ def extract(self, carrier, disable_w3c_trace_context=False):
278278
"""
279279
try:
280280
traceparent, tracestate = [None] * 2
281-
headers = self._extract_headers_dict(carrier=carrier)
281+
headers = self.extract_headers_dict(carrier=carrier)
282282
if headers is None:
283283
return None
284284
headers = {k.lower(): v for k, v in headers.items()}

src/instana/propagators/http_propagator.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,13 @@ def __init__(self):
2020
def inject(self, span_context, carrier, disable_w3c_trace_context=False):
2121
trace_id = span_context.trace_id
2222
span_id = span_context.span_id
23-
# Suppression `level` made in the child context or in the parent context
24-
# has priority over any non-suppressed `level` setting
25-
child_level = int(self.extract_instana_headers(carrier)[2] or "1")
26-
span_context.level = min(child_level, span_context.level)
23+
dictionary_carrier = self.extract_headers_dict(carrier)
24+
if dictionary_carrier:
25+
# Suppression `level` made in the child context or in the parent context
26+
# has priority over any non-suppressed `level` setting
27+
child_level = int(self.extract_instana_headers(dictionary_carrier)[2] or "1")
28+
span_context.level = min(child_level, span_context.level)
29+
2730
serializable_level = str(span_context.level)
2831

2932
if disable_w3c_trace_context:

0 commit comments

Comments
 (0)