Merge branch 'master' into kcons/remap

Author: kcons

.github/workflows/backend.yml

@@ -253,9 +253,7 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     steps:
-      - # get a non-default github token so that any changes are verified by CI
-        if: env.SECRET_ACCESS == 'true'
-        uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc # v3.0.0
+      - uses: getsentry/action-github-app-token@d4b5da6c5e37703f8c3b3e43abb5705b46e159cc # v3.0.0
         id: token
         with:
           app_id: ${{ vars.SENTRY_INTERNAL_APP_ID }}
@@ -265,7 +263,6 @@ jobs:
 
       - name: Setup sentry env
         uses: ./.github/actions/setup-sentry
-        id: setup
         with:
           mode: backend-ci
 
@@ -274,8 +271,7 @@ jobs:
           python3 -m tools.api_urls_to_typescript
 
       - name: Apply any file changes
-        # note: this runs "always" or else it's skipped when pre-commit fails
-        if: env.SECRET_ACCESS == 'true' && startsWith(github.ref, 'refs/pull') && always()
+        if: github.ref != 'refs/heads/master' && always()
         uses: getsentry/action-github-commit@31f6706ca1a7b9ad6d22c1b07bf3a92eabb05632 # v2.0.0
         with:
           github-token: ${{ steps.token.outputs.token }}

AGENTS.md

@@ -319,6 +319,22 @@ class MyPermission(SentryPermission):
     }
 ```
 
+### Options System
+
+Sentry uses a centralized options system where all options are registered in `src/sentry/options/defaults.py` with required default values.
+
+```python
+# CORRECT: options.get() without default - registered default is used
+from sentry import options
+
+batch_size = options.get("deletions.group-hash-metadata.batch-size")
+
+# WRONG: Redundant default value
+batch_size = options.get("deletions.group-hash-metadata.batch-size", 1000)
+```
+
+**Important**: Never suggest adding a default value to `options.get()` calls. All options are registered via `register()` in `defaults.py` which requires a default value. The options system will always return the registered default if no value is set, making a second default parameter redundant and potentially inconsistent.
+
 ### Logging Pattern
 
 ```python
@@ -394,6 +410,61 @@ class MultiProducer:
 4. Add indexes for queries on 1M+ row tables
 5. Use `db_index=True` or `db_index_together`
 
+#### Composite Index Strategy: Match Your Query Patterns
+
+**Critical Rule**: When writing a query that filters on multiple columns simultaneously, you MUST verify that a composite index exists covering those columns in the filter order.
+
+**How to Identify When You Need a Composite Index:**
+
+1. **Look for Multi-Column Filters**: Any query using multiple columns in `.filter()` or `WHERE` clause
+2. **Check Index Coverage**: Verify the model's `Meta.indexes` includes those columns
+3. **Consider Query Order**: Index column order should match the most selective filters first
+
+**Common Patterns Requiring Composite Indexes:**
+
+```python
+# NEEDS COMPOSITE INDEX: Filtering on foreign_key_id AND id
+Model.objects.filter(
+    foreign_key_id__in=ids,  # First column
+    id__gt=last_id           # Second column
+)[:batch_size]
+# Required: Index(fields=["foreign_key", "id"])
+
+# NEEDS COMPOSITE INDEX: Status + timestamp range queries
+Model.objects.filter(
+    status="open",           # First column
+    created_at__gte=start    # Second column
+)
+# Required: Index(fields=["status", "created_at"])
+
+# NEEDS COMPOSITE INDEX: Org + project + type lookups
+Model.objects.filter(
+    organization_id=org_id,  # First column
+    project_id=proj_id,      # Second column
+    type=event_type          # Third column
+)
+# Required: Index(fields=["organization", "project", "type"])
+```
+
+**How to Check if Index Exists:**
+
+1. Read the model file: Check the `Meta` class for `indexes = [...]`
+2. Single foreign key gets auto-index, but **NOT** when combined with other filters
+3. If you filter on FK + another column, you need explicit composite index
+
+**Red Flags to Watch For:**
+
+- Query uses `column1__in=[...]` AND `column2__gt/lt/gte/lte`
+- Query filters on FK relationship PLUS primary key or timestamp
+- Pagination queries combining filters with cursor-based `id__gt`
+- Large IN clauses combined with range filters
+
+**When in Doubt:**
+
+1. Check production query performance in Sentry issues (slow query alerts)
+2. Run `EXPLAIN ANALYZE` on similar queries against production-sized data
+3. Add the composite index if table has 1M+ rows and query runs in loops/batches
+
 ## Anti-Patterns (NEVER DO)
 
 ### Backend

fixtures/github.py

@@ -3012,7 +3012,27 @@
       "type": "User",
       "site_admin": false
     },
-    "assignees": [],
+    "assignees": [
+      {
+        "login": "octocat",
+        "id": 1,
+        "avatar_url": "https://avatars.githubusercontent.com/u/1?v=3",
+        "gravatar_id": "",
+        "url": "https://api.github.com/users/octocat",
+        "html_url": "https://github.com/octocat",
+        "followers_url": "https://api.github.com/users/octocat/followers",
+        "following_url": "https://api.github.com/users/octocat/following{/other_user}",
+        "gists_url": "https://api.github.com/users/octocat/gists{/gist_id}",
+        "starred_url": "https://api.github.com/users/octocat/starred{/owner}{/repo}",
+        "subscriptions_url": "https://api.github.com/users/octocat/subscriptions",
+        "organizations_url": "https://api.github.com/users/octocat/orgs",
+        "repos_url": "https://api.github.com/users/octocat/repos",
+        "events_url": "https://api.github.com/users/octocat/events{/privacy}",
+        "received_events_url": "https://api.github.com/users/octocat/received_events",
+        "type": "User",
+        "site_admin": false
+      }
+    ],
     "milestone": null,
     "comments": 0,
     "created_at": "2015-05-05T23:40:28Z",

jest.config.ts

@@ -253,7 +253,7 @@ if (
  * node_modules, but some packages which use ES6 syntax only NEED to be
  * transformed.
  */
-const ESM_NODE_MODULES = ['screenfull', 'cbor2', 'nuqs'];
+const ESM_NODE_MODULES = ['screenfull', 'cbor2', 'nuqs', 'color'];
 
 const config: Config.InitialOptions = {
   verbose: false,

migrations_lockfile.txt

@@ -27,16 +27,16 @@ preprod: 0018_add_preprod_artifact_app_icon_id_field
 
 prevent: 0002_alter_integration_id_not_null
 
-releases: 0002_delete_dual_written_commit_tables
+releases: 0003_real_delete_dual_written_commit_tables
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 1002_group_history_prev_history_remove_db_constraint
+sentry: 1003_group_history_prev_history_safe_removal
 
 social_auth: 0003_social_auth_json_field
 
 tempest: 0001_squashed_0002_make_message_type_nullable
 
 uptime: 0048_delete_uptime_status_columns
 
-workflow_engine: 0094_backfill_issue_stream_detector_workflows
+workflow_engine: 0095_unique_detectorgroup_group

package.json

@@ -68,9 +68,9 @@
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-player": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
-    "@sentry/core": "10.20.0",
-    "@sentry/node": "10.20.0",
-    "@sentry/react": "10.20.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/react": "10.23.0",
     "@sentry/release-parser": "^1.3.1",
     "@sentry/status-page-list": "^0.6.1",
     "@sentry/toolbar": "1.0.0-beta.16",
@@ -83,7 +83,6 @@
     "@tanstack/react-query-devtools": "5.85.0",
     "@tanstack/react-query-persist-client": "5.85.0",
     "@tanstack/react-virtual": "^3.13.6",
-    "@types/color": "^3.0.3",
     "@types/diff": "5.2.1",
     "@types/gtag.js": "^0.0.12",
     "@types/history": "^3.2.5",
@@ -110,7 +109,7 @@
     "buffer": "^6.0.3",
     "cbor2": "^1.12.0",
     "classnames": "2.3.1",
-    "color": "^4.2.3",
+    "color": "5.0.2",
     "compression-webpack-plugin": "11.1.0",
     "conduit-client": "^0.4.0",
     "core-js": "3.45.0",
@@ -120,7 +119,7 @@
     "dompurify": "3.2.5",
     "downsample": "1.4.0",
     "echarts": "6.0.0",
-    "echarts-for-react": "3.0.4",
+    "echarts-for-react": "3.0.5",
     "esbuild": "0.25.10",
     "focus-trap": "7.6.5",
     "framer-motion": "12.23.12",
@@ -190,7 +189,7 @@
     "@prettier/plugin-oxc": "0.0.4",
     "@sentry-internal/rrweb-types": "2.40.0",
     "@sentry/jest-environment": "6.1.0",
-    "@sentry/profiling-node": "10.20.0",
+    "@sentry/profiling-node": "10.23.0",
     "@styled/typescript-styled-plugin": "^1.0.1",
     "@tanstack/eslint-plugin-query": "5.83.1",
     "@testing-library/dom": "10.4.0",