Aggregate spans waterfall to indexed spans (#69954)

Reopening #69016 basically
updated slightly to use options to enable/disable indexed spans

Author: shruthilayaj

src/sentry/api/endpoints/organization_spans_aggregation.py

@@ -1,7 +1,7 @@
 import hashlib
 from collections import defaultdict, namedtuple
 from collections.abc import Mapping
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Optional, TypedDict
 
 import sentry_sdk
@@ -10,7 +10,7 @@
 from rest_framework.response import Response
 from snuba_sdk import Column, Function
 
-from sentry import eventstore, features
+from sentry import eventstore, features, options
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
@@ -22,6 +22,7 @@
 from sentry.utils.snuba import raw_snql_query
 
 ALLOWED_BACKENDS = ["indexedSpans", "nodestore"]
+CUTOVER_DATE = datetime(2024, 3, 22, tzinfo=timezone.utc)
 
 EventSpan = namedtuple(
     "EventSpan",
@@ -336,31 +337,31 @@ class OrganizationSpansAggregationEndpoint(OrganizationEventsEndpointBase):
     }
 
     def get(self, request: Request, organization: Organization) -> Response:
-        if not features.has(
-            "organizations:starfish-aggregate-span-waterfall", organization, actor=request.user
-        ):
+        if not features.has("organizations:spans-first-ui", organization, actor=request.user):
             return Response(status=404)
 
         try:
             params = self.get_snuba_params(request, organization)
         except NoProjects:
             return Response(status=404)
 
+        enable_indexed_spans = options.get("indexed-spans.agg-span-waterfall.enable")
+
+        start = params["start"]
+        if start and start >= CUTOVER_DATE and enable_indexed_spans:
+            backend = "indexedSpans"
+        else:
+            backend = "nodestore"
+
         transaction = request.query_params.get("transaction", None)
         http_method = request.query_params.get("http.method", None)
         if transaction is None:
             return Response(
                 status=status.HTTP_400_BAD_REQUEST, data={"details": "Transaction not provided"}
             )
 
-        backend = request.query_params.get("backend", "nodestore")
         sentry_sdk.set_tag("aggregate_spans.backend", backend)
 
-        if backend not in ALLOWED_BACKENDS:
-            return Response(
-                status=status.HTTP_400_BAD_REQUEST, data={"details": "Backend not supported"}
-            )
-
         query = f"transaction:{transaction}"
         if http_method is not None:
             query += f" transaction.method:{http_method}"

src/sentry/options/defaults.py

@@ -2373,6 +2373,11 @@
     default=False,
     flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
 )
+register(
+    "indexed-spans.agg-span-waterfall.enable",
+    default=False,
+    flags=FLAG_PRIORITIZE_DISK | FLAG_AUTOMATOR_MODIFIABLE,
+)
 
 # Deobfuscate profiles using Symbolicator
 register(