From 6e93319e9d1441937c063bf81dfe0331c57526a1 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 4 Jul 2025 10:04:58 -0400 Subject: [PATCH 1/2] feat(taskworker) Add taskworker-buffer topic - Update sentry-kafka-schemas - Add new buffer topics Refs getsentry/taskbroker#431 --- requirements-base.txt | 2 +- requirements-dev-frozen.txt | 2 +- requirements-frozen.txt | 2 +- src/sentry/conf/server.py | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/requirements-base.txt b/requirements-base.txt index 727681d7d94a15..6cf9977ca575e3 100644 --- a/requirements-base.txt +++ b/requirements-base.txt @@ -64,7 +64,7 @@ rfc3339-validator>=0.1.2 rfc3986-validator>=0.1.1 # [end] jsonschema format validators sentry-arroyo>=2.26.0 -sentry-kafka-schemas>=1.3.13 +sentry-kafka-schemas>=1.3.14 sentry-ophio>=1.1.3 sentry-protos==0.2.1 sentry-redis-tools>=0.5.0 diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt index b04e24729557cb..197e1391ac5397 100644 --- a/requirements-dev-frozen.txt +++ b/requirements-dev-frozen.txt @@ -186,7 +186,7 @@ sentry-devenv==1.21.0 sentry-forked-django-stubs==5.2.1.post3 sentry-forked-djangorestframework-stubs==3.16.0.post1 sentry-forked-email-reply-parser==0.5.12.post1 -sentry-kafka-schemas==1.3.13 +sentry-kafka-schemas==1.3.14 sentry-ophio==1.1.3 sentry-protos==0.2.1 sentry-redis-tools==0.5.0 diff --git a/requirements-frozen.txt b/requirements-frozen.txt index 5d3efc433e47ab..3ca697dfad9186 100644 --- a/requirements-frozen.txt +++ b/requirements-frozen.txt @@ -123,7 +123,7 @@ rsa==4.8 s3transfer==0.10.0 sentry-arroyo==2.26.0 sentry-forked-email-reply-parser==0.5.12.post1 -sentry-kafka-schemas==1.3.13 +sentry-kafka-schemas==1.3.14 sentry-ophio==1.1.3 sentry-protos==0.2.1 sentry-redis-tools==0.5.0 diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py index 08835259598b55..c41d5e084942d1 100644 --- a/src/sentry/conf/server.py +++ b/src/sentry/conf/server.py @@ -3396,6 +3396,8 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]: "taskworker-dlq": "default", "taskworker-billing": "default", "taskworker-billing-dlq": "default", + "taskworker-buffer": "default", + "taskworker-buffer-dlq": "default", "taskworker-control": "default", "taskworker-control-dlq": "default", "taskworker-cutover": "default", From 755794cbf2a915d7f9f336eecaa827c4fdbe21b3 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 4 Jul 2025 15:06:20 -0400 Subject: [PATCH 2/2] Add to the Topic enum as well. --- src/sentry/conf/types/kafka_definition.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sentry/conf/types/kafka_definition.py b/src/sentry/conf/types/kafka_definition.py index b4723abd9dade6..800ce1eb586f68 100644 --- a/src/sentry/conf/types/kafka_definition.py +++ b/src/sentry/conf/types/kafka_definition.py @@ -75,6 +75,8 @@ class Topic(Enum): TASKWORKER_DLQ = "taskworker-dlq" TASKWORKER_BILLING = "taskworker-billing" TASKWORKER_BILLING_DLQ = "taskworker-billing-dlq" + TASKWORKER_BUFFER = "taskworker-buffer" + TASKWORKER_BUFFER_DLQ = "taskworker-buffer-dlq" TASKWORKER_CONTROL = "taskworker-control" TASKWORKER_CONTROL_DLQ = "taskworker-control-dlq" TASKWORKER_CUTOVER = "taskworker-cutover"