Merge branch 'master' into feat/oauth-device-endpoints

Author: dcramer

.github/CODEOWNERS

@@ -221,6 +221,7 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 /src/sentry/organizations/                               @getsentry/hybrid-cloud
 /tests/sentry/hybridcloud/                               @getsentry/hybrid-cloud
 /tests/sentry/silo/                                      @getsentry/hybrid-cloud
+/tests/sentry/models/test_projectkeymapping.py           @getsentry/hybrid-cloud
 /.agents/skills/hybrid-cloud-*                           @getsentry/hybrid-cloud
 ## End of Hybrid Cloud
 
@@ -570,7 +571,9 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/dynamic_sampling/                                                    @getsentry/telemetry-experience
 /tests/sentry/dynamic_sampling/                                                  @getsentry/telemetry-experience
 /src/sentry/release_health/metrics_sessions_v2.py                                @getsentry/telemetry-experience
+/src/sentry/release_health/eap_sessions_rollout.py                               @getsentry/telemetry-experience
 /tests/sentry/release_health/test_metrics_sessions_v2.py                         @getsentry/telemetry-experience
+/tests/sentry/release_health/test_eap_sessions_rollout.py                        @getsentry/telemetry-experience
 /src/sentry/utils/platform_categories.py                                         @getsentry/telemetry-experience
 /src/sentry/sentry_metrics/querying/                                             @getsentry/telemetry-experience
 /tests/sentry/sentry_metrics/querying/                                           @getsentry/telemetry-experience
@@ -793,6 +796,8 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /src/sentry/preprod/                                   @getsentry/emerge-tools
 /static/app/views/preprod/                             @getsentry/emerge-tools
 /tests/sentry/preprod/                                 @getsentry/emerge-tools
+/static/app/components/events/eventInsightDiff.tsx     @getsentry/emerge-tools
+/bin/preprod/                                          @getsentry/emerge-tools
 # End of preprod
 
 ## Frontend Platform (keep last as we want highest specificity)
@@ -861,6 +866,10 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/scm/                                                      @getsentry/scm
 ## End of SCM
 
+## SCM Frontend
+/static/app/components/repositories                                   @getsentry/coding-workflows-sentry-frontend @getsentry/scm
+## End of SCM Frontend
+
 # End of Coding Workflows
 
 # Conduit

.github/codeowners-coverage-baseline.txt

@@ -46,10 +46,6 @@ bin/load-integration-data
 bin/load-mocks
 bin/merge-catalogs
 bin/model-dependency-graphviz
-bin/preprod/test_pr_details
-bin/preprod/trigger_pr_comment
-bin/preprod/trigger_size_status_check
-bin/preprod/trigger_snapshot_status_check
 bin/run-model-tests
 bin/save-integration-data
 bin/send_metrics.py
@@ -756,8 +752,6 @@ static/app/components/hook.spec.tsx
 static/app/components/hook.tsx
 static/app/components/hookOrDefault.spec.tsx
 static/app/components/hookOrDefault.tsx
-static/app/components/hotkeysLabel.spec.tsx
-static/app/components/hotkeysLabel.tsx
 static/app/components/hovercard.spec.tsx
 static/app/components/hovercard.tsx
 static/app/components/iconCircledNumber.tsx
@@ -1507,6 +1501,8 @@ static/gsAdmin/components/addGiftBudgetAction.tsx
 static/gsAdmin/components/addGiftEventsAction.spec.tsx
 static/gsAdmin/components/addGiftEventsAction.tsx
 static/gsAdmin/components/addOrRemoveOrgModal.tsx
+static/gsAdmin/components/addToStartupProgramAction.spec.tsx
+static/gsAdmin/components/addToStartupProgramAction.tsx
 static/gsAdmin/components/adminConfirmationModal.spec.tsx
 static/gsAdmin/components/adminConfirmationModal.tsx
 static/gsAdmin/components/beacons/beaconCheckins.tsx

.github/workflows/frontend-snapshots.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Install sentry-cli
         if: ${{ !cancelled() }}
-        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.3 sh
+        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.4 sh
 
       - name: Upload snapshots
         id: upload

bin/preprod/upload_snapshots

@@ -0,0 +1,42 @@
+#!/bin/bash
+set -euo pipefail
+
+SENTRY_URL="http://127.0.0.1:8000"
+AUTH_TOKEN="${AUTH_TOKEN:?AUTH_TOKEN environment variable is required}"
+ORG_SLUG="sentry"
+PROJECT_SLUG="internal"
+APP_ID="test-app"
+
+BEFORE_DIR="${BEFORE_DIR:-$HOME/Downloads/base_snapshots_export_small}"
+AFTER_DIR="${AFTER_DIR:-$HOME/Downloads/head_snapshots_export_small}"
+
+TOP_ARGS=(
+  --auth-token "$AUTH_TOKEN"
+  --url "$SENTRY_URL"
+)
+
+SUB_ARGS=(
+  -o "$ORG_SLUG"
+  -p "$PROJECT_SLUG"
+  --app-id "$APP_ID"
+  --no-git-metadata
+  --vcs-provider github
+  --head-repo-name "testing-repo"
+)
+
+echo "=== Uploading: Baseline (main) ==="
+sentry-cli "${TOP_ARGS[@]}" build snapshots "$BEFORE_DIR" \
+  "${SUB_ARGS[@]}" \
+  --head-sha "1111111111111111111111111111111111111111" \
+  --head-ref main
+
+echo ""
+echo "=== Uploading: PR Branch (testing-branch) ==="
+sentry-cli "${TOP_ARGS[@]}" build snapshots "$AFTER_DIR" \
+  "${SUB_ARGS[@]}" \
+  --head-sha "2222222222222222222222222222222222222222" \
+  --base-sha "1111111111111111111111111111111111111111" \
+  --base-repo-name "testing-repo" \
+  --head-ref "testing-branch" \
+  --base-ref main \
+  --pr-number 1

migrations_lockfile.txt

@@ -31,7 +31,7 @@ replays: 0007_organizationmember_replay_access
 
 seer: 0005_delete_seerorganizationsettings
 
-sentry: 1056_add_explorer_autofix_fields
+sentry: 1057_drop_legacy_alert_rule_tables
 
 social_auth: 0003_social_auth_json_field
 

pyproject.toml

@@ -86,7 +86,7 @@ dependencies = [
   "sentry-forked-email-reply-parser>=0.5.12.post1",
   "sentry-kafka-schemas>=2.1.27",
   "sentry-ophio>=1.1.3",
-  "sentry-protos>=0.8.7",
+  "sentry-protos>=0.8.8",
   "sentry-redis-tools>=0.5.0",
   "sentry-relay>=0.9.25",
   "sentry-sdk[http2]>=2.47.0",

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/backup/imports.py

@@ -36,7 +36,7 @@
 )
 from sentry.backup.services.import_export.service import ImportExportService
 from sentry.db.models.paranoia import ParanoidModel
-from sentry.hybridcloud.models.outbox import CellOutbox, OutboxFlushError
+from sentry.hybridcloud.models.outbox import CellOutbox, ControlOutbox, OutboxFlushError
 from sentry.hybridcloud.outbox.category import OutboxCategory, OutboxScope
 from sentry.models.importchunk import ControlImportChunkReplica
 from sentry.models.orgauthtoken import OrgAuthToken
@@ -70,7 +70,9 @@ def __init__(self, context: RpcImportError) -> None:
 def _clear_model_tables_before_import():
     reversed = reversed_dependencies()
 
-    for model in reversed:
+    # Outbox models are cleared last: some models (e.g. ProjectKey) use pre_delete signals
+    # that write outbox entries even during queryset-level deletes.
+    for model in reversed + [CellOutbox, ControlOutbox]:
         using = router.db_for_write(model)
         manager = model.with_deleted if issubclass(model, ParanoidModel) else model.objects
         manager.all().delete()