ref: Remove old style topic definition from ingest consumer code (#66352

)

settings.KAFKA_INGEST_EVENTS, settings.KAFKA_INGEST_ATTACHMENTS and
settings.KAFKA_INGEST_TRANSACTIONS are deprecated and will be removed.

src/sentry/ingest/types.py

@@ -6,19 +6,3 @@ class ConsumerType:
     Events = "events"  # consumes simple events ( from the Events topic)
     Attachments = "attachments"  # consumes events with attachments ( from the Attachments topic)
     Transactions = "transactions"  # consumes transaction events ( from the Transactions topic)
-
-    @staticmethod
-    def all():
-        return (ConsumerType.Events, ConsumerType.Attachments, ConsumerType.Transactions)
-
-    @staticmethod
-    def get_topic_name(consumer_type):
-        from django.conf import settings
-
-        if consumer_type == ConsumerType.Events:
-            return settings.KAFKA_INGEST_EVENTS
-        elif consumer_type == ConsumerType.Attachments:
-            return settings.KAFKA_INGEST_ATTACHMENTS
-        elif consumer_type == ConsumerType.Transactions:
-            return settings.KAFKA_INGEST_TRANSACTIONS
-        raise ValueError("Invalid consumer type", consumer_type)

tests/sentry/ingest/ingest_consumer/test_ingest_consumer_kafka.py

@@ -9,14 +9,15 @@
 from django.conf import settings
 
 from sentry import eventstore
+from sentry.conf.types.kafka_definition import Topic
 from sentry.consumers import get_stream_processor
 from sentry.event_manager import EventManager
 from sentry.eventstore.processing import event_processing_store
-from sentry.ingest.types import ConsumerType
 from sentry.testutils.pytest.fixtures import django_db_all
 from sentry.testutils.skips import requires_kafka, requires_snuba
 from sentry.utils import json
 from sentry.utils.batching_kafka_consumer import create_topics
+from sentry.utils.kafka_config import get_topic_definition
 
 pytestmark = [requires_snuba, requires_kafka]
 
@@ -101,7 +102,9 @@ def test_ingest_consumer_reads_from_topic_and_calls_celery_task(
     get_test_message,
     random_group_id,
 ):
-    topic_event_name = ConsumerType.get_topic_name(ConsumerType.Events)
+
+    topic = Topic.INGEST_EVENTS
+    topic_event_name = get_topic_definition(topic)["real_topic_name"]
 
     admin = kafka_admin(settings)
     admin.delete_topic(topic_event_name)
@@ -157,7 +160,8 @@ def test_ingest_consumer_gets_event_unstuck(
     get_test_message,
     random_group_id,
 ):
-    topic_event_name = ConsumerType.get_topic_name(ConsumerType.Events)
+    topic = Topic.INGEST_EVENTS
+    topic_event_name = get_topic_definition(topic)["real_topic_name"]
 
     admin = kafka_admin(settings)
     admin.delete_topic(topic_event_name)