Merge branch 'master' into fix/flaky-results-search-query-builder-spec-v2

Author: JoshuaKGoldberg

.github/CODEOWNERS

@@ -832,6 +832,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/core/                          @getsentry/design-engineering
 /static/app/components/dnd/                           @getsentry/design-engineering
 /static/app/components/pageFilters/                   @getsentry/design-engineering
+/static/app/components/backendJsonFormAdapter/        @getsentry/design-engineering
 /static/app/icons/                                    @getsentry/design-engineering
 /static/app/stories/                                  @getsentry/design-engineering
 /static/app/components/commandPalette/                @getsentry/design-engineering

eslint.config.ts

@@ -609,6 +609,7 @@ export default typescript.config([
           '@typescript-eslint/no-for-in-array': 'error',
           '@typescript-eslint/no-unnecessary-template-expression': 'error',
           '@typescript-eslint/no-unnecessary-type-assertion': 'error',
+          '@typescript-eslint/no-unnecessary-type-parameters': 'error',
           '@typescript-eslint/switch-exhaustiveness-check': [
             'error',
             {considerDefaultExhaustiveForUnions: true},

migrations_lockfile.txt

@@ -31,12 +31,12 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1064_eventattachment_date_expires_now
+sentry: 1065_delete_customdynamicsamplingrule
 
 social_auth: 0003_social_auth_json_field
 
 tempest: 0003_use_encrypted_char_field
 
 uptime: 0055_backfill_2xx_status_assertion
 
-workflow_engine: 0111_add_workflowfirehistory_date_added_index
+workflow_engine: 0112_drop_redundant_error_detector_workflows

src/sentry/analytics/events/autofix_events.py

@@ -72,6 +72,7 @@ class AiAutofixPrCreatedCompletedEvent(AiAutofixPhaseEvent):
 @analytics.eventclass("ai.autofix.agent_handoff")
 class AiAutofixAgentHandoffEvent(AiAutofixPhaseEvent):
     coding_agent: str | None
+    initiator: str | None = None
 
 
 analytics.register(AiAutofixRootCauseStartedEvent)

src/sentry/api/bases/rule.py

@@ -62,7 +62,9 @@ def convert_args(
         if use_workflow_engine:
             try:
                 arw = AlertRuleWorkflow.objects.get(
-                    rule_id=rule_id, workflow__organization=project.organization
+                    rule_id=rule_id,
+                    workflow__organization=project.organization,
+                    workflow__status=ObjectStatus.ACTIVE,
                 )
                 kwargs["rule"] = arw.workflow
             except AlertRuleWorkflow.DoesNotExist:

src/sentry/api/endpoints/organization_events_stats.py

@@ -53,6 +53,7 @@
     Referrer.API_ENDPOINT_REGRESSION_ALERT_CHARTCUTERIE.value,
     Referrer.API_FUNCTION_REGRESSION_ALERT_CHARTCUTERIE.value,
     Referrer.DISCOVER_SLACK_UNFURL.value,
+    Referrer.EXPLORE_SLACK_UNFURL.value,
 ]
 
 logger = logging.getLogger(__name__)

src/sentry/api/endpoints/project_rule_details.py

@@ -451,6 +451,10 @@ def delete(self, request: Request, project: Project, rule: Rule | Workflow) -> R
                     rule=rule, user_id=request.user.id, type=RuleActivityType.DELETED.value
                 )
                 scheduled = CellScheduledDeletion.schedule(rule, days=0, actor=request.user)
+                # The Rule's scheduled deletion should take care of the workflow, but
+                # we mark it pending immediately so we don't return it while the deletion is in progress.
+                for workflow in Workflow.objects.filter(alertruleworkflow__rule_id=rule.id):
+                    workflow.update(status=ObjectStatus.PENDING_DELETION)
 
             self.create_audit_entry(
                 request=request,

src/sentry/api/endpoints/user_organizationintegrations.py

@@ -53,6 +53,6 @@ def get(self, request: Request, user) -> Response:
         return self.paginate(
             request=request,
             queryset=queryset,
-            on_results=lambda x: serialize(x, request.user),
+            on_results=lambda x: [item for item in serialize(x, request.user) if item is not None],
             paginator_cls=OffsetPaginator,
         )

src/sentry/conf/server.py

@@ -2817,7 +2817,7 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 BETA_GROUPING_CONFIG = ""
 
 # How long the migration phase for grouping lasts
-SENTRY_GROUPING_CONFIG_TRANSITION_DURATION = 30 * 24 * 3600  # 30 days
+SENTRY_GROUPING_CONFIG_TRANSITION_DURATION = 90 * 24 * 3600  # 90 days, until groups age out
 
 SENTRY_USE_GRANIAN = True
 

src/sentry/dashboards/models/generate_dashboard_artifact.py

@@ -38,7 +38,7 @@
 Intervals = Literal["5m", "15m", "30m", "1h", "4h", "12h", "24h"]
 
 # Blocklist for frequently hallucinated functions or functions we want to avoid using
-FUNCTION_BLOCKLIST: set[str] = {"spm", "apdex", "http_error_count"}
+FUNCTION_BLOCKLIST: set[str] = {"spm", "apdex", "http_error_count", "http_error_count_percent"}
 
 
 class GeneratedWidgetQuery(BaseModel):