feat(integrations): Remove ContextVar usage.

- No need to store transaction separately. All contextvar
  mentions removed
- dramatiq_mesage_id tag removed

Issue: #3454

Author: igorek

scripts/populate_tox/config.py

@@ -100,9 +100,6 @@
     },
     "dramatiq": {
         "package": "dramatiq",
-        "deps": {
-            "py3.6": ["aiocontextvars"],
-        },
     },
     "falcon": {
         "package": "falcon",

sentry_sdk/integrations/dramatiq.py

@@ -14,9 +14,6 @@
     AnnotatedValue,
     capture_internal_exceptions,
     event_from_exception,
-    ContextVar,
-    HAS_REAL_CONTEXTVARS,
-    CONTEXTVARS_ERROR_MESSAGE,
 )
 from typing import TypeVar
 
@@ -50,15 +47,11 @@ class DramatiqIntegration(Integration):
     """
 
     identifier = "dramatiq"
+    origin = f"auto.queue.{identifier}"
 
     @staticmethod
     def setup_once():
         # type: () -> None
-        if not HAS_REAL_CONTEXTVARS:
-            raise DidNotEnable(
-                "The dramatiq integration for Sentry requires Python 3.7+ "
-                " or aiocontextvars package." + CONTEXTVARS_ERROR_MESSAGE
-            )
 
         _patch_dramatiq_broker()
 
@@ -107,8 +100,6 @@ class SentryMiddleware(Middleware):  # type: ignore[misc]
     DramatiqIntegration.
     """
 
-    _transaction = ContextVar("_transaction")
-
     def before_enqueue(self, broker, message, delay):
         # type: (Broker, Message[R], int) -> None
         message.options["sentry_headers"] = {
@@ -123,7 +114,6 @@ def before_process_message(self, broker, message):
             return
 
         scope = sentry_sdk.get_current_scope()
-        scope.set_tag("dramatiq_message_id", message.message_id)
         scope.clear_breadcrumbs()
         scope.add_event_processor(_make_message_event_processor(message, integration))
 
@@ -137,7 +127,7 @@ def before_process_message(self, broker, message):
             name=message.actor_name,
             op=OP.QUEUE_TASK_DRAMATIQ,
             source=TransactionSource.TASK,
-            # origin=DramatiqIntegration.origin,
+            origin=DramatiqIntegration.origin,
         )
         transaction.set_status(SPANSTATUS.OK)
         sentry_sdk.start_transaction(
@@ -147,15 +137,14 @@ def before_process_message(self, broker, message):
             source=TransactionSource.TASK,
         )
         transaction.__enter__()
-        self._transaction.set(transaction)
 
     def after_process_message(self, broker, message, *, result=None, exception=None):
         # type: (Broker, Message[R], Optional[Any], Optional[Exception]) -> None
 
         actor = broker.get_actor(message.actor_name)
         throws = message.options.get("throws") or actor.options.get("throws")
 
-        transaction = self._transaction.get(None)
+        transaction = sentry_sdk.get_current_scope().transaction
         if not transaction:
             return None
 

tests/integrations/dramatiq/test_dramatiq.py

@@ -106,30 +106,6 @@ def propagated_trace_task():
     assert events[0]["contexts"]["trace"]["trace_id"] == outer_transaction.trace_id
 
 
-def test_that_dramatiq_message_id_is_set_as_tag(broker, worker, capture_events):
-    events = capture_events()
-
-    @dramatiq.actor(max_retries=0)
-    def dummy_actor(x, y):
-        sentry_sdk.capture_message("hi")
-        return x / y
-
-    dummy_actor.send(1, 0)
-    broker.join(dummy_actor.queue_name)
-    worker.join()
-
-    event_message, event_error = events
-
-    assert "dramatiq_message_id" in event_message["tags"]
-    assert "dramatiq_message_id" in event_error["tags"]
-    assert (
-        event_message["tags"]["dramatiq_message_id"]
-        == event_error["tags"]["dramatiq_message_id"]
-    )
-    msg_ids = [e["tags"]["dramatiq_message_id"] for e in events]
-    assert all(uuid.UUID(msg_id) and isinstance(msg_id, str) for msg_id in msg_ids)
-
-
 def test_that_local_variables_are_captured(broker, worker, capture_events):
     events = capture_events()
 

tox.ini

@@ -589,7 +589,6 @@ deps =
     dramatiq-v1.12.3: dramatiq==1.12.3
     dramatiq-v1.15.0: dramatiq==1.15.0
     dramatiq-v1.18.0: dramatiq==1.18.0
-    {py3.6}-dramatiq: aiocontextvars
 
     huey-v2.1.3: huey==2.1.3
     huey-v2.2.0: huey==2.2.0