Skip to content

Commit 90e33ae

Browse files
committed
Fix checks
1 parent 43f4bda commit 90e33ae

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: bcf15a417c3f029e1e75ec824925bc02808d21eb
9+
CORE_REPO_SHA: d151f5689874ce78ddedc9aa6051be28078d7de8
1010

1111
jobs:
1212
build:

propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/__init__.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
OT_SAMPLED_HEADER = "ot-tracer-sampled"
3939
OT_BAGGAGE_PREFIX = "ot-baggage-"
4040

41-
_valid_header_name = re_compile(r"^[\w_^`!#$%&'*+.|~]+$")
42-
_valid_header_value = re_compile(r"^[\t\x20-\x7e\x80-\xff]+$")
41+
_valid_header_name = re_compile(r"[\w_^`!#$%&'*+.|~]+")
42+
_valid_header_value = re_compile(r"[\t\x20-\x7e\x80-\xff]+")
4343
_valid_extract_traceid = re_compile(r"[0-9a-f]{1,32}")
4444
_valid_extract_spanid = re_compile(r"[0-9a-f]{1,16}")
4545

@@ -71,9 +71,9 @@ def extract(
7171

7272
if (
7373
traceid != INVALID_TRACE_ID
74-
and _valid_extract_traceid.match(traceid) is not None
74+
and _valid_extract_traceid.fullmatch(traceid) is not None
7575
and spanid != INVALID_SPAN_ID
76-
and _valid_extract_spanid.match(spanid) is not None
76+
and _valid_extract_spanid.fullmatch(spanid) is not None
7777
):
7878
context = set_span_in_context(
7979
DefaultSpan(
@@ -137,8 +137,8 @@ def inject(
137137
for header_name, header_value in baggage.items():
138138

139139
if (
140-
_valid_header_name.match(header_name) is None
141-
or _valid_header_value.match(header_value) is None
140+
_valid_header_name.fullmatch(header_name) is None
141+
or _valid_header_value.fullmatch(header_value) is None
142142
):
143143
continue
144144

propagator/opentelemetry-propagator-ot-trace/tests/test_ot_trace_propagator.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ def test_extract_malformed_trace_id(self):
285285
self.ot_trace_propagator.extract(
286286
carrier_getter,
287287
{
288-
OT_TRACE_ID_HEADER: "abc123",
288+
OT_TRACE_ID_HEADER: "abc123!",
289289
OT_SPAN_ID_HEADER: "e457b5a2e4d86bd1",
290290
OT_SAMPLED_HEADER: "false",
291291
},
@@ -302,7 +302,7 @@ def test_extract_malformed_span_id(self):
302302
carrier_getter,
303303
{
304304
OT_TRACE_ID_HEADER: "64fe8b2a57d3eff7",
305-
OT_SPAN_ID_HEADER: "abc123",
305+
OT_SPAN_ID_HEADER: "abc123!",
306306
OT_SAMPLED_HEADER: "false",
307307
},
308308
)

0 commit comments

Comments
 (0)