From 55473287df751b2d00199a52f72e47528cb24aab Mon Sep 17 00:00:00 2001
From: Evan Hicks <evan.hicks@sentry.io>
Date: Thu, 11 Jun 2026 15:16:16 -0400
Subject: [PATCH 1/3] ref: Add a push_timeout_sec parameter to the taskworker
 CLI

This is used to control how long the worker will wait to enqueue a received activation.
---
 src/sentry/runner/commands/run.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/sentry/runner/commands/run.py b/src/sentry/runner/commands/run.py
index c6a8dd0a305c0d..cbdcdfb13d48ab 100644
--- a/src/sentry/runner/commands/run.py
+++ b/src/sentry/runner/commands/run.py
@@ -200,6 +200,12 @@ def taskworker_scheduler(redis_cluster: str, **options: Any) -> None:
     help="The number of seconds before touching the health check file",
     default=taskworker_constants.DEFAULT_WORKER_HEALTH_CHECK_SEC_PER_TOUCH,
 )
+@click.option(
+    "--push-timeout-sec",
+    help="The timeout in seconds for the worker to wait to push a task into the child queue",
+    default=5.0,
+    type=float,
+)
 @log_options()
 @configuration
 def taskworker(**options: Any) -> None:
@@ -227,6 +233,7 @@ def run_taskworker(
     pod_name: str,
     health_check_file_path: str | None,
     health_check_sec_per_touch: float,
+    push_timeout_sec: float,
     **options: Any,
 ) -> None:
     """
@@ -251,6 +258,7 @@ def run_taskworker(
                 health_check_file_path=health_check_file_path,
                 health_check_sec_per_touch=health_check_sec_per_touch,
                 grpc_port=worker_rpc_port,
+                push_task_timeout=push_timeout_sec,
             )
         else:
             worker = TaskWorker(

From 176fb615c8a24cda21bff1a4786088962f16f6f0 Mon Sep 17 00:00:00 2001
From: Evan Hicks <evan.hicks@sentry.io>
Date: Mon, 15 Jun 2026 11:26:58 -0400
Subject: [PATCH 2/3] update version

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 960777b4b7b34a..b1bb597864a882 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -107,7 +107,7 @@ dependencies = [
   "statsd>=3.3.0",
   "structlog>=22.1.0",
   "symbolic>=13.1.1",
-  "taskbroker-client>=0.18.6",
+  "taskbroker-client>=0.19.1",
   "tiktoken>=0.8.0",
   "tokenizers>=0.22.0",
   "tldextract>=5.1.2",

From eeccc5daf540c447128d3506a63128091f2c318a Mon Sep 17 00:00:00 2001
From: "getsantry[bot]" <66042841+getsantry[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2026 16:29:55 +0000
Subject: [PATCH 3/3] :snowflake: re-freeze requirements

---
 uv.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/uv.lock b/uv.lock
index 82043e6b69c77c..3659da2817304d 100644
--- a/uv.lock
+++ b/uv.lock
@@ -2427,7 +2427,7 @@ requires-dist = [
     { name = "stripe", specifier = ">=6.7.0" },
     { name = "structlog", specifier = ">=22.1.0" },
     { name = "symbolic", specifier = ">=13.1.1" },
-    { name = "taskbroker-client", specifier = ">=0.18.6" },
+    { name = "taskbroker-client", specifier = ">=0.19.1" },
     { name = "tiktoken", specifier = ">=0.8.0" },
     { name = "tldextract", specifier = ">=5.1.2" },
     { name = "tokenizers", specifier = ">=0.22.0" },
@@ -2820,7 +2820,7 @@ wheels = [
 
 [[package]]
 name = "taskbroker-client"
-version = "0.18.6"
+version = "0.19.1"
 source = { registry = "https://pypi.devinfra.sentry.io/simple" }
 dependencies = [
     { name = "confluent-kafka", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
@@ -2838,7 +2838,7 @@ dependencies = [
     { name = "zstandard", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 ]
 wheels = [
-    { url = "https://pypi.devinfra.sentry.io/wheels/taskbroker_client-0.18.6-py3-none-any.whl", hash = "sha256:a7e7cb63031e3ef470c1c9ef29f03766fdec86b299c6d386c9fccfd23d181886" },
+    { url = "https://pypi.devinfra.sentry.io/wheels/taskbroker_client-0.19.1-py3-none-any.whl", hash = "sha256:fc20b0aa19b0dad7caf8f1182b615b624158194e766f7d84abdaa40633b2d03d" },
 ]
 
 [[package]]