Merge branch 'master' into cmanallen/implement-scm-platform

Author: cmanallen

.github/CODEOWNERS

@@ -356,6 +356,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/arithmeticBuilder/                                 @getsentry/data-browsing
 
 /static/app/components/charts/                                            @getsentry/data-browsing
+/static/app/chartcuterie/timeseries.tsx                                   @getsentry/data-browsing
 
 /static/app/views/insights/                                               @getsentry/dashboards
 

.github/workflows/acceptance.yml

@@ -63,6 +63,9 @@ jobs:
       # XXX: MATRIX_INSTANCE_TOTAL must match the matrix size (5 for backend changes, 10 for frontend-only)
       MATRIX_INSTANCE_TOTAL: ${{ needs.files-changed.outputs.backend_all == 'true' && '5' || '10' }}
       TEST_GROUP_STRATEGY: roundrobin
+      PYTHONHASHSEED: '0'
+      XDIST_PER_WORKER_SNUBA: '1'
+      XDIST_WORKERS: '2'
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -74,6 +77,13 @@ jobs:
         with:
           mode: acceptance-ci
 
+      - name: Start Snuba bootstrap
+        if: env.XDIST_PER_WORKER_SNUBA == '1'
+        run: |
+          # Start in background early so it overlaps with webpack and sentry env setup.
+          # The script polls for ClickHouse readiness itself.
+          python3 ./.github/actions/setup-devservices/bootstrap-snuba.py &
+
       - name: Step configurations
         id: config
         run: |
@@ -111,8 +121,20 @@ jobs:
           sentry init
           ./.github/actions/setup-devservices/wait.sh
 
+      - name: Wait for Snuba bootstrap
+        if: env.XDIST_PER_WORKER_SNUBA == '1'
+        run: |
+          timeout 600 bash -c 'until [ -f /tmp/snuba-bootstrap-exit ]; do sleep 2; done' ||
+            { echo "::error::Timed out waiting for Snuba bootstrap after 600s"; exit 1; }
+          rc=$(</tmp/snuba-bootstrap-exit)
+          [ "$rc" -eq 0 ] || { echo "::error::Snuba per-worker bootstrap failed"; exit "$rc"; }
+
       - name: Run acceptance tests (#${{ steps.setup.outputs.matrix-instance-number }} of ${{ steps.setup.outputs.matrix-instance-total }})
-        run: make run-acceptance
+        run: |
+          export PYTEST_ADDOPTS="$PYTEST_ADDOPTS -n ${XDIST_WORKERS} --dist=loadfile"
+          timeout 1200 make run-acceptance || rc=$?
+          [ "${rc:-0}" -ne 124 ] || echo "::error::Test run timed out after 20 minutes (possible xdist hang)"
+          exit "${rc:-0}"
 
       - name: Inspect failure
         if: failure()
@@ -126,6 +148,13 @@ jobs:
             devservices logs
           fi
 
+          if [ "${XDIST_PER_WORKER_SNUBA}" = "1" ]; then
+            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
+          fi
+
       - name: Collect test data
         uses: ./.github/actions/collect-test-data
         if: ${{ !cancelled() }}

.github/workflows/codeql.yml

@@ -14,6 +14,10 @@ on:
   schedule:
     - cron: '44 12 * * 1'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

.github/workflows/enforce-license-compliance.yml

@@ -3,6 +3,10 @@ name: Enforce License Compliance
 on:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   enforce-license-compliance:
     runs-on: ubuntu-latest

.github/workflows/migrations-drift.yml

@@ -51,7 +51,7 @@ jobs:
         run: make apply-migrations
 
       - name: capture database schema before
-        run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s' > schema-before
+        run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s --restrict-key=driftcheck' > schema-before
 
       - name: clear db
         run: make drop-db create-db
@@ -65,7 +65,7 @@ jobs:
         run: make drop-db apply-migrations
 
       - name: capture database schema after
-        run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s' > schema-after
+        run: docker exec postgres-postgres-1 bash -c 'pg_dumpall -U postgres -s --restrict-key=driftcheck' > schema-after
 
       - name: compare schema
         run: python3 -um tools.migrations.compare --color schema-before schema-after

.github/workflows/scripts/compute-sentry-selected-tests.py

@@ -86,6 +86,11 @@
     re.compile(r"^tests/(acceptance|apidocs|js|tools)/"),
 ]
 
+# Tests that should always be run even if not explicitly selected.
+ALWAYS_RUN_TESTS: set[str] = {
+    "tests/sentry/taskworker/test_config.py",
+}
+
 
 def _is_test(path: str) -> bool:
     return any(path.startswith(d) for d in TEST_DIRS)
@@ -225,6 +230,9 @@ def main() -> int:
                 print(f"Including {len(existing_changed)} directly changed test files")
                 affected_test_files.update(existing_changed)
 
+            # Always run these tests
+            affected_test_files.update(ALWAYS_RUN_TESTS)
+
     # Filter to sentry tests only (drop any getsentry tests from coverage)
     affected_test_files = {f for f in affected_test_files if _is_test(f)}
 

.github/workflows/scripts/test_compute_sentry_selected_tests.py

@@ -19,7 +19,7 @@
 sys.modules["compute_sentry_selected_tests"] = _mod
 _spec.loader.exec_module(_mod)
 
-from compute_sentry_selected_tests import _query_coverage, main
+from compute_sentry_selected_tests import ALWAYS_RUN_TESTS, _query_coverage, main
 
 
 def _create_coverage_db(path: str, file_to_contexts: dict[str, list[str]]) -> None:
@@ -178,8 +178,9 @@ def test_selective_returns_matched_tests(self, tmp_path):
 
         gh = gh_output.read_text()
         assert "has-selected-tests=true" in gh
-        assert "test-count=1" in gh
-        assert output.read_text().strip() == "tests/sentry/test_org.py"
+        assert f"test-count={1 + len(ALWAYS_RUN_TESTS)}" in gh
+        expected_output = sorted({"tests/sentry/test_org.py"} | ALWAYS_RUN_TESTS)
+        assert output.read_text().splitlines() == expected_output
 
     def test_getsentry_tests_filtered_out(self, tmp_path):
         """Coverage may return getsentry tests — they should be filtered."""
@@ -211,8 +212,9 @@ def test_getsentry_tests_filtered_out(self, tmp_path):
                 {"GITHUB_OUTPUT": str(gh_output)},
             )
 
-        assert "test-count=1" in gh_output.read_text()
-        assert output.read_text().strip() == "tests/sentry/test_org.py"
+        assert f"test-count={1 + len(ALWAYS_RUN_TESTS)}" in gh_output.read_text()
+        expected_output = sorted({"tests/sentry/test_org.py"} | ALWAYS_RUN_TESTS)
+        assert output.read_text().splitlines() == expected_output
 
     def test_changed_test_file_included(self, tmp_path):
         db_path = tmp_path / "coverage.db"
@@ -236,7 +238,7 @@ def test_changed_test_file_included(self, tmp_path):
 
         gh = gh_output.read_text()
         assert "has-selected-tests=true" in gh
-        assert "test-count=1" in gh
+        assert f"test-count={1 + len(ALWAYS_RUN_TESTS)}" in gh
 
     def test_excluded_test_dirs_skipped(self, tmp_path):
         """Tests in acceptance/apidocs/js/tools should not be selected."""
@@ -257,10 +259,10 @@ def test_excluded_test_dirs_skipped(self, tmp_path):
                 {"GITHUB_OUTPUT": str(gh_output)},
             )
 
-        assert "test-count=0" in gh_output.read_text()
+        assert f"test-count={len(ALWAYS_RUN_TESTS)}" in gh_output.read_text()
 
-    def test_zero_tests_signals_selective_applied(self, tmp_path):
-        """0 tests after filtering should signal 'run nothing', not full suite."""
+    def test_zero_coverage_matches_still_runs_always_run_tests(self, tmp_path):
+        """No coverage matches should still run ALWAYS_RUN_TESTS, not the full suite."""
         db_path = tmp_path / "coverage.db"
         _create_coverage_db(str(db_path), {})
         output = tmp_path / "output.txt"
@@ -282,8 +284,8 @@ def test_zero_tests_signals_selective_applied(self, tmp_path):
 
         gh = gh_output.read_text()
         assert "has-selected-tests=true" in gh
-        assert "test-count=0" in gh
-        assert output.read_text() == ""
+        assert f"test-count={len(ALWAYS_RUN_TESTS)}" in gh
+        assert set(output.read_text().splitlines()) == ALWAYS_RUN_TESTS
 
     def test_renamed_file_queries_old_path(self, tmp_path):
         """When a file is renamed, the old path should be queried against the coverage DB."""
@@ -319,8 +321,9 @@ def test_renamed_file_queries_old_path(self, tmp_path):
 
         gh = gh_output.read_text()
         assert "has-selected-tests=true" in gh
-        assert "test-count=1" in gh
-        assert output.read_text().strip() == "tests/sentry/test_old_name.py"
+        assert f"test-count={1 + len(ALWAYS_RUN_TESTS)}" in gh
+        expected_output = sorted({"tests/sentry/test_old_name.py"} | ALWAYS_RUN_TESTS)
+        assert output.read_text().splitlines() == expected_output
 
     def test_renamed_file_without_previous_misses_coverage(self, tmp_path):
         """Without --previous-filenames, a renamed file gets no coverage hits."""
@@ -349,7 +352,7 @@ def test_renamed_file_without_previous_misses_coverage(self, tmp_path):
 
         gh = gh_output.read_text()
         assert "has-selected-tests=true" in gh
-        assert "test-count=0" in gh
+        assert f"test-count={len(ALWAYS_RUN_TESTS)}" in gh
 
     def test_missing_db_returns_error(self):
         ret = _run(["--coverage-db", "/nonexistent/coverage.db", "--changed-files", "foo.py"])

.github/workflows/sentry-pull-request-bot.yml

@@ -8,6 +8,10 @@ on:
   pull_request:
     types: [opened, edited]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   # TODO(billy): Move this into an external action as we add more functionality
   test-getsentry: