fix(replay): post replay views with timestamp = finished_at (#69079)

Author: aliu39

src/sentry/replays/endpoints/project_replay_viewed_by.py

@@ -1,4 +1,5 @@
 import uuid
+from datetime import datetime
 from typing import Any, TypedDict
 
 from drf_spectacular.utils import extend_schema
@@ -17,6 +18,7 @@
 from sentry.models.project import Project
 from sentry.replays.query import query_replay_viewed_by_ids
 from sentry.replays.usecases.events import publish_replay_event, viewed_event
+from sentry.replays.usecases.query import execute_query, make_full_aggregation_query
 from sentry.services.hybrid_cloud.user.serial import serialize_generic_user
 from sentry.services.hybrid_cloud.user.service import user_service
 
@@ -103,9 +105,33 @@ def post(self, request: Request, project: Project, replay_id: str) -> Response:
         except ValueError:
             return Response(status=404)
 
-        message = viewed_event(project.id, replay_id, request.user.id)
-        publish_replay_event(message, is_async=False)
+        # make a query to avoid overwriting the `finished_at` column
+        filter_params = self.get_filter_params(request, project, date_filter_optional=False)
+        finished_at_response = execute_query(
+            query=make_full_aggregation_query(
+                fields=["finished_at"],
+                replay_ids=[replay_id],
+                project_ids=[project.id],
+                period_start=filter_params["start"],
+                period_end=filter_params["end"],
+                request_user_id=request.user.id,
+            ),
+            tenant_id={"organization_id": project.organization.id} if project.organization else {},
+            referrer="replays.endpoints.viewed_by_post",
+        )["data"]
+        if not finished_at_response:
+            return Response(status=404)
 
+        finished_at = finished_at_response[0]["finished_at"]
+        finished_at_ts = datetime.fromisoformat(finished_at).timestamp()
+
+        message = viewed_event(
+            project.id,
+            replay_id,
+            request.user.id,
+            finished_at_ts,
+        )
+        publish_replay_event(message, is_async=False)
         return Response(status=204)
 
 

src/sentry/replays/usecases/events.py

@@ -28,14 +28,14 @@ def archive_event(project_id: int, replay_id: str) -> str:
     )
 
 
-def viewed_event(project_id: int, replay_id: str, viewed_by_id: int) -> str:
+def viewed_event(project_id: int, replay_id: str, viewed_by_id: int, timestamp: float) -> str:
     """Create a "replay_viewed" message."""
     return _replay_event(
         project_id=project_id,
         replay_id=replay_id,
         event={
             "type": "replay_viewed",
-            "timestamp": time.time(),
+            "timestamp": timestamp,
             "viewed_by_id": viewed_by_id,
         },
     )

tests/sentry/replays/test_project_replay_viewed_by.py

@@ -132,10 +132,23 @@ def test_get_replay_viewed_by_feature_flag_disabled(self):
     @patch("sentry.replays.endpoints.project_replay_viewed_by.publish_replay_event")
     def test_post_replay_viewed_by(self, publish_replay_event):
         with self.feature(REPLAYS_FEATURES):
+            finished_at_dt = datetime.datetime.now() - datetime.timedelta(seconds=20)
+            self.store_replays(mock_replay(finished_at_dt, self.project.id, self.replay_id))
+
             response = self.client.post(self.url, data="")
             assert response.status_code == 204
             assert publish_replay_event.called
 
             replay_event = json.loads(publish_replay_event.call_args[0][0])
             payload = json.loads(bytes(replay_event["payload"]))
             assert payload["type"] == "replay_viewed"
+            assert payload["viewed_by_id"] == self.user.id
+            assert isinstance(payload["timestamp"], float)
+
+            # time should match the last replay segment with second-level precision
+            assert int(payload["timestamp"]) == int(finished_at_dt.timestamp())
+
+    def test_post_replay_viewed_by_not_exist(self):
+        with self.feature(REPLAYS_FEATURES):
+            response = self.client.post(self.url, data="")
+            assert response.status_code == 404

tests/sentry/replays/unit/usecases/test_events.py

@@ -1,3 +1,5 @@
+import time
+
 from sentry.replays.usecases.events import archive_event, viewed_event
 from sentry.utils import json
 
@@ -28,7 +30,8 @@ def test_archive_event():
 
 def test_viewed_event():
     """Test "replay_viewed" event generator."""
-    event = viewed_event(1, "2", 3)
+    ts = time.time()
+    event = viewed_event(1, "2", 3, ts)
 
     parsed_event = json.loads(event)
     assert parsed_event["type"] == "replay_event"
@@ -40,4 +43,4 @@ def test_viewed_event():
     payload = json.loads(bytes(parsed_event["payload"]))
     assert payload["type"] == "replay_viewed"
     assert payload["viewed_by_id"] == 3
-    assert isinstance(payload["timestamp"], float)
+    assert payload["timestamp"] == ts