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

src/sentry/analytics/event.py

@@ -64,7 +64,7 @@ def wrapper(cls: type[Event]) -> type[Event]:
         # set the Event subclass `type` attribute, if it is set to anything
         if isinstance(event_name_or_class, str):
             cls.type = event_name_or_class
-        return cast(type[Event], dataclass(kw_only=True)(cls))
+        return cast(type[Event], dataclass(kw_only=True, eq=False)(cls))
 
     # for using without parenthesis, wrap the passed class
     if isinstance(event_name_or_class, type) and issubclass(event_name_or_class, Event):
@@ -75,7 +75,7 @@ def wrapper(cls: type[Event]) -> type[Event]:
 
 
 # unfortunately we cannot directly use `eventclass` here, as it is making a typecheck to Event
-@dataclass(kw_only=True)
+@dataclass(kw_only=True, eq=False)
 class Event:
     """
     Base class for custom analytics Events.
@@ -113,10 +113,28 @@ def from_instance(cls, instance: Any, **kwargs: Any) -> Self:
             **{
                 f.name: kwargs.get(f.name, getattr(instance, f.name, None))
                 for f in fields(cls)
-                if f.name not in ("type", "uuid_", "datetime_")
+                if f.name
+                not in (
+                    "type",
+                    "uuid_",
+                    "datetime_",
+                    "data",  # TODO: remove this data field once migrated
+                )
             }
         )
 
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, Event):
+            return False
+
+        self_values = self.serialize()
+        other_values = other.serialize()
+
+        self_values.pop("uuid")
+        other_values.pop("uuid")
+
+        return self_values == other_values
+
 
 def serialize_event(event: Event) -> dict[str, Any]:
     # TODO: this is the "old-style" attributes based serializer. Once all events are migrated to the new style,

src/sentry/analytics/events/eventuser_snuba_for_projects.py

@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("eventuser_snuba.for_projects")
 class EventUserSnubaForProjects(analytics.Event):
-    type = "eventuser_snuba.for_projects"
-
-    attributes = (
-        analytics.Attribute("project_ids", type=list),
-        analytics.Attribute("total_tries", type=int),
-        analytics.Attribute("total_rows_returned", required=True, type=int),
-        analytics.Attribute("total_time_ms", type=int),
-    )
+    project_ids: list[int]
+    total_tries: int
+    total_rows_returned: int
+    total_time_ms: int
 
 
 analytics.register(EventUserSnubaForProjects)

src/sentry/analytics/events/eventuser_snuba_query.py

@@ -1,17 +1,14 @@
 from sentry import analytics
 
 
+@analytics.eventclass("eventuser_snuba.query")
 class EventUserSnubaQuery(analytics.Event):
-    type = "eventuser_snuba.query"
-
-    attributes = (
-        analytics.Attribute("project_ids", type=list),
-        analytics.Attribute("query"),
-        analytics.Attribute("query_try", type=int),
-        analytics.Attribute("count_rows_returned", required=True, type=int),
-        analytics.Attribute("count_rows_filtered", required=True, type=int),
-        analytics.Attribute("query_time_ms", type=int),
-    )
+    project_ids: list[int]
+    query: str
+    query_try: int
+    count_rows_returned: int
+    count_rows_filtered: int
+    query_time_ms: int
 
 
 analytics.register(EventUserSnubaQuery)

src/sentry/analytics/events/grouping_parameterization_experiment.py

@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("grouping.experiments.parameterization")
 class GroupingParameterizationExperiment(analytics.Event):
-    type = "grouping.experiments.parameterization"
-
-    attributes = (
-        analytics.Attribute("experiment_name"),
-        analytics.Attribute("project_id"),
-        analytics.Attribute("event_id"),
-    )
+    experiment_name: str
+    project_id: str
+    event_id: str
 
 
 analytics.register(GroupingParameterizationExperiment)

src/sentry/analytics/events/notifications_settings_updated.py

@@ -1,14 +1,11 @@
 from sentry import analytics
 
 
+@analytics.eventclass("notifications.settings_updated")
 class NotificationSettingsUpdated(analytics.Event):
-    type = "notifications.settings_updated"
-
-    attributes = (
-        analytics.Attribute("target_type"),
-        analytics.Attribute("actor_id", required=False),
-        analytics.Attribute("id"),
-    )
+    target_type: str
+    actor_id: str | None = None
+    id: str
 
 
 analytics.register(NotificationSettingsUpdated)

src/sentry/mail/analytics.py

@@ -2,21 +2,18 @@
 
 
 # TODO: should have same base class as SlackIntegrationNotificationSent
+@analytics.eventclass("integrations.email.notification_sent")
 class EmailNotificationSent(analytics.Event):
-    type = "integrations.email.notification_sent"
-
-    attributes = (
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("project_id", required=False),
-        analytics.Attribute("category"),
-        analytics.Attribute("actor_id", required=False),
-        analytics.Attribute("user_id", required=False),
-        analytics.Attribute("group_id", required=False),
-        analytics.Attribute("id"),
-        analytics.Attribute("actor_type"),
-        analytics.Attribute("notification_uuid"),
-        analytics.Attribute("alert_id", required=False),
-    )
+    organization_id: str
+    project_id: str | None = None
+    category: str
+    actor_id: str | None = None
+    user_id: str | None = None
+    group_id: str | None = None
+    id: str
+    actor_type: str
+    notification_uuid: str
+    alert_id: str | None = None
 
 
 analytics.register(EmailNotificationSent)

src/sentry/utils/eventuser.py

@@ -25,6 +25,8 @@
 )
 
 from sentry import analytics
+from sentry.analytics.events.eventuser_snuba_for_projects import EventUserSnubaForProjects
+from sentry.analytics.events.eventuser_snuba_query import EventUserSnubaQuery
 from sentry.eventstore.models import Event, GroupEvent
 from sentry.models.project import Project
 from sentry.snuba.dataset import Dataset, EntityKey
@@ -233,13 +235,14 @@ def for_projects(
             query_end_time = time.time()
 
             analytics.record(
-                "eventuser_snuba.query",
-                project_ids=[p.id for p in projects],
-                query=query.print(),
-                query_try=tries,
-                count_rows_returned=len(data_results),
-                count_rows_filtered=len(data_results) - len(unique_event_users),
-                query_time_ms=int((query_end_time - query_start_time) * 1000),
+                EventUserSnubaQuery(
+                    project_ids=[p.id for p in projects],
+                    query=query.print(),
+                    query_try=tries,
+                    count_rows_returned=len(data_results),
+                    count_rows_filtered=len(data_results) - len(unique_event_users),
+                    query_time_ms=int((query_end_time - query_start_time) * 1000),
+                )
             )
             tries += 1
             if (
@@ -252,11 +255,12 @@ def for_projects(
 
         end_time = time.time()
         analytics.record(
-            "eventuser_snuba.for_projects",
-            project_ids=[p.id for p in projects],
-            total_tries=tries,
-            total_rows_returned=len(full_results),
-            total_time_ms=int((end_time - start_time) * 1000),
+            EventUserSnubaForProjects(
+                project_ids=[p.id for p in projects],
+                total_tries=tries,
+                total_rows_returned=len(full_results),
+                total_time_ms=int((end_time - start_time) * 1000),
+            )
         )
 
         if result_limit:

tests/sentry/analytics/test_event.py

@@ -53,6 +53,21 @@ def test_simple(self, mock_uuid1):
             "uuid": b"AAEC",
         }
 
+    def test_equality_no_uuid_mock(self):
+        a = ExampleEvent(
+            id="1",  # type: ignore[arg-type]
+            map={"key": "value"},
+            optional=False,
+        )
+        a.datetime_ = datetime(2001, 4, 18, tzinfo=timezone.utc)
+        b = ExampleEvent(
+            id="1",  # type: ignore[arg-type]
+            map={"key": "value"},
+            optional=False,
+        )
+        b.datetime_ = datetime(2001, 4, 18, tzinfo=timezone.utc)
+        assert a == b
+
     @patch("sentry.analytics.event.uuid1")
     def test_simple_old_style(self, mock_uuid1):
         mock_uuid1.return_value = self.get_mock_uuid()