tests

Author: sentrivana

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -141,24 +141,29 @@ def should_sample(
         # Check if there is a traces_sampler
         # Traces_sampler is responsible to check parent sampled to have full transactions.
         has_traces_sampler = callable(client.options.get("traces_sampler"))
+        custom_parent_sampled = attributes.get(
+            SentrySpanAttribute.CUSTOM_PARENT_SAMPLED
+        )
+        if custom_parent_sampled is not None:
+            parent_sampled = custom_parent_sampled
+        else:
+            parent_sampled = get_parent_sampled(parent_span_context, trace_id)
+        print("custom_parent_sampled", custom_parent_sampled)
+        print("get parent sampled", get_parent_sampled(parent_span_context, trace_id))
+
         if is_root_span and has_traces_sampler:
             sampling_context = {
                 "transaction_context": {
                     "name": name,
                     "op": attributes.get(SentrySpanAttribute.OP),
                 },
-                "parent_sampled": get_parent_sampled(parent_span_context, trace_id),
+                "parent_sampled": parent_sampled,
             }
             sampling_context.update(attributes)
             sample_rate = client.options["traces_sampler"](sampling_context)
 
         else:
             # Check if there is a parent with a sampling decision
-            parent_sampled = attributes.get(SentrySpanAttribute.CUSTOM_PARENT_SAMPLED)
-
-            if parent_sampled is None:
-                parent_sampled = get_parent_sampled(parent_span_context, trace_id)
-
             if parent_sampled is not None:
                 sample_rate = parent_sampled
             else:

tests/tracing/test_sampling.py

@@ -6,21 +6,20 @@
 
 import sentry_sdk
 from sentry_sdk import start_span, start_transaction, capture_exception
-from sentry_sdk.tracing import Transaction
 from sentry_sdk.utils import logger
 
 
-def test_sampling_decided_only_for_transactions(sentry_init, capture_events):
+def test_sampling_decided_only_for_root_spans(sentry_init):
     sentry_init(traces_sample_rate=0.5)
 
-    with start_transaction(name="hi") as transaction:
-        assert transaction.sampled is not None
+    with start_span(name="outer1") as root_span1:
+        assert root_span1.sampled is not None
 
-        with start_span() as span:
-            assert span.sampled == transaction.sampled
+        with start_span(name="inner") as span:
+            assert span.sampled == root_span1.sampled
 
-    with start_span() as span:
-        assert span.sampled is None
+    with start_span(name="outer2") as root_span2:
+        assert root_span2.sampled is not None
 
 
 @pytest.mark.parametrize("sampled", [True, False])
@@ -185,28 +184,21 @@ def test_inherits_parent_sampling_decision_when_traces_sampler_undefined(
 def test_passes_parent_sampling_decision_in_sampling_context(
     sentry_init, parent_sampling_decision
 ):
-    sentry_init(traces_sample_rate=1.0)
+    def dummy_traces_sampler(sampling_context):
+        assert sampling_context["parent_sampled"] is parent_sampling_decision
+        return 1.0
+
+    sentry_init(traces_sample_rate=1.0, traces_sampler=dummy_traces_sampler)
 
     sentry_trace_header = (
         "12312012123120121231201212312012-1121201211212012-{sampled}".format(
             sampled=int(parent_sampling_decision)
         )
     )
 
-    transaction = Transaction.continue_from_headers(
-        headers={"sentry-trace": sentry_trace_header}, name="dogpark"
-    )
-    spy = mock.Mock(wraps=transaction)
-    start_transaction(transaction=spy)
-
-    # there's only one call (so index at 0) and kwargs are always last in a call
-    # tuple (so index at -1)
-    sampling_context = spy._set_initial_sampling_decision.mock_calls[0][-1][
-        "sampling_context"
-    ]
-    assert "parent_sampled" in sampling_context
-    # because we passed in a spy, attribute access requires unwrapping
-    assert sampling_context["parent_sampled"]._mock_wraps is parent_sampling_decision
+    with sentry_sdk.continue_trace({"sentry-trace": sentry_trace_header}):
+        with sentry_sdk.start_span(name="dogpark"):
+            pass
 
 
 def test_passes_attributes_from_start_span_to_traces_sampler(