remove parent_sampled

Author: sentrivana

MIGRATION_GUIDE.md

@@ -10,7 +10,7 @@ Looking to upgrade from Sentry SDK 2.x to 3.x? Here's a comprehensive list of wh
 
 - The SDK now supports Python 3.7 and higher.
 - `sentry_sdk.start_span` now only takes keyword arguments.
-- `sentry_sdk.start_span` no longer takes an explicit `span` argument.
+- `sentry_sdk.start_transaction`/`sentry_sdk.start_span` no longer takes the following arguments: `span`, `parent_sampled`.
 - The `Span()` constructor does not accept a `hub` parameter anymore.
 - `Span.finish()` does not accept a `hub` parameter anymore.
 - The `Profile()` constructor does not accept a `hub` parameter anymore.

sentry_sdk/integrations/opentelemetry/consts.py

@@ -31,6 +31,3 @@ class SentrySpanAttribute:
     SOURCE = "sentry.source"
     CONTEXT = "sentry.context"
     CUSTOM_SAMPLED = "sentry.custom_sampled"  # used for saving start_span(sampled=X)
-    CUSTOM_PARENT_SAMPLED = (
-        "sentry.custom_parent_sampled"  # used for saving start_span(parent_sampled=X)
-    )

sentry_sdk/integrations/opentelemetry/sampler.py

@@ -141,23 +141,21 @@ 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"))
-        parent_sampled = attributes.get(SentrySpanAttribute.CUSTOM_PARENT_SAMPLED)
-        if parent_sampled is None:
-            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": parent_sampled,
+                "parent_sampled": get_parent_sampled(parent_span_context, trace_id),
             }
             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 = get_parent_sampled(parent_span_context, trace_id)
             if parent_sampled is not None:
                 sample_rate = parent_sampled
             else:

sentry_sdk/tracing.py

@@ -1253,10 +1253,6 @@ def __init__(
                 attributes[SentrySpanAttribute.OP] = op
                 if sampled is not None:
                     attributes[SentrySpanAttribute.CUSTOM_SAMPLED] = sampled
-                if parent_sampled is not None:
-                    attributes[SentrySpanAttribute.CUSTOM_PARENT_SAMPLED] = (
-                        parent_sampled
-                    )
 
                 self._otel_span = tracer.start_span(
                     span_name, start_time=start_timestamp, attributes=attributes

tests/tracing/test_sampling.py

@@ -137,21 +137,6 @@ def test_prefers_traces_sampler_to_traces_sample_rate(
     assert transaction.sampled is traces_sampler_return_value
 
 
-@pytest.mark.parametrize("parent_sampling_decision", [True, False])
-def test_ignores_inherited_sample_decision_when_traces_sampler_defined(
-    sentry_init, parent_sampling_decision
-):
-    # make traces_sampler pick the opposite of the inherited decision, to prove
-    # that traces_sampler takes precedence
-    traces_sampler = mock.Mock(return_value=not parent_sampling_decision)
-    sentry_init(traces_sampler=traces_sampler)
-
-    transaction = start_transaction(
-        name="dogpark", parent_sampled=parent_sampling_decision
-    )
-    assert transaction.sampled is not parent_sampling_decision
-
-
 @pytest.mark.parametrize("explicit_decision", [True, False])
 def test_traces_sampler_doesnt_overwrite_explicitly_passed_sampling_decision(
     sentry_init, explicit_decision
@@ -165,21 +150,6 @@ def test_traces_sampler_doesnt_overwrite_explicitly_passed_sampling_decision(
     assert transaction.sampled is explicit_decision
 
 
-@pytest.mark.parametrize("parent_sampling_decision", [True, False])
-def test_inherits_parent_sampling_decision_when_traces_sampler_undefined(
-    sentry_init, parent_sampling_decision
-):
-    # make sure the parent sampling decision is the opposite of what
-    # traces_sample_rate would produce, to prove the inheritance takes
-    # precedence
-    sentry_init(traces_sample_rate=0.5)
-    mock_random_value = 0.25 if parent_sampling_decision is False else 0.75
-
-    with mock.patch.object(random, "random", return_value=mock_random_value):
-        span = start_span(name="dogpark", parent_sampled=parent_sampling_decision)
-        assert span.sampled is parent_sampling_decision
-
-
 @pytest.mark.parametrize("parent_sampling_decision", [True, False])
 def test_passes_parent_sampling_decision_in_sampling_context(
     sentry_init, parent_sampling_decision