Merge branch 'master' into ivana/migrate-celery-to-span-first

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -12,7 +12,7 @@
     _patch_redbeat_apply_async,
     _setup_celery_beat_signals,
 )
-from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch, NoOpMgr
+from sentry_sdk.integrations.celery.utils import _now_seconds_since_epoch
 from sentry_sdk.integrations.logging import ignore_logger
 from sentry_sdk.traces import StreamedSpan
 from sentry_sdk.tracing import BAGGAGE_HEADER_NAME, Span, TransactionSource
@@ -244,6 +244,14 @@ def _update_celery_task_headers(
     return updated_headers
 
 
+class NoOpMgr:
+    def __enter__(self) -> None:
+        return None
+
+    def __exit__(self, exc_type: "Any", exc_value: "Any", traceback: "Any") -> None:
+        return None
+
+
 def _wrap_task_run(f: "F") -> "F":
     @wraps(f)
     def apply_async(*args: "Any", **kwargs: "Any") -> "Any":

sentry_sdk/integrations/celery/utils.py

@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING, cast
 
 if TYPE_CHECKING:
-    from typing import Any, Tuple
+    from typing import Tuple
     from sentry_sdk._types import MonitorConfigScheduleUnit
 
 
@@ -29,11 +29,3 @@ def _get_humanized_interval(seconds: float) -> "Tuple[int, MonitorConfigSchedule
             return (interval, cast("MonitorConfigScheduleUnit", unit))
 
     return (int(seconds), "second")
-
-
-class NoOpMgr:
-    def __enter__(self) -> None:
-        return None
-
-    def __exit__(self, exc_type: "Any", exc_value: "Any", traceback: "Any") -> None:
-        return None

sentry_sdk/profiler/continuous_profiler.py

@@ -506,8 +506,6 @@ def teardown(self) -> None:
             self.thread.join()
             self.thread = None
 
-        self.buffer = None
-
 
 class GeventContinuousScheduler(ContinuousScheduler):
     """
@@ -580,8 +578,6 @@ def teardown(self) -> None:
             self.thread.join()
             self.thread = None
 
-        self.buffer = None
-
 
 PROFILE_BUFFER_SECONDS = 60
 

tests/integrations/asyncpg/test_asyncpg.py

@@ -485,7 +485,7 @@ async def test_connection_pool(sentry_init, capture_events) -> None:
 async def test_query_source_disabled(sentry_init, capture_events):
     sentry_options = {
         "integrations": [AsyncPGIntegration()],
-        "enable_tracing": True,
+        "traces_sample_rate": 1.0,
         "enable_db_query_source": False,
         "db_query_source_threshold_ms": 0,
     }
@@ -523,7 +523,7 @@ async def test_query_source_enabled(
 ):
     sentry_options = {
         "integrations": [AsyncPGIntegration()],
-        "enable_tracing": True,
+        "traces_sample_rate": 1.0,
         "db_query_source_threshold_ms": 0,
     }
     if enable_db_query_source is not None:
@@ -559,7 +559,7 @@ async def test_query_source_enabled(
 async def test_query_source(sentry_init, capture_events):
     sentry_init(
         integrations=[AsyncPGIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=0,
     )
@@ -609,7 +609,7 @@ async def test_query_source_with_module_in_search_path(sentry_init, capture_even
     """
     sentry_init(
         integrations=[AsyncPGIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=0,
     )
@@ -655,7 +655,7 @@ async def test_query_source_with_module_in_search_path(sentry_init, capture_even
 async def test_no_query_source_if_duration_too_short(sentry_init, capture_events):
     sentry_init(
         integrations=[AsyncPGIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=100,
     )
@@ -700,7 +700,7 @@ def fake_record_sql_queries(*args, **kwargs):
 async def test_query_source_if_duration_over_threshold(sentry_init, capture_events):
     sentry_init(
         integrations=[AsyncPGIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=100,
     )

tests/integrations/celery/test_celery.py

@@ -682,7 +682,7 @@ def test_messaging_destination_name_default_exchange(
     capture_items,
 ):
     celery_app = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     mock_request.delivery_info = {"routing_key": routing_key, "exchange": ""}
@@ -719,7 +719,7 @@ def test_messaging_destination_name_nondefault_exchange(
     behavior.
     """
     celery_app = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     mock_request.delivery_info = {"routing_key": "celery", "exchange": "custom"}
@@ -744,7 +744,7 @@ def task(): ...
 @pytest.mark.parametrize("span_streaming", [True, False])
 def test_messaging_id(span_streaming, init_celery, capture_events, capture_items):
     celery = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
 
@@ -768,7 +768,7 @@ def example_task(): ...
 @pytest.mark.parametrize("span_streaming", [True, False])
 def test_retry_count_zero(span_streaming, init_celery, capture_events, capture_items):
     celery = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
 
@@ -797,7 +797,7 @@ def test_retry_count_nonzero(
     mock_request.retries = 3
 
     celery = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
 
@@ -824,7 +824,7 @@ def test_messaging_system(
     system, span_streaming, init_celery, capture_events, capture_items
 ):
     celery = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
 
@@ -862,7 +862,7 @@ def publish(*args, **kwargs):
 
     sentry_init(
         integrations=[CeleryIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     celery = Celery(__name__, broker=f"{system}://example.com")  # noqa: E231
@@ -937,7 +937,7 @@ def tests_span_origin_consumer(
     span_streaming, init_celery, capture_events, capture_items
 ):
     celery = init_celery(
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     celery.conf.broker_url = "redis://example.com"  # noqa: E231
@@ -977,7 +977,7 @@ def publish(*args, **kwargs):
 
     sentry_init(
         integrations=[CeleryIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     celery = Celery(__name__, broker="redis://example.com")  # noqa: E231
@@ -1027,7 +1027,7 @@ def test_send_task_wrapped(
 ):
     sentry_init(
         integrations=[CeleryIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream" if span_streaming else "static"},
     )
     celery = Celery(__name__, broker="redis://example.com")  # noqa: E231

tests/integrations/celery/test_update_celery_task_headers.py

@@ -71,7 +71,7 @@ def test_monitor_beat_tasks_with_headers(monitor_beat_tasks):
 
 
 def test_span_with_transaction(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
     headers = {}
     monitor_beat_tasks = False
 
@@ -91,7 +91,7 @@ def test_span_with_transaction(sentry_init):
 
 
 def test_span_with_transaction_custom_headers(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
     headers = {
         "baggage": BAGGAGE_VALUE,
         "sentry-trace": SENTRY_TRACE_VALUE,

tests/integrations/graphene/test_graphene.py

@@ -207,7 +207,7 @@ def graphql_server_sync():
 def test_graphql_span_holds_query_information(sentry_init, capture_events):
     sentry_init(
         integrations=[GrapheneIntegration(), FlaskIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         default_integrations=False,
     )
     events = capture_events()

tests/integrations/sqlalchemy/test_sqlalchemy.py

@@ -301,7 +301,7 @@ def test_engine_name_not_string(sentry_init):
 def test_query_source_disabled(sentry_init, capture_events):
     sentry_options = {
         "integrations": [SqlalchemyIntegration()],
-        "enable_tracing": True,
+        "traces_sample_rate": 1.0,
         "enable_db_query_source": False,
         "db_query_source_threshold_ms": 0,
     }
@@ -352,7 +352,7 @@ class Person(Base):
 def test_query_source_enabled(sentry_init, capture_events, enable_db_query_source):
     sentry_options = {
         "integrations": [SqlalchemyIntegration()],
-        "enable_tracing": True,
+        "traces_sample_rate": 1.0,
         "db_query_source_threshold_ms": 0,
     }
     if enable_db_query_source is not None:
@@ -403,7 +403,7 @@ class Person(Base):
 def test_query_source(sentry_init, capture_events):
     sentry_init(
         integrations=[SqlalchemyIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=0,
     )
@@ -468,7 +468,7 @@ def test_query_source_with_module_in_search_path(sentry_init, capture_events):
     """
     sentry_init(
         integrations=[SqlalchemyIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=0,
     )
@@ -531,7 +531,7 @@ class Person(Base):
 def test_no_query_source_if_duration_too_short(sentry_init, capture_events):
     sentry_init(
         integrations=[SqlalchemyIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=100,
     )
@@ -597,7 +597,7 @@ def __exit__(self, type, value, traceback):
 def test_query_source_if_duration_over_threshold(sentry_init, capture_events):
     sentry_init(
         integrations=[SqlalchemyIntegration()],
-        enable_tracing=True,
+        traces_sample_rate=1.0,
         enable_db_query_source=True,
         db_query_source_threshold_ms=100,
     )

tests/test_basics.py

@@ -1092,7 +1092,7 @@ def test_classmethod_instance_tracing(sentry_init, capture_events):
 
 
 def test_last_event_id(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     assert last_event_id() is None
 
@@ -1102,7 +1102,7 @@ def test_last_event_id(sentry_init):
 
 
 def test_last_event_id_transaction(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     assert last_event_id() is None
 
@@ -1113,7 +1113,7 @@ def test_last_event_id_transaction(sentry_init):
 
 
 def test_last_event_id_scope(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     # Should not crash
     with isolation_scope() as scope:

tests/test_scope.py

@@ -876,7 +876,7 @@ def test_set_tags():
 
 
 def test_last_event_id(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     assert Scope.last_event_id() is None
 
@@ -886,7 +886,7 @@ def test_last_event_id(sentry_init):
 
 
 def test_last_event_id_transaction(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     assert Scope.last_event_id() is None
 
@@ -897,7 +897,7 @@ def test_last_event_id_transaction(sentry_init):
 
 
 def test_last_event_id_cleared(sentry_init):
-    sentry_init(enable_tracing=True)
+    sentry_init(traces_sample_rate=1.0)
 
     # Make sure last_event_id is set
     sentry_sdk.capture_exception(Exception("test"))