fix(dramatiq): gate message data with queue collection

Author: pabloDeputter

sentry_sdk/integrations/dramatiq.py

@@ -225,11 +225,7 @@ def extract_into_event(self, event: "Event") -> None:
         request_info = contexts.setdefault("dramatiq", {})
         request_info["type"] = "dramatiq"
 
-        attach_request_body = (
-            "incoming_request" in client.options["data_collection"]["http_bodies"]
-        )
-
-        if attach_request_body:
+        if client.options["data_collection"]["queues"]:
             data: "Optional[Union[AnnotatedValue, Dict[str, Any]]]" = None
             if not request_body_within_bounds(client, self.content_length()):
                 data = AnnotatedValue.removed_because_over_size_limit()

tests/integrations/dramatiq/test_dramatiq.py

@@ -397,14 +397,19 @@ def dummy_actor(x, y):
     [
         pytest.param({"data_collection": {}}, True, id="data_collection_default"),
         pytest.param(
-            {"data_collection": {"http_bodies": ["incoming_request"]}},
+            {"data_collection": {"queues": True}},
             True,
-            id="data_collection_http_bodies_incoming_request",
+            id="data_collection_queues_on",
         ),
         pytest.param(
-            {"data_collection": {"http_bodies": []}},
+            {"data_collection": {"queues": False}},
             False,
-            id="data_collection_http_bodies_empty",
+            id="data_collection_queues_off",
+        ),
+        pytest.param(
+            {"data_collection": {"queues": True, "http_bodies": []}},
+            True,
+            id="data_collection_queues_independent_of_http_bodies",
         ),
     ],
     indirect=["broker"],
@@ -434,7 +439,7 @@ def dummy_actor(x, y):
 
 @pytest.mark.parametrize(
     "broker",
-    [{"data_collection": {"http_bodies": []}}],
+    [{"data_collection": {"queues": False}}],
     indirect=True,
 )
 def test_that_dramatiq_context_type_is_set_regardless_of_data_collection(