Merge branch 'master' into joseph/webhooks

Author: joseph-sentry

.github/CODEOWNERS

@@ -368,8 +368,6 @@ tests/sentry/api/endpoints/test_organization_dashboard_widget_details.py     @ge
 /src/sentry/toolbar/                         @getsentry/replay-frontend @getsentry/replay-backend
 /tests/sentry/toolbar/                       @getsentry/replay-frontend @getsentry/replay-backend
 /static/app/components/devtoolbar/           @getsentry/replay-frontend
-/src/sentry/middleware/devtoolbar.py         @getsentry/replay-backend
-/tests/sentry/middleware/test_devtoolbar.py  @getsentry/replay-backend
 ## End of DevToolbar
 
 ## Codecov Merge UX

eslint.config.mjs

@@ -43,6 +43,7 @@ export const typeAwareLintRules = {
   rules: {
     '@typescript-eslint/await-thenable': 'error',
     '@typescript-eslint/no-array-delete': 'error',
+    '@typescript-eslint/no-base-to-string': 'error',
     '@typescript-eslint/no-for-in-array': 'error',
     '@typescript-eslint/no-unnecessary-type-assertion': 'error',
     '@typescript-eslint/prefer-optional-chain': 'error',

migrations_lockfile.txt

@@ -21,12 +21,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0005_drop_replay_index
 
-sentry: 0896_org_level_access_not_null
+sentry: 0904_onboarding_task_project_id_idx
 
 social_auth: 0002_default_auto_field
 
 tempest: 0002_make_message_type_nullable
 
-uptime: 0041_uptime_backfill_detector_grouphash
+uptime: 0042_extra_uptime_indexes
 
-workflow_engine: 0060_rename_azure_devops_action_to_vsts
+workflow_engine: 0062_workflow_engine_missing_indexes

package.json

@@ -182,6 +182,7 @@
     "@eslint/compat": "^1.2.7",
     "@eslint/eslintrc": "^3.3.0",
     "@eslint/js": "^9.22.0",
+    "@mdx-js/loader": "^3.1.0",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.16",
     "@sentry/jest-environment": "6.0.0",
     "@sentry/profiling-node": "9.16.1",
@@ -250,11 +251,12 @@
     "fix:eslint": "eslint --fix",
     "fix:prettier": "prettier \"**/*.md\" \"**/*.yaml\" \"**/*.[jt]s(x)?\" --write --log-level=error",
     "dev": "(yarn check --verify-tree || yarn install --check-files) && sentry devserver",
-    "dev-ui": "SENTRY_UI_DEV_ONLY=1 SENTRY_WEBPACK_PROXY_PORT=7999 SENTRY_UI_HOT_RELOAD=1 webpack serve",
+    "dev-ui": "yarn dev-ui-rspack",
+    "dev-ui-webpack": "SENTRY_UI_DEV_ONLY=1 SENTRY_WEBPACK_PROXY_PORT=7999 SENTRY_UI_HOT_RELOAD=1 webpack serve",
     "dev-ui-rspack": "SENTRY_UI_DEV_ONLY=1 SENTRY_WEBPACK_PROXY_PORT=7999 SENTRY_UI_HOT_RELOAD=1 rspack serve",
     "dev-ui-admin": "SENTRY_ADMIN_UI_DEV=1 yarn dev-ui",
-    "dev-ui-admin-rspack": "SENTRY_ADMIN_UI_DEV=1 yarn dev-ui-rspack",
     "dev-ui-storybook": "STORYBOOK_TYPES=1 yarn dev-ui",
+    "dev-ui-storybook-rspack": "STORYBOOK_TYPES=1 yarn dev-ui-rspack",
     "dev-acceptance": "NO_DEV_SERVER=1 NODE_ENV=development webpack --watch",
     "dev-acceptance-rspack": "NO_DEV_SERVER=1 NODE_ENV=development rspack --watch",
     "webpack-profile": "NO_TS_FORK=1 webpack --profile --json > stats.json",

requirements-dev-frozen.txt

@@ -203,7 +203,7 @@ sortedcontainers==2.4.0
 soupsieve==2.3.2.post1
 sqlparse==0.5.0
 statsd==3.3.0
-stripe==5.5.0
+stripe==6.7.0
 structlog==22.1.0
 supervisor==4.2.5
 symbolic==12.14.1

requirements-frozen.txt

@@ -140,7 +140,7 @@ snuba-sdk==3.0.43
 soupsieve==2.3.2.post1
 sqlparse==0.5.0
 statsd==3.3.0
-stripe==5.5.0
+stripe==6.7.0
 structlog==22.1.0
 symbolic==12.14.1
 tiktoken==0.8.0

requirements-getsentry.txt

@@ -11,4 +11,4 @@ iso3166
 pycountry==17.5.14
 pyvat==1.3.15
 reportlab==4.4.0
-stripe==5.5.0
+stripe==6.7.0

rspack.config.ts

@@ -7,6 +7,7 @@ import type {
   DevServer,
   OptimizationSplitChunksCacheGroup,
   RspackPluginInstance,
+  RuleSetRule,
 } from '@rspack/core';
 import rspack from '@rspack/core';
 import ReactRefreshRspackPlugin from '@rspack/plugin-react-refresh';
@@ -170,6 +171,35 @@ for (const locale of supportedLocales) {
   };
 }
 
+const swcReactLoaderConfig: RuleSetRule['options'] = {
+  jsc: {
+    experimental: {
+      plugins: [
+        [
+          '@swc/plugin-emotion',
+          {
+            sourceMap: true,
+            // The "dev-only" option does not seem to apply correctly
+            autoLabel: DEV_MODE ? 'always' : 'never',
+          },
+        ],
+      ],
+    },
+    parser: {
+      syntax: 'typescript',
+      tsx: true,
+    },
+    transform: {
+      react: {
+        runtime: 'automatic',
+        development: DEV_MODE,
+        refresh: DEV_MODE,
+        importSource: '@emotion/react',
+      },
+    },
+  },
+};
+
 /**
  * Main Webpack config for Sentry React SPA.
  */
@@ -217,34 +247,19 @@ const appConfig: Configuration = {
         test: /\.(js|jsx|ts|tsx)$/,
         exclude: /\/node_modules\//,
         loader: 'builtin:swc-loader',
-        options: {
-          jsc: {
-            experimental: {
-              plugins: [
-                [
-                  '@swc/plugin-emotion',
-                  {
-                    sourceMap: true,
-                    // The "dev-only" option does not seem to apply correctly
-                    autoLabel: DEV_MODE ? 'always' : 'never',
-                  },
-                ],
-              ],
-            },
-            parser: {
-              syntax: 'typescript',
-              tsx: true,
-            },
-            transform: {
-              react: {
-                runtime: 'automatic',
-                development: DEV_MODE,
-                refresh: DEV_MODE,
-                importSource: '@emotion/react',
-              },
-            },
+        options: swcReactLoaderConfig,
+      },
+      {
+        test: /\.mdx?$/,
+        use: [
+          {
+            loader: 'builtin:swc-loader',
+            options: swcReactLoaderConfig,
           },
-        },
+          {
+            loader: '@mdx-js/loader',
+          },
+        ],
       },
       {
         test: /\.po$/,

src/sentry/api/endpoints/group_ai_autofix.py

@@ -35,9 +35,9 @@ class GroupAutofixEndpoint(GroupAiEndpoint):
     enforce_rate_limit = True
     rate_limits = {
         "POST": {
-            RateLimitCategory.IP: RateLimit(limit=10, window=60),
-            RateLimitCategory.USER: RateLimit(limit=10, window=60),
-            RateLimitCategory.ORGANIZATION: RateLimit(limit=10, window=60),
+            RateLimitCategory.IP: RateLimit(limit=5, window=60),
+            RateLimitCategory.USER: RateLimit(limit=5, window=60),
+            RateLimitCategory.ORGANIZATION: RateLimit(limit=20, window=60 * 60),  # 1 hour
         },
         "GET": {
             RateLimitCategory.IP: RateLimit(limit=256, window=60),

src/sentry/api/endpoints/project_rule_details.py

@@ -245,6 +245,7 @@ def put(self, request: Request, project, rule) -> Response:
                 "name": data["name"],
                 "environment": data.get("environment"),
                 "project": project,
+                "project_id": project.id,
                 "action_match": data["actionMatch"],
                 "filter_match": data.get("filterMatch"),
                 "conditions": conditions,

src/sentry/api/endpoints/project_rules.py

@@ -800,6 +800,7 @@ def post(self, request: Request, project) -> Response:
             "name": data["name"],
             "environment": data.get("environment"),
             "project": project,
+            "project_id": project.id,
             "action_match": data["actionMatch"],
             "filter_match": data.get("filterMatch"),
             "conditions": conditions,

src/sentry/api/helpers/default_symbol_sources.py

@@ -4,7 +4,9 @@
 DEFAULT_SYMBOL_SOURCES = {
     "electron": ["ios", "microsoft", "electron"],
     "javascript-electron": ["ios", "microsoft", "electron"],
-    "unity": ["unity"],
+    "unity": ["unity", "nvidia", "ubuntu"],
+    "unreal": ["nvidia", "ubuntu"],
+    "godot": ["nvidia", "ubuntu"],
 }
 
 

src/sentry/api/serializers/models/rule.py

@@ -422,7 +422,7 @@ def _fetch_workflow_last_triggered(self, item_list: Sequence[Workflow]) -> dict[
         result_qs = reduce(
             lambda q1, q2: q1.union(q2),
             [
-                WorkflowFireHistory.objects.filter(workflow=item, has_fired_actions=True)
+                WorkflowFireHistory.objects.filter(workflow=item)
                 .order_by("-date_added")
                 .values("workflow_id", "date_added")[:1]
                 for item in item_list

src/sentry/api/urls.py

@@ -2914,7 +2914,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         ProjectSeerPreferencesEndpoint.as_view(),
         name="sentry-api-0-project-seer-preferences",
     ),
-    *workflow_urls.project_urlpatterns,
 ]
 
 TEAM_URLS = [

src/sentry/conf/server.py

@@ -3355,7 +3355,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 SEER_AUTOFIX_URL = SEER_DEFAULT_URL  # for local development, these share a URL
 
 SEER_GROUPING_URL = SEER_DEFAULT_URL  # for local development, these share a URL
-SEER_GROUPING_TIMEOUT = 1
 
 SEER_GROUPING_BACKFILL_URL = SEER_DEFAULT_URL
 

src/sentry/consumers/__init__.py

@@ -424,6 +424,11 @@ def ingest_transactions_options() -> list[click.Option]:
                 default=100,
                 help="The number of segments to download from redis at once. Defaults to 100.",
             ),
+            click.Option(
+                ["--max-memory-percentage", "max_memory_percentage"],
+                default=1.0,
+                help="Maximum memory usage of the Redis cluster in % (0.0-1.0) before the consumer backpressures.",
+            ),
             *multiprocessing_options(default_max_batch_size=100),
         ],
     },

src/sentry/data_export/models.py

@@ -37,7 +37,7 @@ class ExportedData(Model):
 
     organization = FlexibleForeignKey("sentry.Organization")
     user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
-    file_id = BoundedBigIntegerField(null=True)
+    file_id = BoundedBigIntegerField(null=True, db_index=True)
     date_added = models.DateTimeField(default=timezone.now)
     date_finished = models.DateTimeField(null=True)
     date_expired = models.DateTimeField(null=True, db_index=True)
@@ -161,7 +161,7 @@ class ExportedDataBlob(Model):
     __relocation_scope__ = RelocationScope.Excluded
 
     data_export = FlexibleForeignKey("sentry.ExportedData")
-    blob_id = BoundedBigIntegerField()
+    blob_id = BoundedBigIntegerField(db_index=True)
     offset = BoundedBigIntegerField()
 
     class Meta:

src/sentry/features/temporary.py

@@ -502,6 +502,8 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("organizations:jira-paginated-projects", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable single trace summary
     manager.add("organizations:single-trace-summary", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable users to connect many Sentry orgs to a single Github org
+    manager.add("organizations:github-multi-org", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable Relay extracting logs from breadcrumbs for a project.
     manager.add("projects:ourlogs-breadcrumb-extraction", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 
@@ -529,8 +531,6 @@ def register_temporary_features(manager: FeatureManager):
     manager.add("projects:use-eap-spans-for-metrics-explorer", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable tagging span with whether or not we should ingest it in the EAP
     manager.add("projects:ingest-spans-in-eap", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
-    # Enables automatically triggering issue summary on alerts
-    manager.add("projects:trigger-issue-summary-on-alerts", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Enable num events in an issue debugging
     manager.add("projects:num-events-issue-debugging", ProjectFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
 

src/sentry/grouping/api.py

@@ -16,7 +16,7 @@
     DefaultGroupingComponent,
     SystemGroupingComponent,
 )
-from sentry.grouping.enhancer import LATEST_VERSION, Enhancements, get_enhancements_version
+from sentry.grouping.enhancer import Enhancements, get_enhancements_version
 from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.grouping.strategies.base import DEFAULT_GROUPING_ENHANCEMENTS_BASE, GroupingContext
 from sentry.grouping.strategies.configurations import CONFIGURATIONS
@@ -93,14 +93,15 @@ def _get_enhancements(self, project: Project) -> str:
 
         config_id = self._get_config_id(project)
         enhancements_base = CONFIGURATIONS[config_id].enhancements_base
+        enhancements_version = get_enhancements_version(project, config_id)
 
         # Instead of parsing and dumping out config here, we can make a
         # shortcut
         from sentry.utils.cache import cache
         from sentry.utils.hashlib import md5_text
 
         cache_prefix = self.cache_prefix
-        cache_prefix += f"{LATEST_VERSION}:"
+        cache_prefix += f"{enhancements_version}:"
         cache_key = (
             cache_prefix
             + md5_text(
@@ -124,7 +125,7 @@ def _get_enhancements(self, project: Project) -> str:
             enhancements = Enhancements.from_rules_text(
                 enhancements_string,
                 bases=[enhancements_base] if enhancements_base else [],
-                version=get_enhancements_version(project, config_id),
+                version=enhancements_version,
                 referrer="project_rules",
             ).base64_string
         except InvalidEnhancerConfig:

src/sentry/grouping/strategies/base.py

@@ -11,7 +11,8 @@
     FrameGroupingComponent,
     StacktraceGroupingComponent,
 )
-from sentry.grouping.enhancer import Enhancements
+from sentry.grouping.enhancer import ENHANCEMENT_BASES, Enhancements
+from sentry.grouping.enhancer.exceptions import InvalidEnhancerConfig
 from sentry.interfaces.base import Interface
 from sentry.interfaces.exception import SingleException
 from sentry.interfaces.stacktrace import Frame, Stacktrace
@@ -305,9 +306,18 @@ def __init__(self, enhancements: str | None = None, **extra: Any):
         if enhancements is None:
             enhancements_instance = Enhancements.from_rules_text("", referrer="strategy_config")
         else:
-            enhancements_instance = Enhancements.from_base64_string(
-                enhancements, referrer="strategy_config"
-            )
+            # If the enhancements string has been loaded from an existing event, it may be from an
+            # obsolete enhancements version, in which case we just use the default enhancements for
+            # this grouping config
+            try:
+                enhancements_instance = Enhancements.from_base64_string(
+                    enhancements, referrer="strategy_config"
+                )
+            except InvalidEnhancerConfig:
+                enhancements_instance = ENHANCEMENT_BASES[
+                    self.enhancements_base or DEFAULT_GROUPING_ENHANCEMENTS_BASE
+                ]
+
         self.enhancements = enhancements_instance
 
     def __repr__(self) -> str:

src/sentry/hybridcloud/rpc/__init__.py

@@ -5,7 +5,7 @@
 import threading
 from collections.abc import Callable, Iterable, Mapping
 from enum import Enum
-from typing import Any, Generic, Protocol, Self, TypeVar, cast
+from typing import Any, Generic, Self, TypeVar, cast
 
 import pydantic
 from django.db import router, transaction
@@ -99,10 +99,6 @@ def serialize_by_field_name(
         return cls(**fields)
 
 
-class RpcModelProtocolMeta(type(RpcModel), type(Protocol)):  # type: ignore[misc]
-    """A unifying metaclass for RpcModel classes that also implement a Protocol."""
-
-
 ServiceInterface = TypeVar("ServiceInterface")
 
 

src/sentry/incidents/models/alert_rule.py

@@ -220,6 +220,7 @@ class AlertRule(Model):
     )
     description = models.CharField(max_length=1000, null=True)
     detection_type = models.CharField(
+        max_length=32,
         default=AlertRuleDetectionType.STATIC,
         db_default=AlertRuleDetectionType.STATIC,
         choices=AlertRuleDetectionType.choices,