From 34ba03b61616d7833cd3b403edd599797e8b03b1 Mon Sep 17 00:00:00 2001 From: Evan Purkhiser Date: Thu, 30 Nov 2023 13:21:38 -0800 Subject: [PATCH] ref(crons): message_type is always available After https://github.com/getsentry/relay/pull/2723 this field is guaranteed to exist in the CheckinMessage. We no longer need to add this in and have it marked as NotRequired. --- src/sentry/monitors/consumers/monitor_consumer.py | 7 ------- src/sentry/monitors/types.py | 4 +--- tests/sentry/monitors/test_monitor_consumer.py | 1 + 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/sentry/monitors/consumers/monitor_consumer.py b/src/sentry/monitors/consumers/monitor_consumer.py index b97a8424d491dd..2a32a978afac9c 100644 --- a/src/sentry/monitors/consumers/monitor_consumer.py +++ b/src/sentry/monitors/consumers/monitor_consumer.py @@ -571,13 +571,6 @@ def _process_message( partition: int, wrapper: CheckinMessage | ClockPulseMessage, ) -> None: - - # XXX: Relay does not attach a message type, to properly discriminate the - # message_type we add it by default here. This can be removed once the - # message_type is guaranteed - if "message_type" not in wrapper: - wrapper["message_type"] = "check_in" - try: try_monitor_tasks_trigger(ts, partition) except Exception: diff --git a/src/sentry/monitors/types.py b/src/sentry/monitors/types.py index cf90ae180d80c1..80c32136c0ba5c 100644 --- a/src/sentry/monitors/types.py +++ b/src/sentry/monitors/types.py @@ -5,9 +5,7 @@ class CheckinMessage(TypedDict): - # TODO(epurkhiser): We should make this required and ensure the message - # produced by relay includes this message type - message_type: NotRequired[Literal["check_in"]] + message_type: Literal["check_in"] payload: str start_time: float project_id: str diff --git a/tests/sentry/monitors/test_monitor_consumer.py b/tests/sentry/monitors/test_monitor_consumer.py index e0cf96f93fca13..6a4eccb576cefc 100644 --- a/tests/sentry/monitors/test_monitor_consumer.py +++ b/tests/sentry/monitors/test_monitor_consumer.py @@ -70,6 +70,7 @@ def send_checkin( payload.update(overrides) wrapper = { + "message_type": "check_in", "start_time": ts.timestamp(), "project_id": self.project.id, "payload": json.dumps(payload),