Merge branch 'master' into ihbe/detectors-slowdb

Author: mikejihbe

bin/preprod/trigger_size_status_check

@@ -30,6 +30,7 @@ COMMIT_SHA = "db2b4ae626b458b4be651019f1a7c112406c003e"
 # Build configurations - set to None to disable a build
 BUILD_1 = {
     "app_id": "com.emerge.hackernews.android",
+    "artifact_type": PreprodArtifact.ArtifactType.AAB,
     "app_name": "HackerNews",
     "platform": "Android",
     "build_version": "1.0.3",
@@ -42,8 +43,10 @@ BUILD_1 = {
     "error_message": None,  # Only used if state is "failed"
 }
 
+# Set to None to disable BUILD_2 for single-build testing:
 BUILD_2 = {
     "app_id": "com.emerge.hackernews.ios",
+    "artifact_type": PreprodArtifact.ArtifactType.XCARCHIVE,
     "app_name": "HackerNews",
     "platform": "iOS",
     "build_version": "1.0.3",
@@ -56,9 +59,6 @@ BUILD_2 = {
     "error_message": None,  # Only used if state is "failed"
 }
 
-# Set to None to disable BUILD_2 for single-build testing:
-# BUILD_2 = None
-
 # Available states:
 # - "uploading": Artifact is still uploading (no metrics)
 # - "uploaded": Artifact uploaded but not processed yet (no metrics)
@@ -476,6 +476,7 @@ def main() -> None:
             # Create artifact data
             artifact_data = {
                 "project": project,
+                "artifact_type": build_config["artifact_type"],
                 "app_id": build_config["app_id"],
                 "app_name": build_config["app_name"],
                 "commit_comparison": commit_comparison,

migrations_lockfile.txt

@@ -39,4 +39,4 @@ tempest: 0001_squashed_0002_make_message_type_nullable
 
 uptime: 0048_delete_uptime_status_columns
 
-workflow_engine: 0097_migrate_slow_db_query_detectors
+workflow_engine: 0098_migrate_slow_db_query_detectors

pyproject.toml

@@ -83,7 +83,7 @@ dependencies = [
     "sentry-forked-email-reply-parser>=0.5.12.post1",
     "sentry-kafka-schemas>=2.1.15",
     "sentry-ophio>=1.1.3",
-    "sentry-protos>=0.4.2",
+    "sentry-protos>=0.4.3",
     "sentry-redis-tools>=0.5.0",
     "sentry-relay>=0.9.19",
     "sentry-sdk[http2]>=2.43.0",

src/sentry/api/bases/organization_events.py

@@ -13,6 +13,7 @@
 from django.utils import timezone
 from rest_framework.exceptions import ParseError, ValidationError
 from rest_framework.request import Request
+from sentry_protos.snuba.v1.trace_item_attribute_pb2 import ExtrapolationMode
 from sentry_relay.consts import SPAN_STATUS_CODE_TO_NAME
 
 from sentry import features, quotas
@@ -37,7 +38,11 @@
 from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.models.team import Team
-from sentry.search.eap.constants import SAMPLING_MODE_MAP, VALID_GRANULARITIES
+from sentry.search.eap.constants import (
+    EXTRAPOLATION_MODE_MAP,
+    SAMPLING_MODE_MAP,
+    VALID_GRANULARITIES,
+)
 from sentry.search.events.constants import DURATION_UNITS, SIZE_UNITS
 from sentry.search.events.fields import get_function_alias
 from sentry.search.events.types import SAMPLING_MODES, SnubaParams
@@ -520,6 +525,15 @@ def validate_comparison_delta(
             if retention and comparison_start < timezone.now() - timedelta(days=retention):
                 raise ValidationError("Comparison period is outside your retention window")
 
+    def get_extrapolation_mode(self, request: Request) -> ExtrapolationMode.ValueType | None:
+        requested_mode = request.GET.get("extrapolationMode", None)
+        if requested_mode is not None and requested_mode not in EXTRAPOLATION_MODE_MAP:
+            raise InvalidSearchQuery(f"Unknown extrapolation mode: {requested_mode}")
+
+        extrapolation_mode = EXTRAPOLATION_MODE_MAP[requested_mode] if requested_mode else None
+
+        return extrapolation_mode
+
     def get_event_stats_data(
         self,
         request: Request,

src/sentry/api/endpoints/organization_events.py

@@ -517,18 +517,22 @@ def get_rpc_config():
                     request.GET.get("disableAggregateExtrapolation", "0") == "1"
                 )
 
+                extrapolation_mode = self.get_extrapolation_mode(request)
+
                 if scoped_dataset == Spans:
                     return SearchResolverConfig(
                         auto_fields=True,
                         use_aggregate_conditions=use_aggregate_conditions,
                         fields_acl=FieldsACL(functions={"time_spent_percentage"}),
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
                 elif scoped_dataset == OurLogs:
                     # ourlogs doesn't have use aggregate conditions
                     return SearchResolverConfig(
                         use_aggregate_conditions=False,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
                 elif scoped_dataset == TraceMetrics:
                     # tracemetrics uses aggregate conditions
@@ -541,24 +545,28 @@ def get_rpc_config():
                         use_aggregate_conditions=use_aggregate_conditions,
                         auto_fields=True,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
                 elif scoped_dataset == ProfileFunctions:
                     # profile_functions uses aggregate conditions
                     return SearchResolverConfig(
                         use_aggregate_conditions=use_aggregate_conditions,
                         auto_fields=True,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
                 elif scoped_dataset == uptime_results.UptimeResults:
                     return SearchResolverConfig(
                         use_aggregate_conditions=use_aggregate_conditions,
                         auto_fields=True,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
                 else:
                     return SearchResolverConfig(
                         use_aggregate_conditions=use_aggregate_conditions,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,
+                        extrapolation_mode=extrapolation_mode,
                     )
 
             if snuba_params.sampling_mode == "HIGHEST_ACCURACY_FLEX_TIME":

src/sentry/api/endpoints/organization_events_stats.py

@@ -243,6 +243,8 @@ def get_rpc_config():
                 if scoped_dataset not in RPC_DATASETS:
                     raise NotImplementedError
 
+                extrapolation_mode = self.get_extrapolation_mode(request)
+
                 if scoped_dataset == TraceMetrics:
                     # tracemetrics uses aggregate conditions
                     metric_name, metric_type, metric_unit = get_trace_metric_from_request(request)
@@ -257,6 +259,7 @@ def get_rpc_config():
                             "disableAggregateExtrapolation", "0"
                         )
                         == "1",
+                        extrapolation_mode=extrapolation_mode,
                     )
 
                 return SearchResolverConfig(
@@ -266,6 +269,7 @@ def get_rpc_config():
                         "disableAggregateExtrapolation", "0"
                     )
                     == "1",
+                    extrapolation_mode=extrapolation_mode,
                 )
 
             if top_events > 0:

src/sentry/api/endpoints/organization_events_timeseries.py

@@ -222,6 +222,8 @@ def get_rpc_config():
             if dataset not in RPC_DATASETS:
                 raise NotImplementedError
 
+            extrapolation_mode = self.get_extrapolation_mode(request)
+
             if dataset == TraceMetrics:
                 # tracemetrics uses aggregate conditions
                 metric_name, metric_type, metric_unit = get_trace_metric_from_request(request)
@@ -235,6 +237,7 @@ def get_rpc_config():
                         "disableAggregateExtrapolation", "0"
                     )
                     == "1",
+                    extrapolation_mode=extrapolation_mode,
                 )
 
             return SearchResolverConfig(
@@ -244,6 +247,7 @@ def get_rpc_config():
                     "disableAggregateExtrapolation", "0"
                 )
                 == "1",
+                extrapolation_mode=extrapolation_mode,
             )
 
         if top_events > 0:

src/sentry/api/endpoints/organization_trace_item_attributes_ranked.py

@@ -10,6 +10,7 @@
     StatsType,
     TraceItemStatsRequest,
 )
+from sentry_protos.snuba.v1.trace_item_attribute_pb2 import ExtrapolationMode
 
 from sentry import features
 from sentry.api.api_owners import ApiOwner
@@ -51,9 +52,8 @@ def get(self, request: Request, organization: Organization) -> Response:
         except NoProjects:
             return Response({"rankedAttributes": []})
 
-        aggregate_extrapolation = request.GET.get("aggregateExtrapolation") == "1"
         resolver_config = SearchResolverConfig(
-            disable_aggregate_extrapolation=not aggregate_extrapolation
+            extrapolation_mode=ExtrapolationMode.EXTRAPOLATION_MODE_NONE
         )
 
         resolver = SearchResolver(