feat(uptime): Use organization level autodetection flag to gate whether we should run detection (#74652)

Respect the org level flag that controls whether to run detection or
not.

Author: wedamija

src/sentry/uptime/detectors/detector.py

@@ -3,7 +3,11 @@
 from typing import TYPE_CHECKING
 
 from sentry import features
-from sentry.uptime.detectors.ranking import add_base_url_to_rank, should_detect_for_project
+from sentry.uptime.detectors.ranking import (
+    add_base_url_to_rank,
+    should_detect_for_organization,
+    should_detect_for_project,
+)
 from sentry.uptime.detectors.url_extraction import extract_base_url
 from sentry.utils import metrics
 
@@ -14,9 +18,11 @@
 def detect_base_url_for_project(project: Project, url: str) -> None:
     # Note: We might end up removing the `should_detect_for_project` check here if/when we decide to use detected
     # urls as suggestions as well.
-    if not features.has(
-        "organizations:uptime-automatic-hostname-detection", project.organization
-    ) or not should_detect_for_project(project):
+    if (
+        not features.has("organizations:uptime-automatic-hostname-detection", project.organization)
+        or not should_detect_for_project(project)
+        or not should_detect_for_organization(project.organization)
+    ):
         return
 
     base_url = extract_base_url(url)

src/sentry/uptime/detectors/ranking.py

@@ -8,6 +8,7 @@
 from redis.client import StrictRedis
 from rediscluster import RedisCluster
 
+from sentry.constants import UPTIME_AUTODETECTION
 from sentry.utils import redis
 
 if TYPE_CHECKING:
@@ -162,7 +163,8 @@ def delete_organization_bucket(bucket: datetime) -> None:
 
 
 def should_detect_for_organization(organization: Organization) -> bool:
-    # TODO: Check setting here
+    if not organization.get_option("sentry:uptime_autodetection", UPTIME_AUTODETECTION):
+        return False
     return True
 
 

tests/sentry/uptime/detectors/test_detector.py

@@ -25,3 +25,9 @@ def test_disabled_for_project(self):
         self.project.update_option("sentry:uptime_autodetection", False)
         detect_base_url_for_project(self.project, "https://sentry.io")
         self.assert_organization_key(self.organization, False)
+
+    @with_feature("organizations:uptime-automatic-hostname-detection")
+    def test_disabled_for_organization(self):
+        self.organization.update_option("sentry:uptime_autodetection", False)
+        detect_base_url_for_project(self.project, "https://sentry.io")
+        self.assert_organization_key(self.organization, False)

tests/sentry/uptime/detectors/test_ranking.py

@@ -14,6 +14,7 @@
     get_candidate_urls_for_project,
     get_organization_bucket,
     get_project_base_url_rank_key,
+    should_detect_for_organization,
     should_detect_for_project,
 )
 
@@ -174,3 +175,12 @@ def test(self):
         assert not should_detect_for_project(self.project)
         self.project.update_option("sentry:uptime_autodetection", True)
         assert should_detect_for_project(self.project)
+
+
+class ShouldDetectForOrgTest(TestCase):
+    def test(self):
+        assert should_detect_for_organization(self.organization)
+        self.organization.update_option("sentry:uptime_autodetection", False)
+        assert not should_detect_for_organization(self.organization)
+        self.organization.update_option("sentry:uptime_autodetection", True)
+        assert should_detect_for_organization(self.organization)

tests/sentry/uptime/detectors/test_tasks.py

@@ -18,6 +18,7 @@
     _get_cluster,
     add_base_url_to_rank,
     get_organization_bucket,
+    get_project_base_url_rank_key,
 )
 from sentry.uptime.detectors.tasks import (
     LAST_PROCESSED_KEY,
@@ -144,17 +145,38 @@ def test(self):
                 ]
             )
 
-    def test_should_not_detect(self):
+    def test_should_not_detect_project(self):
         with mock.patch(
-            # TODO: Replace this mock with real tests when we implement this function properly
-            "sentry.uptime.detectors.tasks.should_detect_for_project",
-            return_value=False,
-        ), mock.patch(
             "sentry.uptime.detectors.tasks.get_candidate_urls_for_project"
         ) as mock_get_candidate_urls_for_project:
+            self.project.update_option("sentry:uptime_autodetection", False)
             assert not process_project_url_ranking(self.project, 5)
             mock_get_candidate_urls_for_project.assert_not_called()
 
+    def test_should_not_detect_organization(self):
+        url_1 = "https://sentry.io"
+        url_2 = "https://sentry.sentry.io"
+        project_2 = self.create_project()
+        add_base_url_to_rank(self.project, url_2)
+        add_base_url_to_rank(self.project, url_1)
+        add_base_url_to_rank(self.project, url_1)
+        add_base_url_to_rank(project_2, url_1)
+
+        keys = [
+            get_project_base_url_rank_key(self.project),
+            get_project_base_url_rank_key(project_2),
+        ]
+        redis = _get_cluster()
+        assert all(redis.exists(key) for key in keys)
+
+        with mock.patch(
+            "sentry.uptime.detectors.tasks.get_candidate_urls_for_project"
+        ) as mock_get_candidate_urls_for_project:
+            self.organization.update_option("sentry:uptime_autodetection", False)
+            assert not process_organization_url_ranking(self.organization.id)
+            mock_get_candidate_urls_for_project.assert_not_called()
+            assert all(not redis.exists(key) for key in keys)
+
 
 @freeze_time()
 class ProcessProjectUrlRankingTest(TestCase):