From c59a4efac18372fca9eb6aac9b498f885625f2c3 Mon Sep 17 00:00:00 2001
From: Lyn Nagara <lyn.nagara@gmail.com>
Date: Fri, 15 Mar 2024 12:30:40 -0700
Subject: [PATCH 1/4] feat: Add DLQ topics for ingest-transactions-dlq and
 ingest-attachments-dlq

---
 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 2bdf08bad8684f..3593966601d141 100644
--- a/src/sentry/conf/types/kafka_definition.py
+++ b/src/sentry/conf/types/kafka_definition.py
@@ -28,7 +28,9 @@ class Topic(Enum):
     INGEST_EVENTS_DLQ = "ingest-events-dlq"
     INGEST_FEEDBACK_EVENTS = "ingest-feedback-events"
     INGEST_ATTACHMENTS = "ingest-attachments"
+    INGEST_ATTACHMENTS_DLQ = "ingest-attachments-dlq"
     INGEST_TRANSACTIONS = "ingest-transactions"
+    INGEST_TRANSACTIONS_DLQ = "ingest-transactions-dlq"
     INGEST_METRICS = "ingest-metrics"
     INGEST_METRICS_DLQ = "ingest-metrics-dlq"
     SNUBA_METRICS = "snuba-metrics"

From 012d6cc51201e1243a513ec70b08c2774e752eb6 Mon Sep 17 00:00:00 2001
From: Lyn Nagara <lyn.nagara@gmail.com>
Date: Fri, 15 Mar 2024 14:06:57 -0700
Subject: [PATCH 2/4] .

---
 src/sentry/conf/server.py                  | 2 ++
 tests/sentry/conf/test_kafka_definition.py | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index d972fb270ce9da..f370412252cc9a 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -3475,7 +3475,9 @@ def build_cdc_postgres_init_db_volume(settings: Any) -> dict[str, dict[str, str]
     "ingest-events": "default",
     "ingest-feedback-events": "default",
     "ingest-attachments": "default",
+    "ingest-attachments-dlq": "default",
     "ingest-transactions": "default",
+    "ingest-transactions-dlq": "default",
     "ingest-metrics": "default",
     "ingest-metrics-dlq": "default",
     "snuba-metrics": "default",
diff --git a/tests/sentry/conf/test_kafka_definition.py b/tests/sentry/conf/test_kafka_definition.py
index 90c0f9317cc58f..8ff48b02324c26 100644
--- a/tests/sentry/conf/test_kafka_definition.py
+++ b/tests/sentry/conf/test_kafka_definition.py
@@ -16,13 +16,9 @@ def test_topic_definition() -> None:
     # TODO: Remove this once these topics are actually registered in sentry-kafka-schemas
     currently_unregistered_topics = [
         "outcomes-billing",
-        "ingest-events",
-        "ingest-events-dlq",
         "ingest-attachments",
         "ingest-transactions",
-        "ingest-metrics-dlq",
         "profiles",
-        "ingest-generic-metrics-dlq",
         "ingest-occurrences",
         "ingest-monitors",
     ]

From 59ed84f4d1c268f39646b8c5819b69f92088e8d4 Mon Sep 17 00:00:00 2001
From: Lyn Nagara <lyn.nagara@gmail.com>
Date: Mon, 18 Mar 2024 10:59:03 -0700
Subject: [PATCH 3/4] bump lib

---
 requirements-base.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements-base.txt b/requirements-base.txt
index 40d1fa767ebeb7..754c8b798367ed 100644
--- a/requirements-base.txt
+++ b/requirements-base.txt
@@ -62,7 +62,7 @@ rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
 sentry-arroyo>=2.16.2
-sentry-kafka-schemas>=0.1.61
+sentry-kafka-schemas>=0.1.64
 sentry-ophio==0.2.3
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.49

From 4e9cc65a0bccf4fcba9db23d663a3b8d320b915a Mon Sep 17 00:00:00 2001
From: "getsantry[bot]" <66042841+getsantry[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:36:25 +0000
Subject: [PATCH 4/4] :snowflake: re-freeze requirements

---
 requirements-dev-frozen.txt | 2 +-
 requirements-frozen.txt     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements-dev-frozen.txt b/requirements-dev-frozen.txt
index 6f6de987922ca4..e63a1a0256e12e 100644
--- a/requirements-dev-frozen.txt
+++ b/requirements-dev-frozen.txt
@@ -177,7 +177,7 @@ sentry-cli==2.16.0
 sentry-devenv==1.2.3
 sentry-forked-django-stubs==4.2.7.post3
 sentry-forked-djangorestframework-stubs==3.14.5.post1
-sentry-kafka-schemas==0.1.63
+sentry-kafka-schemas==0.1.64
 sentry-ophio==0.2.3
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.50
diff --git a/requirements-frozen.txt b/requirements-frozen.txt
index 7b3a62b8c13ada..e853f3574f7072 100644
--- a/requirements-frozen.txt
+++ b/requirements-frozen.txt
@@ -119,7 +119,7 @@ rpds-py==0.15.2
 rsa==4.8
 s3transfer==0.10.0
 sentry-arroyo==2.16.2
-sentry-kafka-schemas==0.1.63
+sentry-kafka-schemas==0.1.64
 sentry-ophio==0.2.3
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.50