ref(uptime): Detector always exists (#94571)

Author: evanpurkhiser

src/sentry/uptime/consumers/results_consumer.py

@@ -309,10 +309,10 @@ def handle_result(self, subscription: UptimeSubscription | None, result: CheckRe
         if should_run_region_checks(subscription, result):
             try_check_and_update_regions(subscription, subscription_regions)
 
-        detector = get_detector(subscription, prefetch_workflow_data=True)
-
-        # Nothing to do if there's an orphaned project subscription
-        if not detector:
+        try:
+            detector = get_detector(subscription, prefetch_workflow_data=True)
+        except Detector.DoesNotExist:
+            # Nothing to do if there's an orphaned project subscription
             remove_uptime_subscription_if_unused(subscription)
             return
 

src/sentry/uptime/endpoints/project_uptime_alert_details.py

@@ -123,7 +123,6 @@ def delete(
         Delete an uptime monitor.
         """
         detector = get_detector(uptime_subscription.uptime_subscription)
-        assert detector
         uptime_subscription_id = uptime_subscription.id
         audit_log_data = uptime_subscription.get_audit_log_data()
         delete_uptime_detector(detector)

src/sentry/uptime/models.py

@@ -340,29 +340,24 @@ def get_current_instance_count(org: Organization) -> int:
         raise NotImplementedError
 
 
-def get_detector(
-    uptime_subscription: UptimeSubscription, prefetch_workflow_data=False
-) -> Detector | None:
+def get_detector(uptime_subscription: UptimeSubscription, prefetch_workflow_data=False) -> Detector:
     """
     Fetches a workflow_engine Detector given an existing uptime_subscription.
     This is used during the transition period moving uptime to detector.
     """
-    try:
-        data_source = DataSource.objects.filter(
-            type=DATA_SOURCE_UPTIME_SUBSCRIPTION,
-            source_id=str(uptime_subscription.id),
-        )
-        qs = Detector.objects_for_deletion.filter(
-            type=GROUP_TYPE_UPTIME_DOMAIN_CHECK_FAILURE, data_sources=data_source[:1]
-        )
-        select_related = ["project", "project__organization"]
-        if prefetch_workflow_data:
-            select_related.append("workflow_condition_group")
-            qs = qs.prefetch_related("workflow_condition_group__conditions")
-        qs = qs.select_related(*select_related)
-        return qs.get()
-    except Detector.DoesNotExist:
-        return None
+    data_source = DataSource.objects.filter(
+        type=DATA_SOURCE_UPTIME_SUBSCRIPTION,
+        source_id=str(uptime_subscription.id),
+    )
+    qs = Detector.objects_for_deletion.filter(
+        type=GROUP_TYPE_UPTIME_DOMAIN_CHECK_FAILURE, data_sources=data_source[:1]
+    )
+    select_related = ["project", "project__organization"]
+    if prefetch_workflow_data:
+        select_related.append("workflow_condition_group")
+        qs = qs.prefetch_related("workflow_condition_group__conditions")
+    qs = qs.select_related(*select_related)
+    return qs.get()
 
 
 def get_uptime_subscription(detector: Detector) -> UptimeSubscription:

src/sentry/uptime/subscriptions/subscriptions.py

@@ -325,7 +325,6 @@ def update_project_uptime_subscription(
         )
 
         detector = get_detector(uptime_monitor.uptime_subscription)
-        assert detector
         detector.update(
             name=default_if_not_set(uptime_monitor.name, name),
             owner_user_id=owner_user_id,

src/sentry/uptime/subscriptions/tasks.py

@@ -237,7 +237,6 @@ def broken_monitor_checker(**kwargs):
         )
     ):
         detector = get_detector(uptime_subscription)
-        assert detector
         if detector.config["mode"] == UptimeMonitorMode.AUTO_DETECTED_ACTIVE:
             try:
                 disable_uptime_detector(detector)

tests/sentry/deletions/test_detector.py

@@ -127,7 +127,6 @@ def test_delete_uptime_detector(self) -> None:
         proj_sub = self.create_project_uptime_subscription()
         uptime_sub = proj_sub.uptime_subscription
         detector = get_detector(uptime_sub)
-        assert detector
         self.ScheduledDeletion.schedule(instance=detector, days=0)
 
         with self.tasks():

tests/sentry/uptime/consumers/test_results_consumer.py

@@ -73,9 +73,7 @@ def setUp(self) -> None:
             uptime_subscription=self.subscription,
             owner=self.user,
         )
-        detector = get_detector(self.subscription)
-        assert detector
-        self.detector = detector
+        self.detector = get_detector(self.subscription)
 
     def send_result(
         self, result: CheckResult, consumer: ProcessingStrategy[KafkaPayload] | None = None

tests/sentry/uptime/detectors/test_ranking.py

@@ -206,7 +206,6 @@ def test_quota(self) -> None:
         uptime_monitor = self.create_project_uptime_subscription()
         assert not should_detect_for_organization(self.organization)
         detector = get_detector(uptime_monitor.uptime_subscription)
-        assert detector
         detector.delete()
         uptime_monitor.delete()
         assert should_detect_for_organization(self.organization)

tests/sentry/uptime/subscriptions/test_subscriptions.py

@@ -214,7 +214,6 @@ def test(self) -> None:
         ).exists()
 
         detector = get_detector(uptime_monitor.uptime_subscription)
-        assert detector
         assert detector.config["mode"] == UptimeMonitorMode.AUTO_DETECTED_ACTIVE.value
         assert detector.config["environment"] == self.environment.name
         assert detector.project == self.project
@@ -386,7 +385,6 @@ def test_status_enable(self, mock_enable_uptime_detector: mock.MagicMock) -> Non
                 status=ObjectStatus.ACTIVE,
             )
             detector = get_detector(proj_sub.uptime_subscription)
-            assert detector
             mock_enable_uptime_detector.assert_called_with(detector, ensure_assignment=True)
 
     @mock.patch("sentry.uptime.subscriptions.subscriptions.enable_uptime_detector")
@@ -426,7 +424,6 @@ def test_no_seat_assignment(self, _mock_check_assign_seat: mock.MagicMock) -> No
         assert proj_sub.uptime_subscription.status == UptimeSubscription.Status.DISABLED.value
 
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
         assert not detector.enabled
 
     def test_create_manual_removes_onboarding(self) -> None:
@@ -497,7 +494,6 @@ def test(self) -> None:
         assert prev_uptime_subscription.subscription_id == prev_subscription_id
 
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
         assert detector.name == "New name"
         assert detector.owner_user_id == self.user.id
 
@@ -633,7 +629,6 @@ def test_other_subscriptions(self, mock_remove_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.AUTO_DETECTED_ACTIVE,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
 
         assert proj_sub.uptime_subscription_id != other_sub.uptime_subscription_id
 
@@ -661,7 +656,6 @@ def test_single_subscriptions(self, mock_remove_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.AUTO_DETECTED_ACTIVE,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
         with self.tasks():
             delete_uptime_detector(detector)
             run_scheduled_deletions()
@@ -763,7 +757,6 @@ def test(self, mock_disable_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.MANUAL,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
 
         with self.tasks():
             disable_uptime_detector(detector)
@@ -792,7 +785,6 @@ def test_disable_failed(self, mock_disable_seat: mock.MagicMock) -> None:
                 uptime_status=UptimeStatus.FAILED,
             )
             detector = get_detector(proj_sub.uptime_subscription)
-            assert detector
 
             create_issue_platform_occurrence(
                 self.create_uptime_result(
@@ -830,7 +822,6 @@ def test_already_disabled(self, mock_disable_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.MANUAL,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
 
         proj_sub.update(status=ObjectStatus.DISABLED)
         detector.update(enabled=False)
@@ -850,7 +841,6 @@ def test_skip_quotas(self, mock_disable_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.MANUAL,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
 
         with self.tasks():
             disable_uptime_detector(detector, skip_quotas=True)
@@ -888,7 +878,6 @@ def test(
                 mode=UptimeMonitorMode.MANUAL,
             )
             detector = get_detector(proj_sub.uptime_subscription)
-            assert detector
 
         # Calling enable_uptime_detector on an already enabled
         # monitor does nothing
@@ -944,7 +933,6 @@ def test_no_seat_assignment(
                 mode=UptimeMonitorMode.MANUAL,
             )
             detector = get_detector(proj_sub.uptime_subscription)
-            assert detector
 
         # We'll be unable to assign a seat
         with self.tasks(), raises(UptimeMonitorNoSeatAvailable) as exc_info:
@@ -974,7 +962,6 @@ def test_already_enabled(self, mock_check_assign_seat: mock.MagicMock) -> None:
             mode=UptimeMonitorMode.MANUAL,
         )
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
 
         assert detector.enabled
         assert proj_sub.status == ObjectStatus.ACTIVE
@@ -1008,7 +995,6 @@ def test_skip_quotas(
                 mode=UptimeMonitorMode.MANUAL,
             )
             detector = get_detector(proj_sub.uptime_subscription)
-            assert detector
 
         # Manually mark the monitor and subscription as disabled
         proj_sub.update(status=ObjectStatus.DISABLED)

tests/sentry/uptime/subscriptions/test_tasks.py

@@ -549,7 +549,6 @@ def run_test(
         assert proj_sub.uptime_subscription.uptime_status == expected_uptime_status
 
         detector = get_detector(proj_sub.uptime_subscription)
-        assert detector
         if expected_status == ObjectStatus.ACTIVE:
             assert detector.enabled
         else: