fix(eventstore): Ability to pass group_id to get_event_by_id (#26175)

Co-authored-by: Lyn Nagara <[email protected]>

Author: untitaker

src/sentry/api/endpoints/group_events_latest.py

@@ -26,7 +26,7 @@ def get(self, request, group):
             return client.get(
                 f"/projects/{event.organization.slug}/{event.project.slug}/events/{event.event_id}/",
                 request=request,
-                data={"environment": environments},
+                data={"environment": environments, "group_id": event.group_id},
             )
         except client.ApiError as e:
             return Response(e.body, status=e.status_code)

src/sentry/api/endpoints/group_events_oldest.py

@@ -27,7 +27,7 @@ def get(self, request, group):
             return client.get(
                 f"/projects/{event.organization.slug}/{event.project.slug}/events/{event.event_id}/",
                 request=request,
-                data={"environment": environments},
+                data={"environment": environments, "group_id": event.group_id},
             )
         except client.ApiError as e:
             return Response(e.body, status=e.status_code)

src/sentry/api/endpoints/group_hashes_split.py

@@ -220,7 +220,7 @@ def _get_group_filters(group: Group):
 
 def _add_hash(
     trees: List[Dict[str, Any]],
-    project_id: int,
+    group: Group,
     user,
     parent_hash: Optional[str],
     hash: str,
@@ -229,7 +229,7 @@ def _add_hash(
     last_seen,
     latest_event_id,
 ):
-    event = eventstore.get_event_by_id(project_id, latest_event_id)
+    event = eventstore.get_event_by_id(group.project_id, latest_event_id, group_id=group.id)
 
     tree = {
         "parentId": parent_hash,
@@ -397,7 +397,7 @@ def _render_trees(group: Group, user):
 
         _add_hash(
             rv,
-            group.project_id,
+            group,
             user,
             parent_hash,
             hash,

src/sentry/api/endpoints/project_event_details.py

@@ -26,7 +26,10 @@ def get(self, request, project, event_id):
         :auth: required
         """
 
-        event = eventstore.get_event_by_id(project.id, event_id)
+        group_id = request.GET.get("group_id")
+        group_id = int(group_id) if group_id else None
+
+        event = eventstore.get_event_by_id(project.id, event_id, group_id=group_id)
 
         if event is None:
             return Response({"detail": "Event not found"}, status=404)

src/sentry/eventstore/base.py

@@ -175,13 +175,16 @@ def get_unfetched_events(
         """
         raise NotImplementedError
 
-    def get_event_by_id(self, project_id, event_id):
+    def get_event_by_id(self, project_id, event_id, group_id=None):
         """
         Gets a single event given a project_id and event_id.
+        Returns None if an event cannot be found.
 
         Arguments:
         project_id (int): Project ID
         event_id (str): Event ID
+        group_id (Optional[int]): If the group ID for this event is already known, pass
+            it here to save one Snuba query.
         """
         raise NotImplementedError
 

src/sentry/eventstore/snuba/backend.py

@@ -171,11 +171,12 @@ def __get_events(
 
         return []
 
-    def get_event_by_id(self, project_id, event_id):
+    def get_event_by_id(self, project_id, event_id, group_id=None):
         """
         Get an event given a project ID and event ID
         Returns None if an event cannot be found
         """
+
         event_id = normalize_event_id(event_id)
 
         if not event_id:
@@ -187,8 +188,15 @@ def get_event_by_id(self, project_id, event_id):
         if len(event.data) == 0:
             return None
 
-        # Load group_id from Snuba if not a transaction
-        if event.get_event_type() != "transaction":
+        if group_id is not None:
+            # Set passed group_id if not a transaction
+            if event.get_event_type() == "transaction":
+                logger.warning("eventstore.passed-group-id-for-transaction")
+            else:
+                event.group_id = group_id
+
+        elif event.get_event_type() != "transaction":
+            # Load group_id from Snuba if not a transaction
             result = snuba.raw_query(
                 selected_columns=["group_id"],
                 start=event.datetime,