Skip to content

Commit

Permalink
Improve parent id validation in contexts.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimf5 committed Jun 29, 2024
1 parent de6e29b commit a263b9f
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions tests/test_otel.py
Original file line number Diff line number Diff line change
Expand Up @@ -546,55 +546,63 @@ def test_no_variables(self, http_ver, headers, name, value, idx, otel_mode):
@pytest.mark.parametrize(
("name", "value", "idx"),
[
("X-Otel-Parent-Id", None, 2),
("X-Otel-Traceparent", None, 2),
("X-Otel-Tracestate", None, 2),
("X-Otel-Parent-Id", None, 3),
("X-Otel-Traceparent", context["Traceparent"], 3),
("X-Otel-Tracestate", context["Tracestate"], 3),
]
+ [
("X-Otel-Parent-Id", None, 4),
("X-Otel-Traceparent", None, 4),
("X-Otel-Tracestate", None, 4),
("X-Otel-Parent-Id", span_id, 5),
("X-Otel-Traceparent", context["Traceparent"], 5),
("X-Otel-Tracestate", context["Tracestate"], 5),
]
+ [
("X-Otel-Parent-Id", None, 6),
("X-Otel-Traceparent", "00-trace_id-span_id-01", 6),
("X-Otel-Tracestate", None, 6),
("X-Otel-Parent-Id", None, 7),
("X-Otel-Traceparent", "00-trace_id-span_id-01", 7),
("X-Otel-Tracestate", None, 7),
]
+ [
("X-Otel-Parent-Id", None, 8),
("X-Otel-Traceparent", "00-trace_id-span_id-01", 8),
("X-Otel-Tracestate", None, 8),
("X-Otel-Parent-Id", span_id, 9),
("X-Otel-Traceparent", f"00-{trace_id}-span_id-01", 9),
("X-Otel-Tracestate", context["Tracestate"], 9),
],
ids=[
"ignore-no parent id-no context-span2",
"ignore-no traceparent-no context-span2",
"ignore-no tracestate-no context-span2",
"ignore-no parent id-with context-span3",
"ignore-old traceparent-with context-span3",
"ignore-old tracestate-with context-span3",
]
+ [
"extract-no parent id-no context-span4",
"extract-no traceparent-no context-span4",
"extract-no tracestate-no context-span4",
"extract-old parent id-with context-span5",
"extract-old traceparent-with context-span5",
"extract-old tracestate-with context-span5",
]
+ [
"inject-no parent id-no context-span6",
"inject-new traceparent-no context-span6",
"inject-no tracestate-no context-span6",
"inject-no parent id-with context-span7",
"inject-new traceparent-with context-span7",
"inject-no tracestate-with context-span7",
]
+ [
"propagate-no parent id-no context-span8",
"propagate-new traceparent-no context-span8",
"propagate-no tracestate-no context-span8",
"propagate-old parent id-with context-span9",
Expand Down

0 comments on commit a263b9f

Please sign in to comment.