feat(crons): Add cron monitor created metric (#58017)

Modify the first_monitor_created metric to also record whenever a
monitor is created.

Fixes: https://github.com/getsentry/team-crons/issues/95

Author: David Wang

src/sentry/analytics/events/__init__.py

@@ -9,9 +9,9 @@
 from .codeowners_created import *  # noqa: F401,F403
 from .codeowners_updated import *  # noqa: F401,F403
 from .comment_webhooks import *  # noqa: F401,F403
+from .cron_monitor_created import *  # noqa: F401,F403
 from .eventuser_endpoint_request import *  # noqa: F401,F403
 from .first_cron_checkin_sent import *  # noqa: F401,F403
-from .first_cron_monitor_created import *  # noqa: F401,F403
 from .first_event_sent import *  # noqa: F401,F403
 from .first_profile_sent import *  # noqa: F401,F403
 from .first_release_tag_sent import *  # noqa: F401,F403

src/sentry/analytics/events/first_cron_monitor_created.py renamed to src/sentry/analytics/events/cron_monitor_created.py

@@ -1,9 +1,7 @@
 from sentry import analytics
 
 
-class FirstCronMonitorCreated(analytics.Event):
-    type = "first_cron_monitor.created"
-
+class CronMonitorEvent(analytics.Event):
     attributes = (
         analytics.Attribute("organization_id"),
         analytics.Attribute("project_id"),
@@ -12,4 +10,13 @@ class FirstCronMonitorCreated(analytics.Event):
     )
 
 
+class CronMonitorCreated(CronMonitorEvent):
+    type = "cron_monitor.created"
+
+
+class FirstCronMonitorCreated(CronMonitorEvent):
+    type = "first_cron_monitor.created"
+
+
 analytics.register(FirstCronMonitorCreated)
+analytics.register(CronMonitorCreated)

src/sentry/monitors/consumers/monitor_consumer.py

@@ -40,7 +40,7 @@
     get_new_timeout_at,
     get_timeout_at,
     signal_first_checkin,
-    signal_first_monitor_created,
+    signal_monitor_created,
     valid_duration,
 )
 from sentry.monitors.validators import ConfigValidator, MonitorCheckInValidator
@@ -107,7 +107,7 @@ def _ensure_monitor_with_config(
                 "config": validated_config,
             },
         )
-        signal_first_monitor_created(project, None, True)
+        signal_monitor_created(project, None, True)
 
     # Update existing monitor
     if monitor and not created and monitor.config != validated_config:

src/sentry/monitors/endpoints/monitor_ingest_checkin_index.py

@@ -30,7 +30,7 @@
     MonitorLimitsExceeded,
 )
 from sentry.monitors.serializers import MonitorCheckInSerializer
-from sentry.monitors.utils import get_timeout_at, signal_first_checkin, signal_first_monitor_created
+from sentry.monitors.utils import get_timeout_at, signal_first_checkin, signal_monitor_created
 from sentry.monitors.validators import MonitorCheckInValidator
 from sentry.ratelimits.config import RateLimitConfig
 from sentry.types.ratelimit import RateLimit, RateLimitCategory
@@ -163,7 +163,7 @@ def post(
                     )
 
                     if created:
-                        signal_first_monitor_created(project, request.user, True)
+                        signal_monitor_created(project, request.user, True)
             except MonitorLimitsExceeded as e:
                 return self.respond({type(e).__name__: str(e)}, status=400)
 

src/sentry/monitors/endpoints/organization_monitor_index.py

@@ -30,7 +30,7 @@
     MonitorType,
 )
 from sentry.monitors.serializers import MonitorSerializer, MonitorSerializerResponse
-from sentry.monitors.utils import create_alert_rule, signal_first_monitor_created
+from sentry.monitors.utils import create_alert_rule, signal_monitor_created
 from sentry.monitors.validators import MonitorValidator
 from sentry.search.utils import tokenize_query
 
@@ -227,7 +227,7 @@ def post(self, request: Request, organization) -> Response:
         )
 
         project = result["project"]
-        signal_first_monitor_created(project, request.user, False)
+        signal_monitor_created(project, request.user, False)
 
         validated_alert_rule = result.get("alert_rule")
         if validated_alert_rule:

src/sentry/monitors/utils.py

@@ -14,7 +14,11 @@
 from sentry.models.project import Project
 from sentry.models.rule import Rule, RuleActivity, RuleActivityType, RuleSource
 from sentry.models.user import User
-from sentry.signals import first_cron_checkin_received, first_cron_monitor_created
+from sentry.signals import (
+    cron_monitor_created,
+    first_cron_checkin_received,
+    first_cron_monitor_created,
+)
 
 from .constants import MAX_TIMEOUT, TIMEOUT
 from .models import CheckInStatus, Monitor, MonitorCheckIn
@@ -23,7 +27,7 @@
 def signal_first_checkin(project: Project, monitor: Monitor):
     if not project.flags.has_cron_checkins:
         # Backfill users that already have cron monitors
-        signal_first_monitor_created(project, None, False)
+        check_and_signal_first_monitor_created(project, None, False)
         transaction.on_commit(
             lambda: first_cron_checkin_received.send_robust(
                 project=project, monitor_id=str(monitor.guid), sender=Project
@@ -32,13 +36,20 @@ def signal_first_checkin(project: Project, monitor: Monitor):
         )
 
 
-def signal_first_monitor_created(project: Project, user, from_upsert: bool):
+def check_and_signal_first_monitor_created(project: Project, user, from_upsert: bool):
     if not project.flags.has_cron_monitors:
         first_cron_monitor_created.send_robust(
             project=project, user=user, from_upsert=from_upsert, sender=Project
         )
 
 
+def signal_monitor_created(project: Project, user, from_upsert: bool):
+    cron_monitor_created.send_robust(
+        project=project, user=user, from_upsert=from_upsert, sender=Project
+    )
+    check_and_signal_first_monitor_created(project, user, from_upsert)
+
+
 # Generates a timeout_at value for new check-ins
 def get_timeout_at(
     monitor_config: dict, status: CheckInStatus, date_added: Optional[datetime]

src/sentry/receivers/onboarding.py

@@ -21,6 +21,7 @@
 from sentry.services.hybrid_cloud.user import RpcUser
 from sentry.signals import (
     alert_rule_created,
+    cron_monitor_created,
     event_processed,
     first_cron_checkin_received,
     first_cron_monitor_created,
@@ -267,6 +268,17 @@ def record_first_cron_monitor(project, user, from_upsert, **kwargs):
         )
 
 
+@cron_monitor_created.connect(weak=False)
+def record_cron_monitor_created(project, user, from_upsert, **kwargs):
+    analytics.record(
+        "cron_monitor.created",
+        user_id=user.id if user else project.organization.default_owner_id,
+        organization_id=project.organization_id,
+        project_id=project.id,
+        from_upsert=from_upsert,
+    )
+
+
 @first_cron_checkin_received.connect(weak=False)
 def record_first_cron_checkin(project, monitor_id, **kwargs):
     project.update(flags=F("flags").bitor(Project.flags.has_cron_checkins))

src/sentry/signals.py

@@ -132,6 +132,7 @@ def send_robust(self, sender, **named) -> List[Tuple[Receiver, Union[Exception,
 first_profile_received = BetterSignal()  # ["project"]
 first_replay_received = BetterSignal()  # ["project"]
 first_cron_monitor_created = BetterSignal()  # ["project", "user", "from_upsert"]
+cron_monitor_created = BetterSignal()  # ["project", "user", "from_upsert"]
 first_cron_checkin_received = BetterSignal()  # ["project", "monitor_id"]
 member_invited = BetterSignal()  # ["member", "user"]
 member_joined = BetterSignal()  # ["organization_member_id", "organization_id", "user_id"]

tests/sentry/monitors/endpoints/test_organization_monitor_index.py

@@ -192,6 +192,13 @@ def test_simple(self, mock_record):
         self.project.refresh_from_db()
         assert self.project.flags.has_cron_monitors
 
+        mock_record.assert_any_call(
+            "cron_monitor.created",
+            user_id=self.user.id,
+            organization_id=self.organization.id,
+            project_id=self.project.id,
+            from_upsert=False,
+        )
         mock_record.assert_called_with(
             "first_cron_monitor.created",
             user_id=self.user.id,