From 51cc40450e937e0c1c6a82b6759934bbdca85792 Mon Sep 17 00:00:00 2001
From: Alexander Alderman Webb <alexander.webb@sentry.io>
Date: Wed, 8 Jul 2026 13:19:41 +0200
Subject: [PATCH 1/4] feat(queues): Add Python queue ops

---
 model/description/messaging.json |  2 +-
 model/op/messaging.json          | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/model/description/messaging.json b/model/description/messaging.json
index 29059213..5b137a88 100644
--- a/model/description/messaging.json
+++ b/model/description/messaging.json
@@ -4,7 +4,7 @@
     {
       "name": "Queue",
       "brief": "Operations that represent working with message queues, including publishing, receiving, processing, and settling messages.",
-      "ops": ["queue", "queue.publish", "queue.create", "queue.receive", "queue.process", "queue.settle"],
+      "ops": ["queue", "queue.publish", "queue.create", "queue.receive", "queue.process", "queue.settle", "queue.submit.arq", "queue.task.arq", "queue.submit.celery", "queue.task.celery", "queue.task.dramatiq", "queue.submit.huey", "queue.task.huey", "queue.task.rq"],
       "templates": ["{{messaging.destination.name}}"],
       "examples": ["order-events"]
     }
diff --git a/model/op/messaging.json b/model/op/messaging.json
index d2d8c1ca..f0503db5 100644
--- a/model/op/messaging.json
+++ b/model/op/messaging.json
@@ -25,6 +25,38 @@
     {
       "name": "queue.settle",
       "description": "Settling a message, e.g. acknowledging or rejecting it."
+    },
+    {
+      "name": "queue.submit.arq",
+      "description": "Publishing a message to an arq queue."
+    },
+    {
+      "name": "queue.task.arq",
+      "description": "Processing a message from an arq queue."
+    },
+    {
+      "name": "queue.submit.celery",
+      "description": "Publishing a message to a Celery broker."
+    },
+    {
+      "name": "queue.task.celery",
+      "description": "Processing a message from a Celery queue."
+    },
+    {
+      "name": "queue.task.rq",
+      "description": "Processing a message from an RQ queue."
+    },
+    {
+      "name": "queue.submit.huey",
+      "description": "Publishing a message to a Huey instance."
+    },
+    {
+      "name": "queue.task.huey",
+      "description": "Processing a message from a Huey instance."
+    },
+    {
+      "name": "queue.task.dramatiq",
+      "description": "Publishing a message from a Dramatiq queue."
     }
   ]
 }

From 0c01bed3c5e3bbdf094386e6ca6b64f550cb1439 Mon Sep 17 00:00:00 2001
From: Alexander Alderman Webb <alexander.webb@sentry.io>
Date: Wed, 8 Jul 2026 13:20:38 +0200
Subject: [PATCH 2/4] reorder

---
 model/op/messaging.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/model/op/messaging.json b/model/op/messaging.json
index f0503db5..d4412b4a 100644
--- a/model/op/messaging.json
+++ b/model/op/messaging.json
@@ -43,8 +43,8 @@
       "description": "Processing a message from a Celery queue."
     },
     {
-      "name": "queue.task.rq",
-      "description": "Processing a message from an RQ queue."
+      "name": "queue.task.dramatiq",
+      "description": "Publishing a message from a Dramatiq queue."
     },
     {
       "name": "queue.submit.huey",
@@ -55,8 +55,8 @@
       "description": "Processing a message from a Huey instance."
     },
     {
-      "name": "queue.task.dramatiq",
-      "description": "Publishing a message from a Dramatiq queue."
+      "name": "queue.task.rq",
+      "description": "Processing a message from an RQ queue."
     }
   ]
 }

From 13df452a540bdaf57ef99db078672b9dae4ecfcd Mon Sep 17 00:00:00 2001
From: Alexander Alderman Webb <alexander.webb@sentry.io>
Date: Wed, 8 Jul 2026 13:35:52 +0200
Subject: [PATCH 3/4] yarn generate

---
 javascript/sentry-conventions/src/op.ts | 40 +++++++++++++++++++++++++
 model/description/messaging.json        | 17 ++++++++++-
 rust/src/op.rs                          | 24 +++++++++++++++
 3 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/javascript/sentry-conventions/src/op.ts b/javascript/sentry-conventions/src/op.ts
index e1b764fc..befc5012 100644
--- a/javascript/sentry-conventions/src/op.ts
+++ b/javascript/sentry-conventions/src/op.ts
@@ -180,6 +180,46 @@ export const MESSAGING_QUEUE_PROCESS_SPAN_OP = 'queue.process';
  */
 export const MESSAGING_QUEUE_SETTLE_SPAN_OP = 'queue.settle';
 
+/**
+ * Publishing a message to an arq queue.
+ */
+export const MESSAGING_QUEUE_SUBMIT_ARQ_SPAN_OP = 'queue.submit.arq';
+
+/**
+ * Processing a message from an arq queue.
+ */
+export const MESSAGING_QUEUE_TASK_ARQ_SPAN_OP = 'queue.task.arq';
+
+/**
+ * Publishing a message to a Celery broker.
+ */
+export const MESSAGING_QUEUE_SUBMIT_CELERY_SPAN_OP = 'queue.submit.celery';
+
+/**
+ * Processing a message from a Celery queue.
+ */
+export const MESSAGING_QUEUE_TASK_CELERY_SPAN_OP = 'queue.task.celery';
+
+/**
+ * Publishing a message from a Dramatiq queue.
+ */
+export const MESSAGING_QUEUE_TASK_DRAMATIQ_SPAN_OP = 'queue.task.dramatiq';
+
+/**
+ * Publishing a message to a Huey instance.
+ */
+export const MESSAGING_QUEUE_SUBMIT_HUEY_SPAN_OP = 'queue.submit.huey';
+
+/**
+ * Processing a message from a Huey instance.
+ */
+export const MESSAGING_QUEUE_TASK_HUEY_SPAN_OP = 'queue.task.huey';
+
+/**
+ * Processing a message from an RQ queue.
+ */
+export const MESSAGING_QUEUE_TASK_RQ_SPAN_OP = 'queue.task.rq';
+
 // Path: model/op/mobile.json
 // Name: mobile
 
diff --git a/model/description/messaging.json b/model/description/messaging.json
index 5b137a88..a600aa5c 100644
--- a/model/description/messaging.json
+++ b/model/description/messaging.json
@@ -4,7 +4,22 @@
     {
       "name": "Queue",
       "brief": "Operations that represent working with message queues, including publishing, receiving, processing, and settling messages.",
-      "ops": ["queue", "queue.publish", "queue.create", "queue.receive", "queue.process", "queue.settle", "queue.submit.arq", "queue.task.arq", "queue.submit.celery", "queue.task.celery", "queue.task.dramatiq", "queue.submit.huey", "queue.task.huey", "queue.task.rq"],
+      "ops": [
+        "queue",
+        "queue.publish",
+        "queue.create",
+        "queue.receive",
+        "queue.process",
+        "queue.settle",
+        "queue.submit.arq",
+        "queue.task.arq",
+        "queue.submit.celery",
+        "queue.task.celery",
+        "queue.task.dramatiq",
+        "queue.submit.huey",
+        "queue.task.huey",
+        "queue.task.rq"
+      ],
       "templates": ["{{messaging.destination.name}}"],
       "examples": ["order-events"]
     }
diff --git a/rust/src/op.rs b/rust/src/op.rs
index 7ae22d59..da586a9c 100644
--- a/rust/src/op.rs
+++ b/rust/src/op.rs
@@ -140,6 +140,30 @@ pub const MESSAGING_QUEUE_PROCESS_SPAN_OP: &str = "queue.process";
 /// Settling a message, e.g. acknowledging or rejecting it.
 pub const MESSAGING_QUEUE_SETTLE_SPAN_OP: &str = "queue.settle";
 
+/// Publishing a message to an arq queue.
+pub const MESSAGING_QUEUE_SUBMIT_ARQ_SPAN_OP: &str = "queue.submit.arq";
+
+/// Processing a message from an arq queue.
+pub const MESSAGING_QUEUE_TASK_ARQ_SPAN_OP: &str = "queue.task.arq";
+
+/// Publishing a message to a Celery broker.
+pub const MESSAGING_QUEUE_SUBMIT_CELERY_SPAN_OP: &str = "queue.submit.celery";
+
+/// Processing a message from a Celery queue.
+pub const MESSAGING_QUEUE_TASK_CELERY_SPAN_OP: &str = "queue.task.celery";
+
+/// Publishing a message from a Dramatiq queue.
+pub const MESSAGING_QUEUE_TASK_DRAMATIQ_SPAN_OP: &str = "queue.task.dramatiq";
+
+/// Publishing a message to a Huey instance.
+pub const MESSAGING_QUEUE_SUBMIT_HUEY_SPAN_OP: &str = "queue.submit.huey";
+
+/// Processing a message from a Huey instance.
+pub const MESSAGING_QUEUE_TASK_HUEY_SPAN_OP: &str = "queue.task.huey";
+
+/// Processing a message from an RQ queue.
+pub const MESSAGING_QUEUE_TASK_RQ_SPAN_OP: &str = "queue.task.rq";
+
 // Path: model/op/mobile.json
 // Name: mobile
 

From 3070259b25960daccf168e18035318b5d197f595 Mon Sep 17 00:00:00 2001
From: Alexander Alderman Webb <alexander.webb@sentry.io>
Date: Wed, 8 Jul 2026 13:43:04 +0200
Subject: [PATCH 4/4] fix dramatiq description

---
 javascript/sentry-conventions/src/op.ts | 2 +-
 model/op/messaging.json                 | 2 +-
 rust/src/op.rs                          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/javascript/sentry-conventions/src/op.ts b/javascript/sentry-conventions/src/op.ts
index befc5012..f4af771e 100644
--- a/javascript/sentry-conventions/src/op.ts
+++ b/javascript/sentry-conventions/src/op.ts
@@ -201,7 +201,7 @@ export const MESSAGING_QUEUE_SUBMIT_CELERY_SPAN_OP = 'queue.submit.celery';
 export const MESSAGING_QUEUE_TASK_CELERY_SPAN_OP = 'queue.task.celery';
 
 /**
- * Publishing a message from a Dramatiq queue.
+ * Processing a message from a Dramatiq queue.
  */
 export const MESSAGING_QUEUE_TASK_DRAMATIQ_SPAN_OP = 'queue.task.dramatiq';
 
diff --git a/model/op/messaging.json b/model/op/messaging.json
index d4412b4a..50420c77 100644
--- a/model/op/messaging.json
+++ b/model/op/messaging.json
@@ -44,7 +44,7 @@
     },
     {
       "name": "queue.task.dramatiq",
-      "description": "Publishing a message from a Dramatiq queue."
+      "description": "Processing a message from a Dramatiq queue."
     },
     {
       "name": "queue.submit.huey",
diff --git a/rust/src/op.rs b/rust/src/op.rs
index da586a9c..cd775fd9 100644
--- a/rust/src/op.rs
+++ b/rust/src/op.rs
@@ -152,7 +152,7 @@ pub const MESSAGING_QUEUE_SUBMIT_CELERY_SPAN_OP: &str = "queue.submit.celery";
 /// Processing a message from a Celery queue.
 pub const MESSAGING_QUEUE_TASK_CELERY_SPAN_OP: &str = "queue.task.celery";
 
-/// Publishing a message from a Dramatiq queue.
+/// Processing a message from a Dramatiq queue.
 pub const MESSAGING_QUEUE_TASK_DRAMATIQ_SPAN_OP: &str = "queue.task.dramatiq";
 
 /// Publishing a message to a Huey instance.