[pull] master from getsentry:master

.github/CODEOWNERS

@@ -23,6 +23,7 @@
 /bin/mock*                                              @getsentry/app-backend
 /src/sentry/data/samples/                               @getsentry/app-backend
 /src/sentry/cache/                                      @getsentry/app-backend
+/tests/sentry/cache/                                    @getsentry/app-backend
 /src/sentry/conf/                                       @getsentry/app-backend
 /src/sentry/db/models/                                  @getsentry/app-backend
 /src/sentry/models/                                     @getsentry/app-backend
@@ -330,6 +331,8 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/api/endpoints/test_organization_traces.py                             @getsentry/explore
 
 /static/app/views/explore/                                                @getsentry/explore
+/static/app/views/explore/logs/logsTabSeerComboBox.tsx                    @getsentry/explore @getsentry/machine-learning-ai
+/static/app/views/explore/spans/spansTabSeerComboBox.tsx                  @getsentry/explore @getsentry/machine-learning-ai
 /static/app/views/traces/                                                 @getsentry/explore
 /static/app/components/quickTrace/                                        @getsentry/explore
 /src/sentry/insights/                                                     @getsentry/data-browsing
@@ -339,6 +342,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/events/interfaces/spans/                           @getsentry/data-browsing
 /static/app/components/events/viewHierarchy/*                             @getsentry/data-browsing
 /static/app/components/searchQueryBuilder/                                @getsentry/data-browsing
+/static/app/components/searchQueryBuilder/askSeerCombobox/                @getsentry/data-browsing @getsentry/machine-learning-ai
 /static/app/components/arithmeticBuilder/                                 @getsentry/data-browsing
 
 /static/app/components/charts/                                            @getsentry/data-browsing
@@ -349,6 +353,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/modals/widgetViewerModal*                          @getsentry/dashboards
 
 /static/app/views/discover/                                               @getsentry/explore
+/static/app/views/discover/results/issueListSeerComboBox.tsx              @getsentry/explore @getsentry/machine-learning-ai
 /static/app/utils/discover/                                               @getsentry/explore
 /static/app/utils/timeSeries/                                             @getsentry/data-browsing
 ## Endof Visibility
@@ -475,6 +480,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 
 /tests/sentry_plugins/                                               @getsentry/ecosystem
 /tests/sentry/integrations/                                          @getsentry/ecosystem
+/tests/sentry/notifications/                                         @getsentry/alerts-notifications @getsentry/ecosystem
 
 # To find matching files -> find . -name "*sentry_app*.py"
 *sentry_app*.py                                                      @getsentry/product-owners-settings-integrations @getsentry/ecosystem
@@ -663,6 +669,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/components/issues/                              @getsentry/issue-workflow
 /static/app/components/stackTrace/                          @getsentry/issue-workflow
 /static/app/views/issueList/                                @getsentry/issue-workflow
+/static/app/views/issueList/issueListSeerComboBox.tsx       @getsentry/issue-workflow @getsentry/machine-learning-ai
 /static/app/views/issueList/pages/supergroups.tsx           @getsentry/issue-detection-frontend
 /static/app/views/issueList/supergroups/                    @getsentry/issue-detection-frontend
 /static/app/views/issueDetails/                             @getsentry/issue-workflow
@@ -798,6 +805,7 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /static/app/views/settings/                           @getsentry/design-engineering
 /static/app/views/nav/                                @getsentry/design-engineering
 /static/app/bootstrap/                                @getsentry/design-engineering
+/static/app/components/commandPalette/                @getsentry/design-engineering
 # Config files
 /figma.config.json                                     @getsentry/design-engineering
 /knip.config.ts                                        @getsentry/design-engineering
@@ -856,6 +864,10 @@ tests/sentry/api/endpoints/test_organization_attribute_mappings.py          @get
 /tests/sentry/conduit/                                @getsentry/sre-infrastructure-engineering
 # End of Conduit
 
+# Cell architecture
+/.agents/skills/cell-architecture                    @getsentry/sre-infrastructure-engineering
+# End of cell architecture
+
 # Foundational Storage
 /src/sentry/objectstore/                              @getsentry/foundational-storage
 /tests/sentry/objectstore/                            @getsentry/foundational-storage

.github/actions/setup-sentry/action.yml

@@ -19,6 +19,10 @@ inputs:
     description: 'Skip bringing up devservices'
     required: false
     default: 'false'
+  devservices-timeout-minutes:
+    description: 'Maximum minutes for devservices up'
+    required: false
+    default: '10'
 
 outputs:
   matrix-instance-number:
@@ -131,13 +135,15 @@ runs:
       env:
         WORKDIR: ${{ inputs.workdir }}
         ENABLE_AUTORUN_MIGRATION_SEARCH_ISSUES: '1'
+        DEVSERVICES_TIMEOUT: ${{ inputs.devservices-timeout-minutes }}
+        DEVSERVICES_MODE: ${{ inputs.mode }}
       run: |
         sentry init
 
         # This is necessary to bring up devservices with appropriate sentry config
         cd "$WORKDIR"
 
-        devservices up --mode ${{ inputs.mode }}
+        timeout "${DEVSERVICES_TIMEOUT}m" devservices up --mode "$DEVSERVICES_MODE"
 
         # have tests listen on the docker gateway ip so loopback can occur
         echo "DJANGO_LIVE_TEST_SERVER_ADDRESS=$(docker network inspect bridge --format='{{(index .IPAM.Config 0).Gateway}}')" >> "$GITHUB_ENV"

.github/codeowners-coverage-baseline.txt

@@ -2246,72 +2246,6 @@ tests/sentry/new_migrations/monkey/test_monkey.py
 tests/sentry/newsletter/__init__.py
 tests/sentry/newsletter/test_base.py
 tests/sentry/newsletter/test_dummy.py
-tests/sentry/notifications/__init__.py
-tests/sentry/notifications/api/endpoints/__init__.py
-tests/sentry/notifications/api/endpoints/test_notification_actions_available.py
-tests/sentry/notifications/api/endpoints/test_notification_actions_details.py
-tests/sentry/notifications/api/endpoints/test_notification_actions_index.py
-tests/sentry/notifications/api/endpoints/test_notification_defaults.py
-tests/sentry/notifications/api/endpoints/test_user_notification_details.py
-tests/sentry/notifications/api/endpoints/test_user_notification_email.py
-tests/sentry/notifications/api/endpoints/test_user_notification_settings_options.py
-tests/sentry/notifications/api/endpoints/test_user_notification_settings_options_details.py
-tests/sentry/notifications/api/endpoints/test_user_notification_settings_providers.py
-tests/sentry/notifications/models/test_notificationaction.py
-tests/sentry/notifications/models/test_notificationsettingoption.py
-tests/sentry/notifications/models/test_notificationsettingprovider.py
-tests/sentry/notifications/notification_action/__init__.py
-tests/sentry/notifications/notification_action/metric_alert_registry/__init__.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_discord_metric_alert_handler.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_email_metric_alert_handler.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_msteams_metric_alert_handler.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_opsgenie_metric_alert_handler.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_pagerduty_metric_alert_handler.py
-tests/sentry/notifications/notification_action/metric_alert_registry/test_slack_metric_alert_handler.py
-tests/sentry/notifications/notification_action/test_group_type_notification_registry_handlers.py
-tests/sentry/notifications/notification_action/test_grouptype.py
-tests/sentry/notifications/notification_action/test_issue_alert_registry_handlers.py
-tests/sentry/notifications/notification_action/test_metric_alert_registry_handlers.py
-tests/sentry/notifications/notifications/__init__.py
-tests/sentry/notifications/notifications/organization_request/test_integration_request.py
-tests/sentry/notifications/notifications/organization_request/test_invite_request.py
-tests/sentry/notifications/notifications/test_assigned.py
-tests/sentry/notifications/notifications/test_digests.py
-tests/sentry/notifications/notifications/test_organization_request.py
-tests/sentry/notifications/notifications/test_suspect_commits_activity.py
-tests/sentry/notifications/platform/__init__.py
-tests/sentry/notifications/platform/api/__init__.py
-tests/sentry/notifications/platform/api/endpoints/__init__.py
-tests/sentry/notifications/platform/api/endpoints/test_internal_registered_templates.py
-tests/sentry/notifications/platform/discord/__init__.py
-tests/sentry/notifications/platform/discord/test_provider.py
-tests/sentry/notifications/platform/email/__init__.py
-tests/sentry/notifications/platform/email/test_provider.py
-tests/sentry/notifications/platform/msteams/__init__.py
-tests/sentry/notifications/platform/msteams/test_provider.py
-tests/sentry/notifications/platform/slack/__init__.py
-tests/sentry/notifications/platform/slack/renderers/__init__.py
-tests/sentry/notifications/platform/slack/renderers/test_seer.py
-tests/sentry/notifications/platform/slack/test_provider.py
-tests/sentry/notifications/platform/templates/__init__.py
-tests/sentry/notifications/platform/templates/test_seer.py
-tests/sentry/notifications/platform/test_provider.py
-tests/sentry/notifications/platform/test_registry.py
-tests/sentry/notifications/platform/test_rollout.py
-tests/sentry/notifications/platform/test_service.py
-tests/sentry/notifications/platform/test_target.py
-tests/sentry/notifications/platform/test_threading.py
-tests/sentry/notifications/test_apps.py
-tests/sentry/notifications/test_class_manager.py
-tests/sentry/notifications/test_helpers.py
-tests/sentry/notifications/test_notificationcontroller.py
-tests/sentry/notifications/test_notificationmessage_table_constraints.py
-tests/sentry/notifications/test_notifications.py
-tests/sentry/notifications/test_utils.py
-tests/sentry/notifications/utils/__init__.py
-tests/sentry/notifications/utils/test_open_period.py
-tests/sentry/notifications/utils/test_participants.py
-tests/sentry/notifications/utils/test_tasks.py
 tests/sentry/onboarding_tasks/__init__.py
 tests/sentry/onboarding_tasks/backends/__init__.py
 tests/sentry/onboarding_tasks/backends/test_organization_onboarding_tasks.py

.github/workflows/codeowners-coverage.yml

@@ -28,7 +28,7 @@ jobs:
           python-version: '3.11'
 
       - name: Install codeowners-coverage
-        run: pip install codeowners-coverage==0.2.1
+        run: pip install codeowners-coverage==0.3.1
 
       - name: Run CODEOWNERS coverage check
-        run: codeowners-coverage check
+        run: codeowners-coverage check --allow-dirty-baseline

.github/workflows/frontend-snapshots.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Install sentry-cli
         if: ${{ !cancelled() }}
-        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.3 sh
+        run: curl -sL https://sentry.io/get-cli/ | SENTRY_CLI_VERSION=3.3.4-snapshot.20260325.06cbbda sh
 
       - name: Upload snapshots
         id: upload

pyproject.toml

@@ -143,7 +143,7 @@ default = true
 
 [dependency-groups]
 dev = [
-  "codeowners-coverage>=0.2.1",
+  "codeowners-coverage>=0.3.0",
   "covdefaults>=2.3.0",
   "devservices>=1.2.4",
   "docker>=7.1.0",

setup.cfg

@@ -88,6 +88,8 @@ sentry =
 # All other linting (E, W, F, B, LOG, I) is handled by ruff.
 # See [tool.ruff] in pyproject.toml for the main linting configuration.
 select = S
+# S016 is temporarily disabled until the ThreadPoolExecutor migration is complete.
+extend-ignore = S016
 per-file-ignores =
     # these scripts must have minimal dependencies so opt out of the usual sentry rules
     .github/*: S

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

@@ -629,6 +629,13 @@ def get_attrs(self, item_list: Sequence[Workflow], user, **kwargs):
             )
             serialized_actions = []
             errors = []
+
+            if len(prefetched_wdcgs) > 1:
+                errors.append(
+                    {
+                        "detail": "Multiple if/then blocks are not supported in this view. Only the first if/then block is displayed."
+                    }
+                )
             for action in actions_with_handlers:
                 action_data = action_to_action_data[action]
                 action_data["name"] = action_to_handler[action].render_label(

src/sentry/cache/backends/reconnectingmemcache.py

@@ -1,51 +1,77 @@
+import contextvars
+import threading
 import time
 from collections.abc import Mapping
-from threading import Lock
+from typing import NamedTuple
 
 import pymemcache
 from django.core.cache.backends.memcached import PyMemcacheCache
 
 from sentry.utils import metrics
 
 
+class _BackendState(NamedTuple):
+    thread_id: int
+    created_at: float
+    client: pymemcache.Client
+
+
 class ReconnectingMemcache(PyMemcacheCache):
     """
     A django cache adapter adds periodic reconnecting
     to PyMemcacheCache.
 
     Periodically this adapter will close and reconnect the underlying
     cache adapter to help even out load on Twemproxy.
+
+    Each thread gets its own pymemcache client instance. This is
+    necessary because pymemcache's HashClient is not thread-safe for
+    concurrent access (e.g. the _retry_dead method races on a shared
+    dict). Cross-thread sharing can happen when contextvars are
+    copied via copy_context(), since Django's CacheHandler stores
+    connections in a contextvar. We detect this by checking the
+    thread ID and creating a fresh client when a copied context is
+    accessed from a different thread.
     """
 
     _class: pymemcache.Client
     _options: Mapping[str, str] | None = None
 
     def __init__(self, server, params) -> None:
         self._reconnect_age: int = params.get("OPTIONS", {}).pop("reconnect_age", 300)
-        self._last_reconnect_at: float = time.time()
-        self._backend: pymemcache.Client | None = None
-        self._backend_lock = Lock()
+        self._backend_var: contextvars.ContextVar[_BackendState | None] = contextvars.ContextVar(
+            f"reconnecting_memcache_{id(self)}", default=None
+        )
 
         super().__init__(server, params)
 
     @property
-    def _cache(self) -> pymemcache.Client | None:
+    def _cache(self) -> pymemcache.Client:
         """
-        Overload PyMemcacheCache._cache with periodic reconnections.
+        Return a per-thread pymemcache client, reconnecting periodically
+        to distribute load across Twemproxy instances.
         """
-        age = time.time() - self._last_reconnect_at
-        if not self._backend or age >= self._reconnect_age:
-            try:
-                if self._backend_lock.acquire(timeout=1.0):
-                    # Close the underlying cache connection if we haven't done that recently.
-                    if self._backend:
-                        self._backend.close()
-                        self._backend = None
-                        metrics.incr("cache.memcache.reconnect")
-
-                    self._backend = self._class(self.client_servers, **self._options)
-                    self._last_reconnect_at = time.time()
-            finally:
-                self._backend_lock.release()
-
-        return self._backend
+        current_tid = threading.get_ident()
+        state = self._backend_var.get()
+
+        if state is not None:
+            # Context was copied to a different thread (e.g. via
+            # ContextPropagatingThreadPoolExecutor). pymemcache's
+            # HashClient isn't thread-safe, so create a new client.
+            if state.thread_id != current_tid:
+                state = None
+            elif time.time() - state.created_at >= self._reconnect_age:
+                state.client.close()
+                metrics.incr("cache.memcache.reconnect")
+                state = None
+
+        if state is None:
+            client = self._class(self.client_servers, **self._options)
+            state = _BackendState(
+                thread_id=current_tid,
+                created_at=time.time(),
+                client=client,
+            )
+            self._backend_var.set(state)
+
+        return state.client

src/sentry/conf/server.py

@@ -1416,7 +1416,6 @@ def custom_parameter_sort(parameter: dict) -> tuple[str, int]:
 # Sentry and internal client configuration
 
 SENTRY_EARLY_FEATURES = {
-    "organizations:performance-new-widget-designs": "Enable updated landing page widget designs",
     "organizations:profiling-global-suspect-functions": "Enable global suspect functions in profiling",
 }
 

src/sentry/features/temporary.py

@@ -198,8 +198,6 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:performance-mep-bannerless-ui", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Re-enable histograms for Metrics Enhanced Performance Views
     manager.add("organizations:performance-mep-reintroduce-histograms", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
-    # Enable updated landing page widget designs
-    manager.add("organizations:performance-new-widget-designs", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable MongoDB support for the Queries module
     manager.add("organizations:performance-queries-mongodb-extraction", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable removing the fallback for metrics compatibility
@@ -296,6 +294,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:seer-overview", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable the Seer Wizard and related prompts/links/banners
     manager.add("organizations:seer-wizard", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
+    # Enable the Seer issues view
+    manager.add("organizations:seer-issue-view", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Autofix to use Seer Explorer instead of legacy Celery pipeline
     manager.add("organizations:autofix-on-explorer", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable Autofix to use Seer Explorer V2 designs