fix(eap-alerts): Use the correct entity key (#91801)

Also updates all the integration tests to not mock snuba calls.
These tests should have caught that EntityKey.EAPSpans was
no longer an available option.
Also tests creating + updating + deleting a subscription in a
single tests since `create` uses a new RPC whereas `delete`
uses an older endpoint

Author: shruthilayaj

src/sentry/incidents/logic.py

@@ -415,7 +415,7 @@ def get_metric_issue_aggregates(
                 "incidents.get_incident_aggregates.snql.query.error",
                 tags={
                     "dataset": params.snuba_query.dataset,
-                    "entity": EntityKey.EAPSpans.value,
+                    "entity": EntityKey.EAPItemsSpan.value,
                 },
             )
             raise

src/sentry/search/events/builder/base.py

@@ -79,7 +79,7 @@
 DATASET_TO_ENTITY_MAP: Mapping[Dataset, EntityKey] = {
     Dataset.Events: EntityKey.Events,
     Dataset.Transactions: EntityKey.Transactions,
-    Dataset.EventsAnalyticsPlatform: EntityKey.EAPSpans,
+    Dataset.EventsAnalyticsPlatform: EntityKey.EAPItemsSpan,
 }
 
 

src/sentry/snuba/dataset.py

@@ -61,6 +61,7 @@ class EntityKey(Enum):
     Sessions = "sessions"
     Spans = "spans"
     EAPSpans = "eap_spans"
+    EAPItemsSpan = "eap_items_span"
     Transactions = "transactions"
     MetricsSets = "metrics_sets"
     MetricsCounters = "metrics_counters"

src/sentry/snuba/entity_subscription.py

@@ -48,7 +48,7 @@
     EntityKey.GenericMetricsGauges: "timestamp",
     EntityKey.MetricsCounters: "timestamp",
     EntityKey.MetricsSets: "timestamp",
-    EntityKey.EAPSpans: "timestamp",
+    EntityKey.EAPItemsSpan: "timestamp",
 }
 CRASH_RATE_ALERT_AGGREGATE_RE = (
     r"^percentage\([ ]*(sessions_crashed|users_crashed)[ ]*\,[ ]*(sessions|users)[ ]*\)"
@@ -621,7 +621,7 @@ def get_entity_key_from_snuba_query(
 ) -> EntityKey:
     query_dataset = Dataset(snuba_query.dataset)
     if query_dataset == Dataset.EventsAnalyticsPlatform:
-        return EntityKey.EAPSpans
+        return EntityKey.EAPItemsSpan
     entity_subscription = get_entity_subscription_from_snuba_query(
         snuba_query,
         organization_id,

src/sentry/snuba/tasks.py

@@ -148,7 +148,7 @@ def update_subscription_in_snuba(
             },
         )
         old_entity_key = (
-            EntityKey.EAPSpans
+            EntityKey.EAPItemsSpan
             if dataset == Dataset.EventsAnalyticsPlatform
             else get_entity_key_from_query_builder(
                 old_entity_subscription.build_query_builder(

tests/sentry/snuba/test_tasks.py

@@ -365,28 +365,24 @@ def test_eap_rpc_query_count(self):
             aggregate="count(span.duration)",
             dataset=Dataset.EventsAnalyticsPlatform,
         )
-        with patch("sentry.utils.snuba_rpc._snuba_pool") as rpc_pool:
-            with patch("sentry.snuba.tasks._snuba_pool") as pool:
-                resp = Mock()
-                resp.status = 202
-                resp.data = b'\n"0/a92bba96a12e11ef8b0eaeb51d7f1da4'
-                rpc_pool.urlopen.return_value = resp
-                pool.urlopen.return_value = resp
-
-                create_subscription_in_snuba(sub.id)
-                sub = QuerySubscription.objects.get(id=sub.id)
-                assert sub.status == QuerySubscription.Status.ACTIVE.value
-                assert sub.subscription_id is not None
+        create_subscription_in_snuba(sub.id)
+        sub = QuerySubscription.objects.get(id=sub.id)
+        assert sub.status == QuerySubscription.Status.ACTIVE.value
+        assert sub.subscription_id is not None
 
-                sub.status = QuerySubscription.Status.UPDATING.value
-                sub.update(
-                    status=QuerySubscription.Status.UPDATING.value,
-                    subscription_id=sub.subscription_id,
-                )
-                update_subscription_in_snuba(sub.id)
-                sub = QuerySubscription.objects.get(id=sub.id)
-                assert sub.status == QuerySubscription.Status.ACTIVE.value
-                assert sub.subscription_id is not None
+        sub.update(
+            status=QuerySubscription.Status.UPDATING.value,
+        )
+        update_subscription_in_snuba(sub.id)
+        sub = QuerySubscription.objects.get(id=sub.id)
+        assert sub.status == QuerySubscription.Status.ACTIVE.value
+        assert sub.subscription_id is not None
+
+        sub.update(
+            status=QuerySubscription.Status.DELETING.value,
+        )
+        delete_subscription_from_snuba(sub.id)
+        assert not QuerySubscription.objects.filter(id=sub.id).exists()
 
 
 class DeleteSubscriptionFromSnubaTest(BaseSnubaTaskTest):
@@ -422,19 +418,15 @@ def test_eap_rpc_query_count(self):
             aggregate="count(span.duration)",
             dataset=Dataset.EventsAnalyticsPlatform,
         )
-        with patch("sentry.snuba.tasks._snuba_pool") as pool:
-            resp = Mock()
-            resp.status = 202
-            pool.urlopen.return_value = resp
-
+        with patch.object(_snuba_pool, "urlopen", side_effect=_snuba_pool.urlopen) as urlopen:
             delete_subscription_from_snuba(sub.id)
             assert not QuerySubscription.objects.filter(id=sub.id).exists()
 
-            (method, url) = pool.urlopen.call_args[0]
+            (method, url) = urlopen.call_args[0]
             assert method == "DELETE"
             assert (
                 url
-                == f"/{Dataset.EventsAnalyticsPlatform.value}/{EntityKey.EAPSpans.value}/subscriptions/{subscription_id}"
+                == f"/{Dataset.EventsAnalyticsPlatform.value}/{EntityKey.EAPItemsSpan.value}/subscriptions/{subscription_id}"
             )
 
     def test_no_subscription_id(self):