Skip to content

fix(sampling): isolate manual sampling test trace contexts #7698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bm1549 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(sampling): isolate manual sampling test trace contexts #7698

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c166b7f
fix(sampling): isolate manual sampling test trace contexts
bm1549 Sep 11, 2026
1579c77
Delete tests/test_the_test/test_sampling_manual.py
bm1549 Sep 11, 2026
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
26 changes: 16 additions & 10 deletions tests/test_sampling_manual.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,39 @@
from utils._weblog import HttpResponse
from utils.dd_constants import SamplingPriority

# Arbitrary upstream trace context, the ids only have to be stable and non-zero
UPSTREAM_TRACE_ID = 1212121212121212121
UPSTREAM_PARENT_ID = 34343434
UPSTREAM_TRACE_ID_BASE = 1212121212121212121
UPSTREAM_PARENT_ID_BASE = 34343434


def _upstream_ids(sampling_priority: SamplingPriority) -> tuple[int, int]:
offset = int(sampling_priority)
return UPSTREAM_TRACE_ID_BASE + offset, UPSTREAM_PARENT_ID_BASE + offset


def _upstream_headers(sampling_priority: SamplingPriority) -> dict[str, str]:
trace_id, parent_id = _upstream_ids(sampling_priority)
return {
"x-datadog-trace-id": str(UPSTREAM_TRACE_ID),
"x-datadog-parent-id": str(UPSTREAM_PARENT_ID),
"x-datadog-trace-id": str(trace_id),
"x-datadog-parent-id": str(parent_id),
"x-datadog-sampling-priority": str(int(sampling_priority)),
}


def _assert_upstream_trace_continued(request: HttpResponse) -> None:
def _assert_upstream_trace_continued(request: HttpResponse, upstream_sampling_priority: SamplingPriority) -> None:
"""Without this check, a weblog that does not extract the upstream context at all would start a
fresh trace, and the manual decision alone would still yield the expected priority.
"""
spans = [span for _, _, span in interfaces.library.get_spans(request=request)]
assert spans, "No span reported for that request"

trace_id, parent_id = _upstream_ids(upstream_sampling_priority)
trace_ids = {span["trace_id"] for span in spans}
assert all(span.trace_id_equals(UPSTREAM_TRACE_ID) for span in spans), (
assert all(span.trace_id_equals(trace_id) for span in spans), (
f"Spans do not belong to the upstream trace: {trace_ids}"
)

parent_ids = {span.get("parent_id") for span in spans}
assert UPSTREAM_PARENT_ID in parent_ids, f"No span is a child of the upstream span: {parent_ids}"
assert parent_id in parent_ids, f"No span is a child of the upstream span: {parent_ids}"


def _assert_decision_propagated_downstream(request: HttpResponse, expected: SamplingPriority) -> None:
Expand Down Expand Up @@ -93,7 +99,7 @@ def setup_manual_keep_overrides_upstream_drop(self):

def test_manual_keep_overrides_upstream_drop(self):
assert self.r_keep.status_code == 200
_assert_upstream_trace_continued(self.r_keep)
_assert_upstream_trace_continued(self.r_keep, SamplingPriority.AUTO_REJECT)
assert _get_sampling_priority(self.r_keep) == SamplingPriority.USER_KEEP
_assert_decision_propagated_downstream(self.r_keep, SamplingPriority.USER_KEEP)

Expand All @@ -106,6 +112,6 @@ def setup_manual_drop_overrides_upstream_keep(self):

def test_manual_drop_overrides_upstream_keep(self):
assert self.r_drop.status_code == 200
_assert_upstream_trace_continued(self.r_drop)
_assert_upstream_trace_continued(self.r_drop, SamplingPriority.USER_KEEP)
assert _get_sampling_priority(self.r_drop) == SamplingPriority.USER_REJECT
_assert_decision_propagated_downstream(self.r_drop, SamplingPriority.USER_REJECT)
Loading