Merge remote-tracking branch 'origin/master' into remove-schema-hints-flag

# Conflicts:
#	static/app/views/explore/spans/spansTabSearchSection.spec.tsx

Author: JoshuaKGoldberg

.github/CODEOWNERS

@@ -229,6 +229,8 @@ pnpm-lock.yaml                                           @getsentry/owners-js-de
 /tests/sentry/silo/                                      @getsentry/hybrid-cloud
 /tests/sentry/models/test_projectkeymapping.py           @getsentry/hybrid-cloud
 /.agents/skills/hybrid-cloud-*                           @getsentry/hybrid-cloud
+/src/apigw/                                              @getsentry/hybrid-cloud @gi0baro
+/tests/apigw/                                            @getsentry/hybrid-cloud @gi0baro
 ## End of Hybrid Cloud
 
 ## Alerts & Notifications

.github/workflows/backend.yml

@@ -365,7 +365,7 @@ jobs:
 
       - name: run tests
         run: |
-          PYTEST_ADDOPTS="$PYTEST_ADDOPTS -m migrations --migrations --reruns 0 --fail-slow=120s" make test-python-ci
+          PYTEST_ADDOPTS="$PYTEST_ADDOPTS -m migrations --migrations --reruns 0 --fail-slow=150s" make test-python-ci
 
       - name: Report failures
         if: ${{ !cancelled() && github.event_name == 'pull_request' }}

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

@@ -33,6 +33,7 @@
 
 # Known sentry test directory names.
 TEST_DIRS = (
+    "tests/apigw/",
     "tests/sentry/",
     "tests/snuba/",
     "tests/relay_integration/",
@@ -55,6 +56,9 @@
     re.compile(r"(^|/)conftest\.py$"),
     "src/sentry/runner/initializer.py",
     "src/sentry/constants.py",
+    # column-alias enum evaluated at import time; used indirectly by every
+    # Snuba query builder so coverage never records per-test contexts for it
+    "src/sentry/snuba/events.py",
     # option defaults registered at startup via initialize_app()
     re.compile(r"^src/sentry/options/"),
     # feature flags registered via manager.add() at import time
@@ -122,6 +126,23 @@
 # Tests that should always be run even if not explicitly selected.
 ALWAYS_RUN_TESTS: set[str] = {
     "tests/sentry/taskworker/test_config.py",
+    "tests/sentry/management/commands/test_generate_controlsilo_urls.py",
+    # apigw must stay in sync with sentry (url -> silo mapping, model queries),
+    # so any backend change can affect these. Coverage can't attribute the
+    # routing test to source files: both the django url conf and the apigw
+    # routing table are built at import time, before any per-test coverage
+    # context is active.
+    "tests/apigw/test_db.py",
+    "tests/apigw/test_routing.py",
+    # Both of these tests check global codebase invariants via runtime discovery —
+    # the same reason the apigw tests above are always run. Coverage can't attribute
+    # them to individual source files because the discovery happens at startup,
+    # before per-test coverage contexts are active:
+    #   test_base.py: walks all endpoint subclasses to check for silo decorators
+    #   test_validate.py: walks the Django ORM registry (get_exportable_sentry_models)
+    #     to assign comparators — __relocation_scope__ changes on any model are invisible
+    "tests/sentry/silo/test_base.py",
+    "tests/sentry/backup/test_validate.py",
 }
 
 

api-docs/paths/events/project-issues.json

@@ -3,6 +3,7 @@
     "tags": ["Events"],
     "description": "**Deprecated**: This endpoint has been replaced with the [Organization Issues endpoint](/api/events/list-an-organizations-issues/) which\nsupports filtering on project and additional functionality.\n\nReturn a list of issues (groups) bound to a project.  All parameters are supplied as query string parameters. \n\n A default query of ``is:unresolved`` is applied. To return results with other statuses send an new query value (i.e. ``?query=`` for all results).\n\nThe ``statsPeriod`` parameter can be used to select the timeline stats which should be present. Possible values are: ``\"\"`` (disable),``\"24h\"`` (default), ``\"14d\"``\n\nUser feedback items from the [User Feedback Widget](https://docs.sentry.io/product/user-feedback/#user-feedback-widget) are built off the issue platform, so to return a list of user feedback items for a specific project, filter for `issue.category:feedback`.",
     "operationId": "List a Project's Issues",
+    "deprecated": true,
     "parameters": [
       {
         "name": "organization_id_or_slug",
@@ -54,6 +55,25 @@
           "type": "string"
         }
       },
+      {
+        "name": "sort",
+        "in": "query",
+        "description": "The sort order of the issues. Options include 'Last Seen' (`date`), 'First Seen' (`new`), 'Trends' (`trends`), 'Events' (`freq`), 'Users' (`user`), and 'Date Added' (`inbox`).",
+        "schema": {
+          "type": "string",
+          "default": "date",
+          "enum": ["date", "new", "trends", "freq", "user", "inbox"]
+        }
+      },
+      {
+        "name": "limit",
+        "in": "query",
+        "description": "The maximum number of issues to return. The maximum is 100.",
+        "schema": {
+          "type": "integer",
+          "default": 100
+        }
+      },
       {
         "$ref": "../../components/parameters/pagination-cursor.json#/PaginationCursor"
       }

api-docs/paths/projects/user-feedback.json

@@ -73,6 +73,7 @@
     "tags": ["Projects"],
     "description": "*This endpoint is DEPRECATED. We document it here for older SDKs and users who are still migrating to the [User Feedback Widget](https://docs.sentry.io/product/user-feedback/#user-feedback-widget) or [API](https://docs.sentry.io/platforms/javascript/user-feedback/#user-feedback-api)(multi-platform). If you are a new user, do not use this endpoint - unless you don't have a JS frontend, and your platform's SDK does not offer a feedback API.*\n\nFeedback must be received by the server no more than 30 minutes after the event was saved.\n\nAdditionally, within 5 minutes of submitting feedback it may also be overwritten. This is useful in situations where you may need to retry sending a request due to network failures.\n\nIf feedback is rejected due to a mutability threshold, a 409 status code will be returned.\n\nNote: Feedback may be submitted with DSN authentication (see auth documentation).",
     "operationId": "Submit User Feedback",
+    "deprecated": true,
     "parameters": [
       {
         "name": "organization_id_or_slug",

api-docs/paths/releases/organization-releases.json

@@ -21,6 +21,25 @@
           "type": "string"
         }
       },
+      {
+        "name": "project",
+        "in": "query",
+        "description": "The IDs or slugs of projects to filter releases by. This parameter may be repeated to filter by multiple projects. Omit to include all accessible projects; `-1` includes all accessible projects.",
+        "schema": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      {
+        "name": "per_page",
+        "in": "query",
+        "description": "The number of releases to return per page. Default and maximum allowed is 100.",
+        "schema": {
+          "type": "integer"
+        }
+      },
       {
         "$ref": "../../components/parameters/pagination-cursor.json#/PaginationCursor"
       }

bin/split-silo-database

@@ -71,24 +71,24 @@ def split_database(tables: list[str], source: str, destination: str, reset: bool
 
 
 def revise_organization_mappings(legacy_region_name: str):
-    if settings.SENTRY_MONOLITH_REGION == legacy_region_name:
+    if settings.SENTRY_FALLBACK_CELL == legacy_region_name:
         click.echo(
-            "> No OrganizationMapping have been modified. Set 'SENTRY_MONOLITH_REGION' in sentry.conf.py to update monolith mappings."
+            "> No OrganizationMapping have been modified. Set 'SENTRY_FALLBACK_CELL' in sentry.conf.py to update monolith mappings."
         )
     else:
         qs = OrganizationMapping.objects.filter(cell_name=legacy_region_name)
         record_count = len(qs)
-        qs.update(cell_name=settings.SENTRY_MONOLITH_REGION)
+        qs.update(cell_name=settings.SENTRY_FALLBACK_CELL)
         click.echo(
-            f"> {record_count} OrganizationMapping record(s) have been updated from '{legacy_region_name}' to '{settings.SENTRY_MONOLITH_REGION}'"
+            f"> {record_count} OrganizationMapping record(s) have been updated from '{legacy_region_name}' to '{settings.SENTRY_FALLBACK_CELL}'"
         )
 
 
 @click.command()
 @click.option(
     "--legacy-region-name",
     default="--monolith--",
-    help="Previous value of settings.SENTRY_MONOLITH_REGION to overwrite in organization mappings",
+    help="Previous value of settings.SENTRY_FALLBACK_CELL to overwrite in organization mappings",
 )
 @click.option("--verbose", default=False, is_flag=True, help="Enable verbose logging")
 @click.option(

fixtures/emails/alert.txt

@@ -20,6 +20,7 @@ Tags
 * client_os.name = Windows
 * device = Other
 * environment = prod
+* interface_type = stacktrace
 * level = error
 * logger = javascript
 * sentry:user = id:1

fixtures/emails/n1_api_call.txt

@@ -24,6 +24,7 @@ Tags
 * effectiveConnectionType = 4g
 * environment = production
 * hardwareConcurrency = 10
+* interface_type = spans
 * lcp.element = body > div#__next > h1
 * lcp.size = 5738
 * level = info

fixtures/emails/performance.txt

@@ -22,6 +22,7 @@ Tags
 * device.family = Mac
 * environment = production
 * http.status_code = 200
+* interface_type = spans
 * level = info
 * runtime = CPython 3.8.9
 * runtime.name = CPython