Merge branch 'master' into shaunkaasten/dain-1281-customer-unable-to-create-dashboards-from-widget-library

Author: skaasten

.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

pyproject.toml

@@ -682,6 +682,7 @@ module = [
   "sentry.tasks.beacon",
   "sentry.tasks.codeowners.*",
   "sentry.tasks.commit_context",
+  "sentry.tasks.commits",
   "sentry.tasks.on_demand_metrics",
   "sentry.tasks.post_process",
   "sentry.tasks.reprocessing2",

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/db/router.py

@@ -76,6 +76,8 @@ class SiloRouter:
         "sentry_alertruleactivations": SiloMode.CELL,
         "sentry_alertruleactivationcondition": SiloMode.CELL,
         "sentry_code_review_event": SiloMode.CELL,
+        "sentry_customdynamicsamplingrule": SiloMode.CELL,
+        "sentry_customdynamicsamplingruleproject": SiloMode.CELL,
         "sentry_dashboardwidgetsnapshot": SiloMode.CELL,
         "sentry_datasecrecywaiver": SiloMode.CELL,
         "sentry_incidentseen": SiloMode.CELL,

src/sentry/features/temporary.py

@@ -60,8 +60,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:code-review-experiments-enabled", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable continuous profiling
     manager.add("organizations:continuous-profiling", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enabled for beta orgs
-    manager.add("organizations:continuous-profiling-beta", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
     # Enabled ui for beta orgs
     manager.add("organizations:continuous-profiling-beta-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Display profile durations on the stats page
@@ -138,6 +136,7 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:integrations-claude-code", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:integrations-cursor", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:integrations-github-copilot-agent", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    manager.add("organizations:integrations-github-fetch-commits-compare-cache", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:integrations-github-platform-detection", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     manager.add("organizations:github-repo-auto-sync", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     manager.add("organizations:github-repo-auto-sync-apply", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)