From 15f8810ca0dd5f80bd379f8c0d9662d0d6794393 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Mon, 10 Mar 2025 16:38:22 +0100
Subject: [PATCH 1/2] tests: Add concurrency testcase for arq

---
 tests/integrations/arq/test_arq.py | 49 ++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py
index e74395e26c..5cbfdcd6ca 100644
--- a/tests/integrations/arq/test_arq.py
+++ b/tests/integrations/arq/test_arq.py
@@ -1,4 +1,6 @@
 import asyncio
+from datetime import timedelta
+
 import pytest
 
 from sentry_sdk import get_client, start_transaction
@@ -376,3 +378,50 @@ async def job(ctx):
     assert event["contexts"]["trace"]["origin"] == "auto.queue.arq"
     assert event["spans"][0]["origin"] == "auto.db.redis"
     assert event["spans"][1]["origin"] == "auto.db.redis"
+
+
+@pytest.mark.asyncio
+async def test_job_concurrency(capture_events, init_arq):
+    """
+    10 - division starts
+    70 - sleepy starts
+    110 - division raises error
+    120 - sleepy finishes
+
+    """
+
+    async def sleepy(_):
+        await asyncio.sleep(0.05)
+
+    async def division(_):
+        await asyncio.sleep(0.1)
+        return 1 / 0
+
+    sleepy.__qualname__ = sleepy.__name__
+    division.__qualname__ = division.__name__
+
+    pool, worker = init_arq([sleepy, division])
+
+    events = capture_events()
+
+    await pool.enqueue_job(
+        "division", _job_id="123", _defer_by=timedelta(milliseconds=10)
+    )
+    await pool.enqueue_job(
+        "sleepy", _job_id="456", _defer_by=timedelta(milliseconds=70)
+    )
+
+    loop = asyncio.get_event_loop()
+    task = loop.create_task(worker.async_run())
+    await asyncio.sleep(1)
+
+    task.cancel()
+
+    await worker.close()
+
+    exception_event = events[1]
+    assert exception_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
+    assert exception_event["transaction"] == "division"  # fails, transaction is sleepy
+    assert (
+        exception_event["extra"]["arq-job"]["task"] == "division"
+    )  # fails, task is sleepy

From 41e00b59097a730bb3cfd35afe6f8be29535d405 Mon Sep 17 00:00:00 2001
From: Ivana Kellyer <ivana.kellyer@sentry.io>
Date: Mon, 10 Mar 2025 16:39:53 +0100
Subject: [PATCH 2/2] remove comments

---
 tests/integrations/arq/test_arq.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/integrations/arq/test_arq.py b/tests/integrations/arq/test_arq.py
index 5cbfdcd6ca..d8b7e715f2 100644
--- a/tests/integrations/arq/test_arq.py
+++ b/tests/integrations/arq/test_arq.py
@@ -421,7 +421,5 @@ async def division(_):
 
     exception_event = events[1]
     assert exception_event["exception"]["values"][0]["type"] == "ZeroDivisionError"
-    assert exception_event["transaction"] == "division"  # fails, transaction is sleepy
-    assert (
-        exception_event["extra"]["arq-job"]["task"] == "division"
-    )  # fails, task is sleepy
+    assert exception_event["transaction"] == "division"
+    assert exception_event["extra"]["arq-job"]["task"] == "division"