ref(analytics): Transform analytics events for TET-834

constantinius · constantinius · commit 42e7e29d9742 · 2025-07-10T09:25:39.000+02:00
- Transform event classes to use @analytics.eventclass decorator
- Transform analytics.record calls to use event class instances
- Update imports as needed

Closes TET-834
diff --git a/src/sentry/analytics/events/alert_rule_ui_component_webhook_sent.py b/src/sentry/analytics/events/alert_rule_ui_component_webhook_sent.py
@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("alert_rule_ui_component_webhook.sent")
 class AlertRuleUiComponentWebhookSentEvent(analytics.Event):
-    type = "alert_rule_ui_component_webhook.sent"
-
-    attributes = (
-        # organization_id refers to the organization that installed the sentryapp
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app_id"),
-        analytics.Attribute("event"),
-    )
+    # organization_id refers to the organization that installed the sentryapp
+    organization_id: str
+    sentry_app_id: str
+    event: str
 
 
 analytics.register(AlertRuleUiComponentWebhookSentEvent)
diff --git a/src/sentry/analytics/events/internal_integration_created.py b/src/sentry/analytics/events/internal_integration_created.py
@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("internal_integration.created")
 class InternalIntegrationCreatedEvent(analytics.Event):
-    type = "internal_integration.created"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
 
 
 analytics.register(InternalIntegrationCreatedEvent)
diff --git a/src/sentry/analytics/events/sentry_app_created.py b/src/sentry/analytics/events/sentry_app_created.py
@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.created")
 class SentryAppCreatedEvent(analytics.Event):
-    type = "sentry_app.created"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-        analytics.Attribute("created_alert_rule_ui_component", type=bool, required=False),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
+    created_alert_rule_ui_component: bool | None = None
 
 
 analytics.register(SentryAppCreatedEvent)
diff --git a/src/sentry/analytics/events/sentry_app_deleted.py b/src/sentry/analytics/events/sentry_app_deleted.py
@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.deleted")
 class SentryAppDeletedEvent(analytics.Event):
-    type = "sentry_app.deleted"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
 
 
 analytics.register(SentryAppDeletedEvent)
diff --git a/src/sentry/analytics/events/sentry_app_installation_token_created.py b/src/sentry/analytics/events/sentry_app_installation_token_created.py
@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app_installation_token.created")
 class SentryAppInstallationTokenCreated(analytics.Event):
-    type = "sentry_app_installation_token.created"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app_installation_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app_installation_id: str
+    sentry_app: str
 
 
 analytics.register(SentryAppInstallationTokenCreated)
diff --git a/src/sentry/analytics/events/sentry_app_installation_token_deleted.py b/src/sentry/analytics/events/sentry_app_installation_token_deleted.py
@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app_installation_token.deleted")
 class SentryAppInstallationTokenDeleted(analytics.Event):
-    type = "sentry_app_installation_token.deleted"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app_installation_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app_installation_id: str
+    sentry_app: str
 
 
 analytics.register(SentryAppInstallationTokenDeleted)
diff --git a/src/sentry/analytics/events/sentry_app_installation_updated.py b/src/sentry/analytics/events/sentry_app_installation_updated.py
@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app_installation.updated")
 class SentryAppInstallationUpdatedEvent(analytics.Event):
-    type = "sentry_app_installation.updated"
-
-    attributes = (
-        analytics.Attribute("sentry_app_installation_id"),
-        analytics.Attribute("sentry_app_id"),
-        analytics.Attribute("organization_id"),
-    )
+    sentry_app_installation_id: str
+    sentry_app_id: str
+    organization_id: str
 
 
 analytics.register(SentryAppInstallationUpdatedEvent)
diff --git a/src/sentry/analytics/events/sentry_app_installed.py b/src/sentry/analytics/events/sentry_app_installed.py
@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.installed")
 class SentryAppInstalledEvent(analytics.Event):
-    type = "sentry_app.installed"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
 
 
 analytics.register(SentryAppInstalledEvent)
diff --git a/src/sentry/analytics/events/sentry_app_schema_validation_error.py b/src/sentry/analytics/events/sentry_app_schema_validation_error.py
@@ -1,17 +1,14 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.schema_validation_error")
 class SentryAppSchemaValidationError(analytics.Event):
-    type = "sentry_app.schema_validation_error"
-
-    attributes = (
-        analytics.Attribute("schema"),
-        analytics.Attribute("user_id"),
-        analytics.Attribute("sentry_app_id", required=False),
-        analytics.Attribute("sentry_app_name"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("error_message"),
-    )
+    schema: str
+    user_id: str
+    sentry_app_id: str | None = None
+    sentry_app_name: str
+    organization_id: str
+    error_message: str
 
 
 analytics.register(SentryAppSchemaValidationError)
diff --git a/src/sentry/analytics/events/sentry_app_token_exchanged.py b/src/sentry/analytics/events/sentry_app_token_exchanged.py
@@ -1,13 +1,10 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.token_exchanged")
 class SentryAppTokenExchangedEvent(analytics.Event):
-    type = "sentry_app.token_exchanged"
-
-    attributes = (
-        analytics.Attribute("sentry_app_installation_id"),
-        analytics.Attribute("exchange_type"),
-    )
+    sentry_app_installation_id: str
+    exchange_type: str
 
 
 analytics.register(SentryAppTokenExchangedEvent)
diff --git a/src/sentry/analytics/events/sentry_app_uninstalled.py b/src/sentry/analytics/events/sentry_app_uninstalled.py
@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.uninstalled")
 class SentryAppUninstalledEvent(analytics.Event):
-    type = "sentry_app.uninstalled"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
 
 
 analytics.register(SentryAppUninstalledEvent)
diff --git a/src/sentry/analytics/events/sentry_app_updated.py b/src/sentry/analytics/events/sentry_app_updated.py
@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("sentry_app.updated")
 class SentryAppUpdatedEvent(analytics.Event):
-    type = "sentry_app.updated"
-
-    attributes = (
-        analytics.Attribute("user_id"),
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("sentry_app"),
-        analytics.Attribute("created_alert_rule_ui_component", type=bool, required=False),
-    )
+    user_id: str
+    organization_id: str
+    sentry_app: str
+    created_alert_rule_ui_component: bool | None = None
 
 
 analytics.register(SentryAppUpdatedEvent)
diff --git a/src/sentry/integrations/services/integration/impl.py b/src/sentry/integrations/services/integration/impl.py
@@ -8,6 +8,9 @@
 from django.utils import timezone
 
 from sentry import analytics
+from sentry.analytics.events.alert_rule_ui_component_webhook_sent import (
+    AlertRuleUiComponentWebhookSentEvent,
+)
 from sentry.api.paginator import OffsetPaginator
 from sentry.constants import SentryAppInstallationStatus
 from sentry.hybridcloud.rpc.pagination import RpcPaginationArgs, RpcPaginationResult
@@ -422,10 +425,11 @@ def send_incident_alert_notification(
 
         if alert_rule_action_ui_component:
             analytics.record(
-                "alert_rule_ui_component_webhook.sent",
-                organization_id=organization_id,
-                sentry_app_id=sentry_app.id,
-                event=f"{app_platform_event.resource}.{app_platform_event.action}",
+                AlertRuleUiComponentWebhookSentEvent(
+                    organization_id=organization_id,
+                    sentry_app_id=sentry_app.id,
+                    event=f"{app_platform_event.resource}.{app_platform_event.action}",
+                )
             )
         return alert_rule_action_ui_component
 
diff --git a/src/sentry/sentry_apps/api/endpoints/installation_details.py b/src/sentry/sentry_apps/api/endpoints/installation_details.py
@@ -5,6 +5,7 @@
 from rest_framework.response import Response
 
 from sentry import analytics, audit_log, deletions
+from sentry.analytics.events.sentry_app_uninstalled import SentryAppUninstalledEvent
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
@@ -64,10 +65,11 @@ def delete(self, request: Request, installation) -> Response:
                 data={"sentry_app": sentry_app_installation.sentry_app.name},
             )
         analytics.record(
-            "sentry_app.uninstalled",
-            user_id=request.user.id,
-            organization_id=sentry_app_installation.organization_id,
-            sentry_app=sentry_app_installation.sentry_app.slug,
+            SentryAppUninstalledEvent(
+                user_id=request.user.id,
+                organization_id=sentry_app_installation.organization_id,
+                sentry_app=sentry_app_installation.sentry_app.slug,
+            )
         )
         return Response(status=204)
 
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py b/src/sentry/sentry_apps/api/endpoints/sentry_app_details.py
@@ -9,6 +9,7 @@
 from rest_framework.response import Response
 
 from sentry import analytics, audit_log, deletions, features
+from sentry.analytics.events.sentry_app_deleted import SentryAppDeletedEvent
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
@@ -29,7 +30,9 @@
 from sentry.sentry_apps.api.serializers.sentry_app import (
     SentryAppSerializer as ResponseSentryAppSerializer,
 )
-from sentry.sentry_apps.api.serializers.sentry_app import SentryAppSerializerResponse
+from sentry.sentry_apps.api.serializers.sentry_app import (
+    SentryAppSerializerResponse,
+)
 from sentry.sentry_apps.installations import SentryAppInstallationNotifier
 from sentry.sentry_apps.logic import SentryAppUpdater
 from sentry.sentry_apps.models.sentry_app import SentryApp
@@ -232,10 +235,11 @@ def delete(self, request: Request, sentry_app) -> Response:
                     data={"sentry_app": sentry_app.name},
                 )
             analytics.record(
-                "sentry_app.deleted",
-                user_id=request.user.id,
-                organization_id=sentry_app.owner_id,
-                sentry_app=sentry_app.slug,
+                SentryAppDeletedEvent(
+                    user_id=request.user.id,
+                    organization_id=sentry_app.owner_id,
+                    sentry_app=sentry_app.slug,
+                )
             )
             return Response(status=204)
 
diff --git a/src/sentry/sentry_apps/api/endpoints/sentry_internal_app_token_details.py b/src/sentry/sentry_apps/api/endpoints/sentry_internal_app_token_details.py
@@ -5,6 +5,9 @@
 from rest_framework.response import Response
 
 from sentry import analytics, deletions
+from sentry.analytics.events.sentry_app_installation_token_deleted import (
+    SentryAppInstallationTokenDeleted,
+)
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import control_silo_endpoint
@@ -63,11 +66,12 @@ def delete(self, request: Request, sentry_app, api_token) -> Response:
             deletions.exec_sync(install_token)
 
         analytics.record(
-            "sentry_app_installation_token.deleted",
-            user_id=request.user.id,
-            organization_id=sentry_app_installation.organization_id,
-            sentry_app_installation_id=sentry_app_installation.id,
-            sentry_app=sentry_app.slug,
+            SentryAppInstallationTokenDeleted(
+                user_id=request.user.id,
+                organization_id=sentry_app_installation.organization_id,
+                sentry_app_installation_id=sentry_app_installation.id,
+                sentry_app=sentry_app.slug,
+            )
         )
 
         return Response(status=204)
diff --git a/src/sentry/sentry_apps/installations.py b/src/sentry/sentry_apps/installations.py
diff --git a/src/sentry/sentry_apps/logic.py b/src/sentry/sentry_apps/logic.py
diff --git a/src/sentry/sentry_apps/tasks/sentry_apps.py b/src/sentry/sentry_apps/tasks/sentry_apps.py
diff --git a/src/sentry/sentry_apps/token_exchange/grant_exchanger.py b/src/sentry/sentry_apps/token_exchange/grant_exchanger.py
diff --git a/src/sentry/sentry_apps/token_exchange/refresher.py b/src/sentry/sentry_apps/token_exchange/refresher.py
