Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

CHANGELOG.md

@@ -90,7 +90,7 @@
 
 - **New integration:** Add [OpenFeature](https://openfeature.dev/) feature flagging integration (#3648) by @cmanallen
 
-  For more information, see the documentation for the [OpenFeatureIntegration](https://docs.sentry.io/platforms/python/integrations/opoenfeature/).
+  For more information, see the documentation for the [OpenFeatureIntegration](https://docs.sentry.io/platforms/python/integrations/openfeature/).
 
 - Add LaunchDarkly and OpenFeature integration (#3648) by @cmanallen
 - Correct typo in a comment (#3726) by @szokeasaurusrex

sentry_sdk/integrations/celery/__init__.py

@@ -1,4 +1,6 @@
 import sys
+import warnings
+
 from collections.abc import Mapping
 from functools import wraps
 
@@ -67,6 +69,11 @@ def __init__(
         exclude_beat_tasks=None,
     ):
         # type: (bool, bool, Optional[List[str]]) -> None
+        warnings.warn(
+            "The `propagate_traces` parameter is deprecated. Please use `trace_propagation_targets` instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
         self.propagate_traces = propagate_traces
         self.monitor_beat_tasks = monitor_beat_tasks
         self.exclude_beat_tasks = exclude_beat_tasks

sentry_sdk/scope.py

@@ -613,6 +613,11 @@ def iter_trace_propagation_headers(self, *args, **kwargs):
         """
         client = self.get_client()
         if not client.options.get("propagate_traces"):
+            warnings.warn(
+                "The `propagate_traces` parameter is deprecated. Please use `trace_propagation_targets` instead.",
+                DeprecationWarning,
+                stacklevel=2,
+            )
             return
 
         span = kwargs.pop("span", None)

sentry_sdk/utils.py

@@ -546,7 +546,7 @@ def get_lines_from_file(
 
 def get_source_context(
     frame,  # type: FrameType
-    tb_lineno,  # type: int
+    tb_lineno,  # type: Optional[int]
     max_value_length=None,  # type: Optional[int]
 ):
     # type: (...) -> Tuple[List[Annotated[str]], Optional[Annotated[str]], List[Annotated[str]]]
@@ -562,11 +562,13 @@ def get_source_context(
         loader = frame.f_globals["__loader__"]
     except Exception:
         loader = None
-    lineno = tb_lineno - 1
-    if lineno is not None and abs_path:
+
+    if tb_lineno is not None and abs_path:
+        lineno = tb_lineno - 1
         return get_lines_from_file(
             abs_path, lineno, max_value_length, loader=loader, module=module
         )
+
     return [], None, []
 
 

tests/integrations/celery/test_celery.py

@@ -267,7 +267,9 @@ def dummy_task():
 
 
 def test_simple_no_propagation(capture_events, init_celery):
-    celery = init_celery(propagate_traces=False)
+    with pytest.warns(DeprecationWarning):
+        celery = init_celery(propagate_traces=False)
+
     events = capture_events()
 
     @celery.task(name="dummy_task")
@@ -533,9 +535,10 @@ def test_sentry_propagate_traces_override(init_celery):
     Test if the `sentry-propagate-traces` header given to `apply_async`
     overrides the `propagate_traces` parameter in the integration constructor.
     """
-    celery = init_celery(
-        propagate_traces=True, traces_sample_rate=1.0, release="abcdef"
-    )
+    with pytest.warns(DeprecationWarning):
+        celery = init_celery(
+            propagate_traces=True, traces_sample_rate=1.0, release="abcdef"
+        )
 
     # Since we're applying the task inline eagerly,
     # we need to cleanup the otel context for this test.

tests/tracing/test_integration_tests.py

@@ -117,6 +117,20 @@ def test_continue_trace(
     assert message_payload["message"] == "hello"
 
 
+@pytest.mark.parametrize("sample_rate", [0.0, 1.0])
+def test_propagate_traces_deprecation_warning(sentry_init, sample_rate):
+    sentry_init(traces_sample_rate=sample_rate, propagate_traces=False)
+
+    with start_transaction(name="hi"):
+        with start_span() as old_span:
+            with pytest.warns(DeprecationWarning):
+                dict(
+                    sentry_sdk.get_current_scope().iter_trace_propagation_headers(
+                        old_span
+                    )
+                )
+
+
 @pytest.mark.parametrize("sample_rate", [0.5, 1.0])
 def test_dynamic_sampling_head_sdk_creates_dsc(
     sentry_init,