From 9f450d577ffd08901f160c7a5472cf21380a6bff Mon Sep 17 00:00:00 2001
From: Andrew Liu <159852527+aliu3ntry@users.noreply.github.com>
Date: Fri, 15 Mar 2024 16:29:46 -0700
Subject: [PATCH] feat(feedback): add config for feedback DLQ (#67068)

Need to verify the values of `dlq_` fields in consumers/__init__. These
are used to create a DlqPolicy (line 509, same file)

requires https://github.com/getsentry/sentry-kafka-schemas/pull/238
---
 src/sentry/conf/server.py                  | 1 +
 src/sentry/conf/types/kafka_definition.py  | 1 +
 src/sentry/consumers/__init__.py           | 1 +
 tests/sentry/conf/test_kafka_definition.py | 2 --
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
index ae526121eb286e..ba6fece89f442e 100644
--- a/src/sentry/conf/server.py
+++ b/src/sentry/conf/server.py
@@ -3473,6 +3473,7 @@ def build_cdc_postgres_init_db_volume(settings: Any) -> dict[str, dict[str, str]
     "metrics-subscription-results": "default",
     "ingest-events": "default",
     "ingest-feedback-events": "default",
+    "ingest-feedback-events-dlq": "default",
     "ingest-attachments": "default",
     "ingest-transactions": "default",
     "ingest-metrics": "default",
diff --git a/src/sentry/conf/types/kafka_definition.py b/src/sentry/conf/types/kafka_definition.py
index 2bdf08bad8684f..66a4b4515eb42e 100644
--- a/src/sentry/conf/types/kafka_definition.py
+++ b/src/sentry/conf/types/kafka_definition.py
@@ -27,6 +27,7 @@ class Topic(Enum):
     INGEST_EVENTS = "ingest-events"
     INGEST_EVENTS_DLQ = "ingest-events-dlq"
     INGEST_FEEDBACK_EVENTS = "ingest-feedback-events"
+    INGEST_FEEDBACK_EVENTS_DLQ = "ingest-feedback-events-dlq"
     INGEST_ATTACHMENTS = "ingest-attachments"
     INGEST_TRANSACTIONS = "ingest-transactions"
     INGEST_METRICS = "ingest-metrics"
diff --git a/src/sentry/consumers/__init__.py b/src/sentry/consumers/__init__.py
index c5ec2958406e3a..ffdeb801d764e5 100644
--- a/src/sentry/consumers/__init__.py
+++ b/src/sentry/consumers/__init__.py
@@ -268,6 +268,7 @@ def ingest_events_options() -> list[click.Option]:
         "static_args": {
             "consumer_type": "feedback-events",
         },
+        "dlq_topic": Topic.INGEST_FEEDBACK_EVENTS_DLQ,
     },
     "ingest-attachments": {
         "topic": Topic.INGEST_ATTACHMENTS,
diff --git a/tests/sentry/conf/test_kafka_definition.py b/tests/sentry/conf/test_kafka_definition.py
index 90c0f9317cc58f..0bbf440901fe89 100644
--- a/tests/sentry/conf/test_kafka_definition.py
+++ b/tests/sentry/conf/test_kafka_definition.py
@@ -16,8 +16,6 @@ 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",