Merge branch 'master' into scraps/loader

Author: natemoo-re

src/sentry/api/bases/organization_events.py

@@ -831,6 +831,7 @@ def get_additional_queries(self, request: Request) -> AdditionalQueries:
             span=request.GET.getlist("spanQuery"),
             log=request.GET.getlist("logQuery"),
             metric=request.GET.getlist("metricQuery"),
+            occurrences=request.GET.getlist("occurrencesQuery"),
         )
 
 

src/sentry/api/endpoints/organization_trace_item_attributes.py

@@ -818,7 +818,7 @@ def string_autocomplete_function(self) -> list[TagValue]:
 
         values: Sequence[str] = rpc_response.values
         if self.context_definition:
-            context = self.context_definition.constructor(self.snuba_params)
+            context = self.context_definition.constructor(self.snuba_params, self.resolver)
             values = [context.value_map.get(value, value) for value in values]
 
         return [

src/sentry/api/serializers/models/organization.py

@@ -34,6 +34,7 @@
     AUTO_ENABLE_CODE_REVIEW,
     AUTO_OPEN_PRS_DEFAULT,
     CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
+    DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
     DATA_CONSENT_DEFAULT,
     DEBUG_FILES_ROLE_DEFAULT,
     DEFAULT_AUTOFIX_AUTOMATION_TUNING_DEFAULT,
@@ -511,6 +512,7 @@ class _DetailedOrganizationSerializerResponseOptional(OrganizationSerializerResp
     ingestThroughTrustedRelaysOnly: bool
     enabledConsolePlatforms: list[str]
     consoleSdkInviteQuota: int
+    dashboardsAsyncQueueParallelLimit: int
 
 
 @extend_schema_serializer(exclude_fields=["availableRoles"])
@@ -793,6 +795,11 @@ def serialize(  # type: ignore[override]
             CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
         )
 
+        context["dashboardsAsyncQueueParallelLimit"] = obj.get_option(
+            "sentry:dashboards-async-queue-parallel-limit",
+            DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
+        )
+
         if access.role is not None:
             context["role"] = access.role  # Deprecated
             context["orgRole"] = access.role
@@ -824,6 +831,7 @@ def serialize(  # type: ignore[override]
         "ingestThroughTrustedRelaysOnly",
         "enabledConsolePlatforms",
         "consoleSdkInviteQuota",
+        "dashboardsAsyncQueueParallelLimit",
         "hasGranularReplayPermissions",
         "replayAccessMembers",
     ]

src/sentry/constants.py

@@ -733,6 +733,7 @@ class InsightModules(Enum):
 SEER_AUTOMATED_RUN_STOPPING_POINT_DEFAULT = "code_changes"
 ENABLED_CONSOLE_PLATFORMS_DEFAULT: list[str] = []
 CONSOLE_SDK_INVITE_QUOTA_DEFAULT = 0
+DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT = 20
 
 INGEST_THROUGH_TRUSTED_RELAYS_ONLY_DEFAULT = "disabled"
 

src/sentry/core/endpoints/organization_details.py

@@ -46,6 +46,7 @@
     AUTO_ENABLE_CODE_REVIEW,
     AUTO_OPEN_PRS_DEFAULT,
     CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
+    DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
     DEBUG_FILES_ROLE_DEFAULT,
     DEFAULT_AUTOFIX_AUTOMATION_TUNING_DEFAULT,
     DEFAULT_CODE_REVIEW_TRIGGERS,
@@ -289,6 +290,12 @@
         int,
         CONSOLE_SDK_INVITE_QUOTA_DEFAULT,
     ),
+    (
+        "dashboardsAsyncQueueParallelLimit",
+        "sentry:dashboards-async-queue-parallel-limit",
+        int,
+        DASHBOARDS_ASYNC_QUEUE_PARALLEL_LIMIT_DEFAULT,
+    ),
 )
 
 DELETION_STATUSES = frozenset(
@@ -361,6 +368,7 @@ class OrganizationSerializer(BaseOrganizationSerializer):
         allow_empty=True,
     )
     consoleSdkInviteQuota = serializers.IntegerField(required=False, min_value=0)
+    dashboardsAsyncQueueParallelLimit = serializers.IntegerField(required=False, min_value=1)
     enableSeerEnhancedAlerts = serializers.BooleanField(required=False)
     enableSeerCoding = serializers.BooleanField(required=False)
     defaultCodingAgent = serializers.CharField(required=False, allow_null=True)

src/sentry/deletions/models/scheduleddeletion.py

@@ -33,7 +33,7 @@ class BaseScheduledDeletion(Model):
     the tasks/deletion/scheduled.py job in the future.  They are cancellable, and provide automatic, batched cascade
     in an async way for performance reasons.
 
-    Note that BOTH region AND control silos need to be able to schedule deletions of different records that will be
+    Note that BOTH cell AND control silos need to be able to schedule deletions of different records that will be
     reconciled in different places.  For that reason, the ScheduledDeletion model is split into two identical models
     representing this split.  Use the corresponding ScheduledDeletion based on the silo of the model being scheduled
     for deletion.
@@ -139,9 +139,9 @@ def get_actor(self) -> RpcUser | None:
 class ScheduledDeletion(BaseScheduledDeletion):
     """
     This model schedules deletions to be processed in control and monolith silo modes.  All historic schedule deletions
-    occur in this table.  In the future, when RegionScheduledDeletions have proliferated for the appropriate models,
-    we will allow any region models scheduled in this table to finish processing before ensuring that all models discretely
-    process in either this table or the region table.
+    occur in this table.  In the future, when CellScheduledDeletions have proliferated for the appropriate models,
+    we will allow any cell models scheduled in this table to finish processing before ensuring that all models discretely
+    process in either this table or the cell table.
     """
 
     class Meta:
@@ -165,7 +165,7 @@ class Meta:
         db_table = "sentry_regionscheduleddeletion"
 
 
-def get_regional_scheduled_deletion(mode: SiloMode) -> type[BaseScheduledDeletion]:
+def get_cell_scheduled_deletion(mode: SiloMode) -> type[BaseScheduledDeletion]:
     if mode != SiloMode.CONTROL:
         return CellScheduledDeletion
     return ScheduledDeletion

src/sentry/incidents/endpoints/serializers/workflow_engine_detector.py

@@ -257,7 +257,7 @@ def get_attrs(
                 for detector_trigger in detector_trigger_data_conditions
             ],
             condition_group__in=Subquery(workflow_dcg_ids),
-        )
+        ).select_related("condition_group")
 
         dcgas = DataConditionGroupAction.objects.filter(
             condition_group__in=[

src/sentry/integrations/base.py

@@ -27,7 +27,7 @@
     organization_service,
 )
 from sentry.pipeline.provider import PipelineProvider
-from sentry.pipeline.views.base import PipelineView
+from sentry.pipeline.views.base import ApiPipelineSteps, PipelineView
 from sentry.shared_integrations.constants import (
     ERR_INTERNAL,
     ERR_UNAUTHORIZED,
@@ -312,6 +312,14 @@ def get_pipeline_views(
         """
         raise NotImplementedError
 
+    def get_pipeline_api_steps(self) -> ApiPipelineSteps[IntegrationPipeline]:
+        """
+        Return API step objects for this provider's pipeline, or None if API
+        mode is not supported. Override to enable the pipeline API for this
+        integration.
+        """
+        return None
+
     def build_integration(self, state: Mapping[str, Any]) -> IntegrationData:
         """
         Given state captured during the setup pipeline, return a dictionary