Skip to content

Commit f041fe3

Browse files
committed
Revert "feat(tracing): Add propagate_traces deprecation warning (#3899)"
This reverts commit 8a70b76.
1 parent 85879b4 commit f041fe3

4 files changed

Lines changed: 4 additions & 33 deletions

File tree

sentry_sdk/integrations/celery/__init__.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import sys
2-
import warnings
3-
42
from collections.abc import Mapping
53
from functools import wraps
64

@@ -70,11 +68,6 @@ def __init__(
7068
exclude_beat_tasks=None,
7169
):
7270
# type: (bool, bool, Optional[List[str]]) -> None
73-
warnings.warn(
74-
"The `propagate_traces` parameter is deprecated. Please use `trace_propagation_targets` instead.",
75-
DeprecationWarning,
76-
stacklevel=2,
77-
)
7871
self.propagate_traces = propagate_traces
7972
self.monitor_beat_tasks = monitor_beat_tasks
8073
self.exclude_beat_tasks = exclude_beat_tasks

sentry_sdk/scope.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -625,11 +625,6 @@ def iter_trace_propagation_headers(self, *args, **kwargs):
625625
"""
626626
client = self.get_client()
627627
if not client.options.get("propagate_traces"):
628-
warnings.warn(
629-
"The `propagate_traces` parameter is deprecated. Please use `trace_propagation_targets` instead.",
630-
DeprecationWarning,
631-
stacklevel=2,
632-
)
633628
return
634629

635630
span = kwargs.pop("span", None)

tests/integrations/celery/test_celery.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,7 @@ def dummy_task():
268268

269269

270270
def test_simple_no_propagation(capture_events, init_celery):
271-
with pytest.warns(DeprecationWarning):
272-
celery = init_celery(propagate_traces=False)
273-
271+
celery = init_celery(propagate_traces=False)
274272
events = capture_events()
275273

276274
@celery.task(name="dummy_task")
@@ -534,10 +532,9 @@ def test_sentry_propagate_traces_override(init_celery):
534532
Test if the `sentry-propagate-traces` header given to `apply_async`
535533
overrides the `propagate_traces` parameter in the integration constructor.
536534
"""
537-
with pytest.warns(DeprecationWarning):
538-
celery = init_celery(
539-
propagate_traces=True, traces_sample_rate=1.0, release="abcdef"
540-
)
535+
celery = init_celery(
536+
propagate_traces=True, traces_sample_rate=1.0, release="abcdef"
537+
)
541538

542539
@celery.task(name="dummy_task", bind=True)
543540
def dummy_task(self, message):

tests/tracing/test_integration_tests.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -147,20 +147,6 @@ def test_continue_from_headers(
147147
assert message_payload["message"] == "hello"
148148

149149

150-
@pytest.mark.parametrize("sample_rate", [0.0, 1.0])
151-
def test_propagate_traces_deprecation_warning(sentry_init, sample_rate):
152-
sentry_init(traces_sample_rate=sample_rate, propagate_traces=False)
153-
154-
with start_transaction(name="hi"):
155-
with start_span() as old_span:
156-
with pytest.warns(DeprecationWarning):
157-
dict(
158-
sentry_sdk.get_current_scope().iter_trace_propagation_headers(
159-
old_span
160-
)
161-
)
162-
163-
164150
@pytest.mark.parametrize("sample_rate", [0.5, 1.0])
165151
def test_dynamic_sampling_head_sdk_creates_dsc(
166152
sentry_init, capture_envelopes, sample_rate, monkeypatch

0 commit comments

Comments
 (0)