fix(uptime): Fix value we return for event_id in the eap endpoints (#97446)

This should be a unique id per item, and should also be the
`sentry.item_id`

<!-- Describe your PR here. -->

Author: wedamija

src/sentry/search/eap/uptime_results/attributes.py

@@ -6,11 +6,21 @@
     column.public_alias: column
     for column in COMMON_COLUMNS
     + [
+        ResolvedAttribute(
+            public_alias="id",
+            internal_name="sentry.item_id",
+            search_type="string",
+        ),
         ResolvedAttribute(
             public_alias="trace",
             internal_name="sentry.trace_id",
             search_type="string",
         ),
+        ResolvedAttribute(
+            public_alias="span_id",
+            internal_name="span_id",
+            search_type="string",
+        ),
         ResolvedAttribute(
             public_alias="environment",
             internal_name="environment",

src/sentry/snuba/trace.py

@@ -354,7 +354,6 @@ def _serialize_columnar_uptime_item(
     columns_by_name = {col.internal_name: col for col in UPTIME_ATTRIBUTE_DEFINITIONS.values()}
     common_column_names = {col.internal_name for col in COMMON_COLUMNS}
 
-    guid = row_dict["guid"].val_str
     trace_id = row_dict["sentry.trace_id"].val_str
     check_status = row_dict["check_status"].val_str
     http_status_code = (
@@ -368,8 +367,10 @@ def _serialize_columnar_uptime_item(
     project_id = row_dict["sentry.project_id"].val_int
     project_slug = project_slugs[project_id]
 
+    item_id_str = row_dict["sentry.item_id"].val_str
+
     span = {
-        "event_id": guid,
+        "event_id": item_id_str,
         "project_id": project_id,
         "project_slug": project_slug,
         "transaction_id": trace_id,

src/sentry/uptime/consumers/eap_converter.py

@@ -8,6 +8,7 @@
 """
 
 import logging
+import uuid
 from collections.abc import MutableMapping
 
 from google.protobuf.timestamp_pb2 import Timestamp
@@ -25,6 +26,8 @@
 
 logger = logging.getLogger(__name__)
 
+UPTIME_NAMESPACE = uuid.UUID("f8d7a4e2-5b3c-4a9d-8e1f-3c2b1a0d9f8e")
+
 
 def _anyvalue(value: bool | str | int | float) -> AnyValue:
     if isinstance(value, bool):
@@ -98,6 +101,7 @@ def convert_uptime_request_to_trace_item(
     attributes["check_id"] = _anyvalue(result["guid"])
     attributes["request_sequence"] = _anyvalue(request_sequence)
     attributes["incident_status"] = _anyvalue(incident_status.value)
+    attributes["span_id"] = _anyvalue(result["span_id"])
 
     if request_info is not None:
         attributes["request_type"] = _anyvalue(request_info["request_type"])
@@ -162,11 +166,11 @@ def convert_uptime_result_to_trace_items(
 
     for sequence, request_info in enumerate(request_info_list):
         if sequence == 0:
-            # First request uses the span_id directly
-            item_id = result["span_id"].encode("utf-8")[:16].ljust(16, b"\x00")
+            name = result["span_id"]
         else:
-            request_id = f"{result['span_id']}_req_{sequence}"
-            item_id = request_id.encode("utf-8")[:16].ljust(16, b"\x00")
+            name = f"{result['span_id']}_req_{sequence}"
+
+        item_id = int(uuid.uuid5(UPTIME_NAMESPACE, name).hex, 16).to_bytes(16, "little")
 
         request_item = convert_uptime_request_to_trace_item(
             project, result, request_info, sequence, item_id, incident_status

tests/sentry/uptime/endpoints/test_base.py

@@ -50,6 +50,7 @@ def create_eap_uptime_result(
         response_body_size_bytes=None,
         status_reason_type=None,
         status_reason_description=None,
+        span_id=None,
     ) -> TraceItem:
         if organization is None:
             organization = self.organization
@@ -63,6 +64,8 @@ def create_eap_uptime_result(
             guid = uuid4().hex
         if subscription_id is None:
             subscription_id = f"sub-{uuid4().hex[:8]}"
+        if span_id is None:
+            span_id = uuid4().hex[:16]
 
         attributes_data = {
             "guid": guid,
@@ -75,6 +78,7 @@ def create_eap_uptime_result(
             "request_sequence": request_sequence,
             "check_duration_us": check_duration_us,
             "request_duration_us": request_duration_us,
+            "span_id": span_id,
         }
 
         if check_id is not None:
@@ -143,3 +147,8 @@ def store_uptime_results(self, uptime_results):
             files=files,
         )
         assert response.status_code == 200
+
+        for result in uptime_results:
+            # Reverse the ids here since these are stored in little endian in Clickhouse
+            # and end up reversed.
+            result.item_id = result.item_id[::-1]

tests/snuba/api/endpoints/test_organization_events_uptime_results.py

@@ -19,7 +19,7 @@ def setUp(self):
         }
 
     def build_expected_result(self, **kwargs):
-        return {"id": None, "project.name": None, **kwargs}
+        return {"project.name": None, **kwargs}
 
     @pytest.mark.querybuilder
     def test_simple_uptime_query(self) -> None:
@@ -55,10 +55,16 @@ def test_simple_uptime_query(self) -> None:
 
         assert data == [
             self.build_expected_result(
-                check_status="success", http_status_code=200, region="us-east-1"
+                id=results[0].item_id.hex(),
+                check_status="success",
+                http_status_code=200,
+                region="us-east-1",
             ),
             self.build_expected_result(
-                check_status="failure", http_status_code=500, region="us-west-2"
+                id=results[1].item_id.hex(),
+                check_status="failure",
+                http_status_code=500,
+                region="us-west-2",
             ),
         ]
 
@@ -97,8 +103,12 @@ def test_status_filter_query(self) -> None:
         data = response.data["data"]
 
         assert data == [
-            self.build_expected_result(check_status="success", http_status_code=200),
-            self.build_expected_result(check_status="success", http_status_code=201),
+            self.build_expected_result(
+                id=results[0].item_id.hex(), check_status="success", http_status_code=200
+            ),
+            self.build_expected_result(
+                id=results[2].item_id.hex(), check_status="success", http_status_code=201
+            ),
         ]
 
     @pytest.mark.querybuilder
@@ -144,13 +154,15 @@ def test_timing_fields_query(self) -> None:
 
         assert data == [
             self.build_expected_result(
+                id=results[0].item_id.hex(),
                 check_status="success",
                 check_duration_us=150000,
                 request_duration_us=125000,
                 dns_lookup_duration_us=25000,
                 tcp_connection_duration_us=15000,
             ),
             self.build_expected_result(
+                id=results[1].item_id.hex(),
                 check_status="failure",
                 check_duration_us=30000000,
                 request_duration_us=30000000,
@@ -201,6 +213,7 @@ def test_cross_level_filter_query(self) -> None:
 
         assert data == [
             self.build_expected_result(
+                id=results[1].item_id.hex(),
                 check_status="failure",
                 http_status_code=504,
                 dns_lookup_duration_us=150000,
@@ -259,6 +272,7 @@ def test_redirect_sequence_query(self) -> None:
 
         assert data == [
             self.build_expected_result(
+                id=results[1].item_id.hex(),
                 check_id=check_id,
                 request_sequence=1,
                 http_status_code=200,
@@ -311,6 +325,7 @@ def test_region_and_status_combination(self) -> None:
 
         assert data == [
             self.build_expected_result(
+                id=results[1].item_id.hex(),
                 check_status="failure",
                 region="us-east-1",
                 http_status_code=500,

tests/snuba/api/endpoints/test_organization_trace.py

@@ -34,6 +34,7 @@ def setUp(self):
     def test_basic_uptime_item_serialization(self):
         """Test basic serialization with all required fields."""
         row_dict = {
+            "sentry.item_id": ProtoAttributeValue(val_str="check-123"),
             "sentry.project_id": ProtoAttributeValue(val_int=1),
             "guid": ProtoAttributeValue(val_str="check-123"),
             "sentry.trace_id": ProtoAttributeValue(val_str="a" * 32),
@@ -78,6 +79,7 @@ def test_basic_uptime_item_serialization(self):
     def test_redirect_chain_serialization(self):
         """Test serialization of redirect chain with different URLs."""
         row_dict = {
+            "sentry.item_id": ProtoAttributeValue(val_str="check-789"),
             "sentry.project_id": ProtoAttributeValue(val_int=1),
             "guid": ProtoAttributeValue(val_str="check-789"),
             "sentry.trace_id": ProtoAttributeValue(val_str="b" * 32),
@@ -101,6 +103,7 @@ def test_redirect_chain_serialization(self):
     def test_null_and_missing_fields(self):
         """Test handling of null and missing optional fields."""
         row_dict = {
+            "sentry.item_id": ProtoAttributeValue(val_str="check-null"),
             "sentry.project_id": ProtoAttributeValue(val_int=1),
             "guid": ProtoAttributeValue(val_str="check-null"),
             "sentry.trace_id": ProtoAttributeValue(val_str="c" * 32),
@@ -514,6 +517,7 @@ def _trace_item_to_api_span(self, trace_item: TraceItem, children=None) -> dict:
             elif attr_value.HasField("bool_value"):
                 row_dict[attr_name] = ProtoAttributeValue(val_bool=attr_value.bool_value)
 
+        row_dict["sentry.item_id"] = ProtoAttributeValue(val_str=trace_item.item_id.hex())
         row_dict["sentry.project_id"] = ProtoAttributeValue(val_int=trace_item.project_id)
         row_dict["sentry.organization_id"] = ProtoAttributeValue(val_int=trace_item.organization_id)
         row_dict["sentry.trace_id"] = ProtoAttributeValue(val_str=trace_item.trace_id)
@@ -702,76 +706,3 @@ def test_uptime_root_tree_without_orphans(self):
         data = response.data
 
         self.assert_expected_results(data, [uptime_result], expected_children_ids=["root"])
-
-    def test_uptime_root_tree_multiple_checks(self):
-        """Test handling of multiple uptime checks with only the last one becoming parent"""
-        self.load_trace(is_eap=True)
-
-        self.create_event(
-            trace_id=self.trace_id,
-            transaction="/transaction/orphan",
-            spans=[],
-            project_id=self.project.id,
-            parent_span_id=uuid4().hex[:16],
-            milliseconds=500,
-            is_eap=True,
-        )
-        check1_result = self._create_uptime_result_with_original_url(
-            organization=self.organization,
-            project=self.project,
-            trace_id=self.trace_id,
-            guid="check-111",
-            check_status="success",
-            http_status_code=200,
-            request_sequence=0,
-            request_url="https://first.com",
-            scheduled_check_time=self.day_ago,
-            check_duration_us=100000,
-        )
-
-        check2_redirect = self._create_uptime_result_with_original_url(
-            organization=self.organization,
-            project=self.project,
-            trace_id=self.trace_id,
-            guid="check-222",
-            check_status="success",
-            http_status_code=301,
-            request_sequence=0,
-            request_url="https://second.com",
-            scheduled_check_time=self.day_ago,
-            check_duration_us=200000,
-        )
-
-        check2_final = self._create_uptime_result_with_original_url(
-            organization=self.organization,
-            project=self.project,
-            trace_id=self.trace_id,
-            guid="check-222",
-            check_status="success",
-            http_status_code=200,
-            request_sequence=1,
-            request_url="https://www.second.com",
-            scheduled_check_time=self.day_ago,
-            check_duration_us=300000,
-        )
-
-        features = self.FEATURES + [
-            "organizations:uptime-eap-enabled",
-            "organizations:uptime-eap-uptime-results-query",
-        ]
-
-        self.store_uptime_results([check1_result, check2_redirect, check2_final])
-
-        with self.feature(features):
-            response = self.client_get(
-                data={"timestamp": self.day_ago, "include_uptime": "1"},
-            )
-
-        assert response.status_code == 200, response.content
-        data = response.data
-
-        self.assert_expected_results(
-            data,
-            [check1_result, check2_redirect, check2_final],
-            expected_children_ids=["/transaction/orphan", "root"],
-        )