Merge branch 'master' into replace-useRouter-PickProjectToContinue-usages

Author: shashjar

.github/CODEOWNERS

@@ -439,6 +439,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/loading/                @getsentry/app-frontend
 /static/app/components/events/interfaces/      @getsentry/app-frontend
 /static/app/components/forms/                  @getsentry/app-frontend
+/static/app/components/markdownTextArea.tsx    @getsentry/app-frontend
 /static/app/locale.tsx                         @getsentry/app-frontend
 ## End of Frontend
 

.github/codeowners-coverage-baseline.txt

@@ -253,11 +253,6 @@ src/sentry/stacktraces/processing.py
 src/sentry/status_checks/__init__.py
 src/sentry/status_checks/base.py
 src/sentry/status_checks/warnings.py
-src/sentry/synapse/__init__.py
-src/sentry/synapse/endpoints/__init__.py
-src/sentry/synapse/endpoints/authentication.py
-src/sentry/synapse/endpoints/org_cell_mappings.py
-src/sentry/synapse/paginator.py
 src/sentry/tagstore/__init__.py
 src/sentry/tagstore/base.py
 src/sentry/tagstore/exceptions.py
@@ -643,18 +638,6 @@ static/app/components/events/eventTagsAndScreenshot/tags.tsx
 static/app/components/events/eventViewHierarchy.spec.tsx
 static/app/components/events/eventViewHierarchy.tsx
 static/app/components/events/eventXrayDiff.tsx
-static/app/components/events/groupingInfo/groupingComponent.tsx
-static/app/components/events/groupingInfo/groupingComponentChildren.tsx
-static/app/components/events/groupingInfo/groupingComponentFrames.tsx
-static/app/components/events/groupingInfo/groupingComponentStacktrace.tsx
-static/app/components/events/groupingInfo/groupingInfo.tsx
-static/app/components/events/groupingInfo/groupingInfoSection.spec.tsx
-static/app/components/events/groupingInfo/groupingInfoSection.tsx
-static/app/components/events/groupingInfo/groupingSummary.tsx
-static/app/components/events/groupingInfo/groupingVariant.spec.tsx
-static/app/components/events/groupingInfo/groupingVariant.tsx
-static/app/components/events/groupingInfo/useEventGroupingInfo.tsx
-static/app/components/events/groupingInfo/utils.tsx
 static/app/components/events/meta/annotatedText/annotatedTextErrors.tsx
 static/app/components/events/meta/annotatedText/annotatedTextValue.tsx
 static/app/components/events/meta/annotatedText/filteredAnnotatedTextValue.tsx
@@ -789,8 +772,6 @@ static/app/components/list/index.tsx
 static/app/components/list/listItem.tsx
 static/app/components/list/utils.tsx
 static/app/components/listGroup.tsx
-static/app/components/loading/loadingContainer.spec.tsx
-static/app/components/loading/loadingContainer.tsx
 static/app/components/loadingError.stories.tsx
 static/app/components/loadingError.tsx
 static/app/components/loadingIndicator.stories.tsx
@@ -2258,7 +2239,6 @@ tests/sentry/receivers/outbox/test_control.py
 tests/sentry/receivers/test_analytics.py
 tests/sentry/receivers/test_core.py
 tests/sentry/receivers/test_data_forwarding.py
-tests/sentry/receivers/test_default_detector.py
 tests/sentry/receivers/test_featureadoption.py
 tests/sentry/receivers/test_onboarding.py
 tests/sentry/receivers/test_releases.py
@@ -2357,10 +2337,6 @@ tests/sentry/sudo/test_middleware.py
 tests/sentry/sudo/test_signals.py
 tests/sentry/sudo/test_utils.py
 tests/sentry/sudo/test_views.py
-tests/sentry/synapse/__init__.py
-tests/sentry/synapse/endpoints/__init__.py
-tests/sentry/synapse/endpoints/test_org_cell_mappings.py
-tests/sentry/synapse/test_paginator.py
 tests/sentry/tagstore/__init__.py
 tests/sentry/tagstore/test_types.py
 tests/sentry/tasks/__init__.py
@@ -2535,7 +2511,6 @@ tests/social_auth/test_utils.py
 tests/tools/__init__.py
 tests/tools/test_api_urls_to_typescript.py
 tests/tools/test_bump_action.py
-tests/tools/test_compute_selected_tests.py
 tests/tools/test_flake8_plugin.py
 tests/tools/test_lint_requirements.py
 tests/tools/test_pin_github_action.py

.github/workflows/backend.yml

@@ -184,14 +184,6 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         if: needs.select-tests.outputs.has-selected-tests == 'true'
 
-      - name: Setup sentry env
-        if: needs.select-tests.outputs.has-selected-tests == 'true'
-        uses: ./.github/actions/setup-sentry
-        id: setup
-        with:
-          mode: backend-ci
-          skip-devservices: true
-
       - name: Download selected tests artifact
         if: needs.select-tests.outputs.has-selected-tests == 'true'
         uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0

.github/workflows/frontend-snapshots.yml

@@ -1,4 +1,4 @@
-name: '[NOT REQUIRED] frontend-snapshots'
+name: 'frontend-snapshots'
 
 on:
   push:

.github/workflows/scripts/calculate-backend-test-shards.py

@@ -1,9 +1,18 @@
 #!/usr/bin/env python3
+"""Calculate the number of backend test shards needed for CI.
+
+Uses AST-based static analysis to count tests instead of running
+pytest --collect-only, which requires importing every module and
+bootstrapping Django (~100s). AST parsing takes a few seconds.
+"""
+
+from __future__ import annotations
+
+import ast
 import json
 import math
 import os
 import re
-import subprocess
 import sys
 from pathlib import Path
 
@@ -12,85 +21,126 @@
 MAX_SHARDS = 22
 DEFAULT_SHARDS = MAX_SHARDS
 
+IGNORED_DIRS = frozenset(("tests/acceptance/", "tests/apidocs/", "tests/js/", "tests/tools/"))
+
+
+def _resolve(node: ast.expr, scope: dict[str, ast.expr]) -> ast.expr:
+    """Chase Name and Subscript references back to a concrete AST node."""
+    if isinstance(node, ast.Name) and node.id in scope:
+        return _resolve(scope[node.id], scope)
+    if (
+        isinstance(node, ast.Subscript)
+        and isinstance(node.value, ast.Name)
+        and isinstance(node.slice, ast.Constant)
+        and isinstance(node.slice.value, int)
+        and node.value.id in scope
+    ):
+        target = _resolve(scope[node.value.id], scope)
+        i = node.slice.value
+        if isinstance(target, (ast.List, ast.Tuple)) and 0 <= i < len(target.elts):
+            return _resolve(target.elts[i], scope)
+    return node
+
+
+def _parametrize_count(dec: ast.expr, scope: dict[str, ast.expr]) -> int | None:
+    """If *dec* is a ``@pytest.mark.parametrize``, return the case count."""
+    dec = _resolve(dec, scope)
+    if not isinstance(dec, ast.Call) or len(dec.args) < 2:
+        return None
+    f = dec.func
+    if not (
+        isinstance(f, ast.Attribute)
+        and f.attr == "parametrize"
+        and isinstance(f.value, ast.Attribute)
+        and f.value.attr == "mark"
+        and isinstance(f.value.value, ast.Name)
+        and f.value.value.id == "pytest"
+    ):
+        return None
+    argvals = _resolve(dec.args[1], scope)
+    return len(argvals.elts) if isinstance(argvals, (ast.List, ast.Tuple)) else None
+
+
+_TEST_FUNC_RE = re.compile(r"^\s*(?:async\s+)?def\s+test_", re.MULTILINE)
+
+
+def count_tests_in_file(filepath: Path) -> int:
+    """Count the test items *filepath* would produce.
+
+    Accounts for ``@pytest.mark.parametrize`` multipliers including
+    stacked decorators.
+    """
+    try:
+        source = filepath.read_text(encoding="utf-8")
+    except (UnicodeDecodeError, OSError):
+        return 0
+
+    # Fast path: no parametrize means each def test_ is exactly one test.
+    if "parametrize" not in source:
+        return len(_TEST_FUNC_RE.findall(source))
+
+    try:
+        tree = ast.parse(source, filename=str(filepath))
+    except SyntaxError:
+        return len(_TEST_FUNC_RE.findall(source))
+
+    scope: dict[str, ast.expr] = {}
+    for node in ast.iter_child_nodes(tree):
+        if isinstance(node, ast.Assign):
+            for target in node.targets:
+                if isinstance(target, ast.Name):
+                    scope[target.id] = node.value
+        elif isinstance(node, ast.AnnAssign) and isinstance(node.target, ast.Name) and node.value:
+            scope[node.target.id] = node.value
+
+    total = 0
+    for node in ast.walk(tree):
+        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name.startswith(
+            "test_"
+        ):
+            counts = (
+                c for d in node.decorator_list if (c := _parametrize_count(d, scope)) is not None
+            )
+            total += math.prod(counts, start=1)
+    return total
+
 
 def collect_test_count() -> int | None:
-    """Collect the number of tests to run, either from selected files or full suite."""
+    """Count tests via AST analysis of test files."""
     selected_tests_file = os.environ.get("SELECTED_TESTS_FILE")
 
     if selected_tests_file:
         path = Path(selected_tests_file)
         if not path.exists():
-            print(f"Selected tests file not found: {selected_tests_file}", file=sys.stderr)
+            print(
+                f"Selected tests file not found: {selected_tests_file}",
+                file=sys.stderr,
+            )
             return None
 
-        with path.open() as f:
-            selected_files = [line.strip() for line in f if line.strip()]
+        test_files = [Path(line.strip()) for line in path.read_text().splitlines() if line.strip()]
 
-        if not selected_files:
+        if not test_files:
             print("No selected test files, running 0 tests", file=sys.stderr)
             return 0
 
-        print(f"Counting tests in {len(selected_files)} selected files", file=sys.stderr)
-
-    pytest_args = [
-        "pytest",
-        # Always pass tests/ directory to ensure proper conftest loading order.
-        # SELECTED_TESTS_FILE env var triggers filtering in pytest_collection_modifyitems.
-        "tests",
-        "--collect-only",
-        "--quiet",
-        "--ignore=tests/acceptance",
-        "--ignore=tests/apidocs",
-        "--ignore=tests/js",
-        "--ignore=tests/tools",
-    ]
+        print(f"Counting tests in {len(test_files)} selected files", file=sys.stderr)
+    else:
+        tests_dir = Path("tests")
+        if not tests_dir.is_dir():
+            print("tests/ directory not found", file=sys.stderr)
+            return None
 
-    try:
-        result = subprocess.run(
-            pytest_args,
-            capture_output=True,
-            text=True,
-            check=False,
+        test_files = sorted(
+            p
+            for p in tests_dir.rglob("test_*.py")
+            if not any(str(p).startswith(d) for d in IGNORED_DIRS)
         )
+        print(f"Found {len(test_files)} test files", file=sys.stderr)
 
-        # Parse output for test count
-        # Format without deselection: "27000 tests collected in 18.53s"
-        # Format with deselection: "29/31510 tests collected (31481 deselected) in 18.13s"
-        output = result.stdout + result.stderr
-
-        # Try format with deselection first (selected/total)
-        match = re.search(r"(\d+)/\d+ tests? collected", output)
-        if match:
-            count = int(match.group(1))
-            print(f"Collected {count} tests", file=sys.stderr)
-            return count
-
-        # Fall back to format without deselection
-        match = re.search(r"(\d+) tests? collected", output)
-        if match:
-            count = int(match.group(1))
-            print(f"Collected {count} tests", file=sys.stderr)
-            return count
-
-        if result.returncode == 5:
-            # Exit code 5 indicates no tests collected (https://docs.pytest.org/en/stable/reference/exit-codes.html)
-            # This can stem from files being deleted in a branch/PR.
-            print("No tests collected (exit 5)", file=sys.stderr)
-            return 0
-
-        if result.returncode != 0:
-            print(
-                f"Pytest collection failed (exit {result.returncode})",
-                file=sys.stderr,
-            )
-            print(result.stderr, file=sys.stderr)
-            return None
-
-        print("No tests collected", file=sys.stderr)
-        return 0
-    except Exception as e:
-        print(f"Error collecting tests: {e}", file=sys.stderr)
-        return None
+    total = sum(count_tests_in_file(f) for f in test_files)
+    print(f"Counted {total} tests via AST analysis", file=sys.stderr)
+    return total
 
 
 def calculate_shards(test_count: int | None) -> int: