Merge branch 'master' into scttcper/feat-prefetch-supergroups

Author: scttcper

.agents/skills/hybrid-cloud-outboxes/references/debugging.md

@@ -6,7 +6,7 @@ Understanding the pipeline helps locate where things break:
 
 1. **Model save/delete** writes outbox row inside `outbox_context(transaction.atomic(...))`
 2. **On commit**: if `flush=True`, `drain_shard()` runs synchronously for that shard
-3. **Periodic task**: `enqueue_outbox_jobs` (region) / `enqueue_outbox_jobs_control` (control) runs on a cron schedule
+3. **Periodic task**: `enqueue_outbox_jobs` (cell) / `enqueue_outbox_jobs_control` (control) runs on a cron schedule
 4. **`schedule_batch`** partitions the ID range into `CONCURRENCY=5` chunks and spawns `drain_outbox_shards` tasks
 5. **`drain_outbox_shards`** calls `process_outbox_batch` which:
    - Calls `find_scheduled_shards(lo, hi)` to find shards with `scheduled_for <= now`
@@ -71,9 +71,9 @@ Both tables share these columns:
 
 `sentry_controloutbox` has one additional column:
 
-| Column        | Type    | Description                   |
-| ------------- | ------- | ----------------------------- |
-| `region_name` | varchar | Target region for this outbox |
+| Column        | Type    | Description                 |
+| ------------- | ------- | --------------------------- |
+| `region_name` | varchar | Target cell for this outbox |
 
 ### Resolving Enum Values
 
@@ -92,10 +92,10 @@ When generating SQL for a developer, **print the query to the terminal** so they
 2. Comments mapping integer values to their enum names
 3. Reasonable `LIMIT` clauses to avoid overwhelming output
 
-#### Find stuck shards (region)
+#### Find stuck shards (cell)
 
 ```sql
--- Find region outbox shards stuck in backoff
+-- Find cell outbox shards stuck in backoff
 -- shard_scope: 0 = ORGANIZATION_SCOPE, 1 = USER_SCOPE, etc.
 -- category: see OutboxCategory enum in category.py
 SELECT
@@ -199,7 +199,7 @@ LIMIT 10;
 
 When a developer asks you to debug stuck outboxes:
 
-1. **Determine the table**: Ask which model or direction is involved, or infer from context. Use `sentry_regionoutbox` for region models, `sentry_controloutbox` for control models.
+1. **Determine the table**: Ask which model or direction is involved, or infer from context. Use `sentry_regionoutbox` for cell models, `sentry_controloutbox` for control models.
 2. **Resolve enum values**: Read `src/sentry/hybridcloud/outbox/category.py` to get the integer values for the relevant `OutboxCategory` and `OutboxScope`.
 3. **Construct the query**: Use the templates above, substituting resolved values. Always add comments with the human-readable enum names.
 4. **Print to terminal**: Output the final SQL so the developer can copy it. Do NOT attempt to run it — you don't have production database access.
@@ -212,10 +212,10 @@ When a developer asks you to debug stuck outboxes:
 The `should_skip_shard()` method checks these options:
 
 ```python
-# Skip specific organization shards (region outboxes)
+# Skip specific organization shards (cell outboxes)
 "hybrid_cloud.authentication.disabled_organization_shards": [org_id_1, org_id_2]
 
-# Skip specific user shards (region/control outboxes)
+# Skip specific user shards (cell/control outboxes)
 "hybrid_cloud.authentication.disabled_user_shards": [user_id_1, user_id_2]
 ```
 
@@ -252,7 +252,7 @@ For local debugging or in a Django shell:
 ```python
 from sentry.hybridcloud.models.outbox import CellOutbox, ControlOutbox
 
-# Top 10 deepest region shards
+# Top 10 deepest cell shards
 for shard in CellOutbox.get_shard_depths_descending(limit=10):
     print(f"Scope={shard['shard_scope']} ID={shard['shard_identifier']} Depth={shard['depth']}")
 ```

.github/CODEOWNERS

@@ -489,6 +489,11 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 *sentryapp*.py                                                       @getsentry/product-owners-settings-integrations @getsentry/ecosystem
 *doc_integration*.py                                                 @getsentry/ecosystem
 
+/src/sentry/runner/commands/createproject.py                         @getsentry/ecosystem
+/src/sentry/runner/commands/createorg.py                             @getsentry/ecosystem
+/tests/sentry/runner/commands/test_createproject.py                  @getsentry/ecosystem
+/tests/sentry/runner/commands/test_createorg.py                      @getsentry/ecosystem
+
 ## End of Integrations
 
 
@@ -680,6 +685,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/views/issueList/supergroups/                    @getsentry/issue-detection-frontend
 /static/app/views/issueDetails/                             @getsentry/issue-workflow
 /static/app/views/nav/secondary/sections/issues/            @getsentry/issue-workflow
+/static/app/views/sharedGroupDetails/                       @getsentry/issue-workflow
 /static/app/components/events/interfaces/performance/spanEvidenceKeyValueList.tsx @getsentry/issue-detection-frontend
 /static/app/components/events/interfaces/crashContent/exception/actionableItems.tsx   @getsentry/issue-workflow
 /tests/sentry/deletions/test_group.py                       @getsentry/issue-detection-backend
@@ -807,6 +813,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/utils/theme/                              @getsentry/design-engineering
 /static/app/components/commandPalette/                @getsentry/design-engineering
 /static/app/components/core/                          @getsentry/design-engineering
+/static/app/components/dnd/                           @getsentry/design-engineering
 /static/app/components/pageFilters/                   @getsentry/design-engineering
 /static/app/icons/                                    @getsentry/design-engineering
 /static/app/stories/                                  @getsentry/design-engineering

.github/codeowners-coverage-baseline.txt

@@ -184,6 +184,7 @@ src/sentry/runner/commands/cleanup.py
 src/sentry/runner/commands/config.py
 src/sentry/runner/commands/configoptions.py
 src/sentry/runner/commands/createflag.py
+src/sentry/runner/commands/createorg.py
 src/sentry/runner/commands/createuser.py
 src/sentry/runner/commands/devserver.py
 src/sentry/runner/commands/devservices.py
@@ -225,9 +226,6 @@ src/sentry/scripts/quotas/is_rate_limited.lua
 src/sentry/scripts/ratelimits/api_limiter.lua
 src/sentry/scripts/ratelimits/leaky_bucket.lua
 src/sentry/scripts/similarity/index.lua
-src/sentry/scripts/spans/add-buffer.lua
-src/sentry/scripts/spans/done-flush-segment-data.lua
-src/sentry/scripts/spans/done-flush-segment.lua
 src/sentry/scripts/tsdb/cmsketch.lua
 src/sentry/scripts/utils/locking/delete_lock.lua
 src/sentry/scripts/utils/sadd_capped.lua
@@ -604,14 +602,9 @@ static/app/components/events/eventAttachmentActions.tsx
 static/app/components/events/eventAttachments.spec.tsx
 static/app/components/events/eventAttachments.tsx
 static/app/components/events/eventAttachmentsCrashReportsNotice.tsx
-static/app/components/events/eventBreadcrumbsSection.spec.tsx
-static/app/components/events/eventBreadcrumbsSection.tsx
 static/app/components/events/eventCustomPerformanceMetrics.tsx
 static/app/components/events/eventDataSection.tsx
 static/app/components/events/eventDrawer.tsx
-static/app/components/events/eventEntries.spec.tsx
-static/app/components/events/eventEntries.tsx
-static/app/components/events/eventEntry.tsx
 static/app/components/events/eventEvidence.spec.tsx
 static/app/components/events/eventEvidence.tsx
 static/app/components/events/eventExtraData/getEventExtraDataKnownDataDetails.tsx
@@ -1022,18 +1015,6 @@ static/app/components/replaysOnboarding/replayConfigToggle.tsx
 static/app/components/replaysOnboarding/replayOnboardingLayout.tsx
 static/app/components/replaysOnboarding/sidebar.tsx
 static/app/components/replaysOnboarding/utils.tsx
-static/app/components/repositories/getRepoStatusLabel.tsx
-static/app/components/repositories/repoProviderIcon.tsx
-static/app/components/repositories/scmIntegrationTree/providerConfigLink.tsx
-static/app/components/repositories/scmIntegrationTree/scmIntegrationTree.tsx
-static/app/components/repositories/scmIntegrationTree/scmIntegrationTreeNodes.ts
-static/app/components/repositories/scmIntegrationTree/scmIntegrationTreeRow.tsx
-static/app/components/repositories/scmIntegrationTree/scmTreeFilters.tsx
-static/app/components/repositories/scmIntegrationTree/types.ts
-static/app/components/repositories/scmIntegrationTree/useScmIntegrationTreeData.spec.tsx
-static/app/components/repositories/scmIntegrationTree/useScmIntegrationTreeData.ts
-static/app/components/repositories/scmIntegrationTree/useScmTreeFilters.tsx
-static/app/components/repositories/scmRepoTreeModal.tsx
 static/app/components/repositoryRow.spec.tsx
 static/app/components/repositoryRow.tsx
 static/app/components/resolutionBox.spec.tsx
@@ -1488,9 +1469,6 @@ static/app/views/setupWizard/utils/useOrganizationsWithRegion.tsx
 static/app/views/setupWizard/utils/useUpdateWizardCache.tsx
 static/app/views/setupWizard/waitingForWizardToConnect.tsx
 static/app/views/setupWizard/wizardProjectSelection.tsx
-static/app/views/sharedGroupDetails/index.spec.tsx
-static/app/views/sharedGroupDetails/index.tsx
-static/app/views/sharedGroupDetails/sharedGroupHeader.tsx
 static/app/views/unsubscribe/issue.spec.tsx
 static/app/views/unsubscribe/issue.tsx
 static/app/views/unsubscribe/project.spec.tsx
@@ -2317,6 +2295,7 @@ tests/sentry/runner/commands/test_cleanup.py
 tests/sentry/runner/commands/test_config.py
 tests/sentry/runner/commands/test_configoptions.py
 tests/sentry/runner/commands/test_createflag.py
+tests/sentry/runner/commands/test_createorg.py
 tests/sentry/runner/commands/test_createuser.py
 tests/sentry/runner/commands/test_init.py
 tests/sentry/runner/commands/test_migrations.py

.github/workflows/backend-selective.yml

@@ -179,6 +179,9 @@ jobs:
     env:
       MATRIX_INSTANCE_TOTAL: ${{ needs.calculate-shards.outputs.shard-count }}
       TEST_GROUP_STRATEGY: roundrobin
+      PYTHONHASHSEED: '0'
+      XDIST_PER_WORKER_SNUBA: '1'
+      XDIST_WORKERS: '2'
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
@@ -195,6 +198,58 @@ jobs:
           sudo install -m 755 odiff-linux-x64 /usr/local/bin/odiff
           rm odiff-linux-x64
 
+      - name: Bootstrap per-worker Snuba instances
+        run: |
+          set -eo pipefail
+          SNUBA_IMAGE=$(docker inspect snuba-snuba-1 --format '{{.Config.Image}}')
+          SNUBA_NETWORK=$(docker inspect snuba-snuba-1 --format '{{range $k, $v := .NetworkSettings.Networks}}{{$k}}{{end}}')
+          if [ -z "$SNUBA_IMAGE" ] || [ -z "$SNUBA_NETWORK" ]; then
+            echo "ERROR: Could not inspect snuba-snuba-1 container. Is devservices running?"
+            exit 1
+          fi
+
+          docker stop snuba-snuba-1 || true
+
+          PIDS=()
+          for i in $(seq 0 $(( ${XDIST_WORKERS} - 1 ))); do
+            (
+              WORKER_DB="default_gw${i}"
+              WORKER_PORT=$((1230 + i))
+              curl -sf 'http://localhost:8123/' --data-binary "CREATE DATABASE IF NOT EXISTS ${WORKER_DB}"
+              docker run --rm --network "$SNUBA_NETWORK" \
+                -e "CLICKHOUSE_DATABASE=${WORKER_DB}" -e "CLICKHOUSE_HOST=clickhouse" \
+                -e "CLICKHOUSE_PORT=9000" -e "CLICKHOUSE_HTTP_PORT=8123" \
+                -e "DEFAULT_BROKERS=kafka:9093" -e "REDIS_HOST=redis" \
+                -e "REDIS_PORT=6379" -e "REDIS_DB=1" -e "SNUBA_SETTINGS=docker" \
+                "$SNUBA_IMAGE" bootstrap --force 2>&1 | tail -3
+              docker run -d --name "snuba-gw${i}" --network "$SNUBA_NETWORK" \
+                -p "${WORKER_PORT}:1218" \
+                -e "CLICKHOUSE_DATABASE=${WORKER_DB}" -e "CLICKHOUSE_HOST=clickhouse" \
+                -e "CLICKHOUSE_PORT=9000" -e "CLICKHOUSE_HTTP_PORT=8123" \
+                -e "DEFAULT_BROKERS=kafka:9093" -e "REDIS_HOST=redis" \
+                -e "REDIS_PORT=6379" -e "REDIS_DB=1" -e "SNUBA_SETTINGS=docker" \
+                -e "DEBUG=1" "$SNUBA_IMAGE" api
+
+              for attempt in $(seq 1 30); do
+                if curl -sf "http://127.0.0.1:${WORKER_PORT}/health" > /dev/null 2>&1; then
+                  echo "snuba-gw${i} healthy on port ${WORKER_PORT}"
+                  break
+                fi
+                if [ "$attempt" -eq 30 ]; then
+                  echo "ERROR: snuba-gw${i} failed health check after 30 attempts"
+                  docker logs "snuba-gw${i}" 2>&1 | tail -20 || true
+                  exit 1
+                fi
+                sleep 2
+              done
+            ) &
+            PIDS+=($!)
+          done
+
+          for pid in "${PIDS[@]}"; do
+            wait "$pid" || { echo "ERROR: Snuba bootstrap subshell (PID $pid) failed"; exit 1; }
+          done
+
       - name: Download selected tests artifact
         if: needs.select-tests.outputs.has-selected-tests == 'true'
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
@@ -206,6 +261,7 @@ jobs:
         env:
           SELECTED_TESTS_FILE: ${{ needs.select-tests.outputs.has-selected-tests == 'true' && '.artifacts/selected-tests.txt' || '' }}
         run: |
+          export PYTEST_ADDOPTS="$PYTEST_ADDOPTS -n ${XDIST_WORKERS} --dist=loadfile"
           make test-python-ci
 
       - name: Inspect failure
@@ -214,3 +270,8 @@ jobs:
           if command -v devservices; then
             devservices logs
           fi
+
+          for i in $(seq 0 $(( ${XDIST_WORKERS} - 1 ))); do
+            echo "--- snuba-gw${i} logs ---"
+            docker logs "snuba-gw${i}" 2>&1 | tail -30 || true
+          done

.github/workflows/backend.yml

@@ -272,10 +272,9 @@ jobs:
       # Dynamic total from calculate-shards
       MATRIX_INSTANCE_TOTAL: ${{ needs.calculate-shards.outputs.shard-count }}
       TEST_GROUP_STRATEGY: roundrobin
-      # xdist: enabled on master pushes and workflow_dispatch, disabled on PRs
-      PYTHONHASHSEED: ${{ github.event_name != 'pull_request' && '0' || 'random' }}
-      XDIST_PER_WORKER_SNUBA: ${{ github.event_name != 'pull_request' && '1' || '' }}
-      XDIST_WORKERS: ${{ github.event_name != 'pull_request' && '3' || '' }}
+      PYTHONHASHSEED: '0'
+      XDIST_PER_WORKER_SNUBA: '1'
+      XDIST_WORKERS: ${{ github.event_name == 'pull_request' && '2' || '3' }}
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

.github/workflows/frontend-optional.yml

@@ -25,8 +25,11 @@ jobs:
       testable_rules_changed: ${{ steps.changes.outputs.testable_rules_changed }}
       typecheckable_rules_changed: ${{ steps.changes.outputs.typecheckable_rules_changed }}
       frontend_all: ${{ steps.changes.outputs.frontend_all }}
+      merge_base: ${{ steps.merge_base.outputs.merge_base }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          fetch-depth: 100
 
       - name: Check for frontend file changes
         uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
@@ -36,6 +39,88 @@ jobs:
           filters: .github/file-filters.yml
           list-files: shell
 
+      # On PRs, HEAD is the merge commit; its parents (HEAD^1, HEAD^2) are base and head.
+      # Merge base of those two is what Jest --changedSince needs.
+      # If merge base can't be computed or non-frontend files changed, output is empty
+      # and the optional Jest job will be skipped entirely.
+      - name: Get merge base for changedSince
+        id: merge_base
+        run: |
+          MERGE_BASE=$(git merge-base HEAD^1 HEAD^2 2>/dev/null) || true
+          if [ -n "$MERGE_BASE" ]; then
+            CHANGED=$(git diff --name-only "$MERGE_BASE" HEAD^2)
+            if echo "$CHANGED" | grep -qvE '^static/'; then
+              echo "Non-frontend file changed — skipping optional Jest"
+              MERGE_BASE=""
+            else
+              echo "Merge base: $MERGE_BASE (Jest will use --changedSince)"
+            fi
+          else
+            echo "Could not compute merge base — skipping optional Jest"
+          fi
+          echo "merge_base=${MERGE_BASE:-}" >> "$GITHUB_OUTPUT"
+
+  # This job intentionally mirrors `frontend-jest-tests` in frontend.yml.
+  # Our intent is to try it out for a few weeks and see if it's stable.
+  frontend-jest-tests-changed-only:
+    if: >-
+      needs.files-changed.outputs.merge_base != '' &&
+      (needs.files-changed.outputs.testable_rules_changed == 'true' || needs.files-changed.outputs.testable_modified == 'true')
+    needs: [files-changed]
+    name: Jest
+    # If you change the runs-on image, you must also change the runner in jest-balance.yml
+    # so that the balancer runs in the same environment as the tests.
+    runs-on: ubuntu-24.04
+    timeout-minutes: 30
+    strategy:
+      # This helps not having to run multiple jobs because one fails, thus, reducing resource usage
+      # and reducing the risk that one of many runs would turn red again (read: intermittent tests)
+      fail-fast: false
+      matrix:
+        # XXX: When updating this, make sure you also update CI_NODE_TOTAL.
+        instance: [0, 1, 2, 3]
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        name: Checkout sentry
+        with:
+          # PRs need history so we can compute merge base for Jest --changedSince.
+          # 100 is an arbitrary depth that will get most reasonable PRs' commits.
+          fetch-depth: ${{ github.event_name == 'pull_request' && '100' || '1' }}
+
+      - uses: ./.github/actions/setup-node-pnpm
+
+      - name: Download jest-balance.json
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+        with:
+          workflow: 38531594 # jest-balancer.yml
+          workflow_conclusion: success # The conclusion of the workflow we're looking for
+          branch: master # The branch we're looking for
+          name: jest-balance.json # Artifact name
+          name_is_regexp: false
+          path: tests/js/test-balancer/ # Directory where to extract artifact(s), defaults to the current directory
+          search_artifacts: true # Search for the last workflow run whose stored the artifact we're looking for
+          if_no_artifact_found: warn # Can be one of: "fail", "warn", "ignore"
+
+      - name: jest
+        env:
+          GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha || github.sha }}
+          GITHUB_PR_REF: ${{ github.event.pull_request.head.ref || github.ref }}
+          # XXX: CI_NODE_TOTAL must be hardcoded to the length of strategy.matrix.instance.
+          #      Otherwise, if there are other things in the matrix, using strategy.job-total
+          #      wouldn't be correct.
+          CI_NODE_TOTAL: 4
+          CI_NODE_INDEX: ${{ matrix.instance }}
+          # Disable testing-library from printing out any of of the DOM to
+          # stdout. No one actually looks through this in CI, they're just
+          # going to run it locally.
+          #
+          # This quiets up the logs quite a bit.
+          DEBUG_PRINT_LIMIT: 0
+          MERGE_BASE: ${{ needs.files-changed.outputs.merge_base }}
+        run: pnpm run test-ci --forceExit
+
   typescript-native:
     if: needs.files-changed.outputs.frontend_all == 'true'
     needs: files-changed

eslint.config.ts

@@ -928,6 +928,7 @@ export default typescript.config([
     name: 'files/jest related',
     files: [
       'tests/js/jest-pegjs-transform.js',
+      'tests/js/sentry-test/jest-environment.js',
       'tests/js/sentry-test/mocks/*',
       'tests/js/sentry-test/loadFixtures.ts',
       'tests/js/setup.ts',