Merge branch 'master' into tkdodo/ref/knip-zero

Author: TkDodo

migrations_lockfile.txt

@@ -21,7 +21,7 @@ nodestore: 0001_squashed_0002_nodestore_no_dictfield
 
 replays: 0001_squashed_0005_drop_replay_index
 
-sentry: 0909_django_array_field_not_release
+sentry: 0911_increase_email_model_email_field_length
 
 social_auth: 0001_squashed_0002_default_auto_field
 

src/sentry/incidents/subscription_processor.py

@@ -498,7 +498,7 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                             "organizations:workflow-engine-metric-alert-dual-processing-logs",
                             self.subscription.project.organization,
                         ):
-                            metrics.incr("dual_processing.alert_rules.fire")
+                            metrics.incr("dual_processing.alert_rules.resolve")
                         incident_trigger = self.trigger_resolve_threshold(
                             trigger, aggregation_value
                         )

src/sentry/integrations/tasks/sync_status_outbound.py

@@ -1,5 +1,6 @@
 from sentry import analytics, features
 from sentry.constants import ObjectStatus
+from sentry.integrations.base import IntegrationInstallation
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.project_management.metrics import (
@@ -8,7 +9,7 @@
 )
 from sentry.integrations.services.integration import integration_service
 from sentry.models.group import Group, GroupStatus
-from sentry.shared_integrations.exceptions import IntegrationFormError
+from sentry.shared_integrations.exceptions import ApiUnauthorized, IntegrationFormError
 from sentry.silo.base import SiloMode
 from sentry.tasks.base import instrumented_task, retry, track_group_async_operation
 from sentry.taskworker.config import TaskworkerConfig
@@ -55,7 +56,9 @@ def sync_status_outbound(group_id: int, external_issue_id: int) -> bool | None:
     )
     if not integration:
         return None
-    installation = integration.get_installation(organization_id=external_issue.organization_id)
+    installation: IntegrationInstallation = integration.get_installation(
+        organization_id=external_issue.organization_id
+    )
     if not (hasattr(installation, "should_sync") and hasattr(installation, "sync_status_outbound")):
         return None
 
@@ -76,7 +79,7 @@ def sync_status_outbound(group_id: int, external_issue_id: int) -> bool | None:
                 installation.sync_status_outbound(
                     external_issue, group.status == GroupStatus.RESOLVED, group.project_id
                 )
-            except IntegrationFormError as e:
+            except (IntegrationFormError, ApiUnauthorized) as e:
                 lifecycle.record_halt(halt_reason=e)
                 return None
             analytics.record(

src/sentry/integrations/utils/metrics.py

@@ -108,6 +108,9 @@ def __init__(self, payload: EventLifecycleMetric, assume_success: bool = True) -
         self._state: EventLifecycleOutcome | None = None
         self._extra = dict(self.payload.get_extras())
 
+    def get_state(self) -> EventLifecycleOutcome | None:
+        return self._state
+
     def add_extra(self, name: str, value: Any) -> None:
         """Add a value to logged "extra" data.
 

src/sentry/integrations/vsts/issues.py

@@ -2,7 +2,7 @@
 
 from abc import ABC
 from collections.abc import Mapping, MutableMapping, Sequence
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, NoReturn
 
 from django.urls import reverse
 from django.utils.translation import gettext as _
@@ -17,6 +17,7 @@
 from sentry.models.activity import Activity
 from sentry.shared_integrations.exceptions import ApiError, ApiUnauthorized, IntegrationError
 from sentry.silo.base import all_silo_function
+from sentry.users.models.identity import Identity
 from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
@@ -25,6 +26,12 @@
     from sentry.integrations.models.external_issue import ExternalIssue
     from sentry.models.group import Group
 
+# Specific substring to identify Azure Entra ID "identity deleted" errors
+# Example: According to Microsoft Entra, your Identity xxx is currently Deleted within the following Microsoft Entra tenant: xxx Please contact your Microsoft Entra administrator to resolve this.
+VSTS_IDENTITY_DELETED_ERROR_SUBSTRING = [
+    "is currently Deleted within the following Microsoft Entra tenant"
+]
+
 
 class VstsIssuesSpec(IssueSyncIntegration, SourceCodeIssueIntegration, ABC):
     description = "Integrate Azure DevOps work items by linking a project."
@@ -46,6 +53,14 @@ def create_default_repo_choice(self, default_repo: str) -> tuple[str, str]:
         project = self.get_client().get_project(default_repo)
         return (project["id"], project["name"])
 
+    def raise_error(self, exc: Exception, identity: Identity | None = None) -> NoReturn:
+        # Reraise Azure Specific Errors correctly
+        if isinstance(exc, ApiError) and any(
+            substring in str(exc) for substring in VSTS_IDENTITY_DELETED_ERROR_SUBSTRING
+        ):
+            raise ApiUnauthorized(text=str(exc))
+        raise super().raise_error(exc, identity)
+
     def get_project_choices(
         self, group: Group | None = None, **kwargs: Any
     ) -> tuple[str | None, Sequence[tuple[str, str]]]:

src/sentry/migrations/0910_make_organizationmemberteam_is_active_default.py

@@ -0,0 +1,33 @@
+# Generated by Django 5.2.1 on 2025-05-21 20:55
+
+from django.db import migrations, models
+
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0909_django_array_field_not_release"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="organizationmemberteam",
+            name="is_active",
+            field=models.BooleanField(db_default=True),
+        ),
+    ]

src/sentry/migrations/0911_increase_email_model_email_field_length.py

@@ -0,0 +1,39 @@
+# Generated by Django 5.2.1 on 2025-05-21 23:05
+
+from django.db import migrations, models
+
+import sentry.db.models.fields.citext
+from sentry.new_migrations.migrations import CheckedMigration
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production.
+    # This should only be used for operations where it's safe to run the migration after your
+    # code has deployed. So this should not be used for most operations that alter the schema
+    # of a table.
+    # Here are some things that make sense to mark as post deployment:
+    # - Large data migrations. Typically we want these to be run manually so that they can be
+    #   monitored and not block the deploy for a long period of time while they run.
+    # - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
+    #   run this outside deployments so that we don't block them. Note that while adding an index
+    #   is a schema change, it's completely safe to run the operation after the code has deployed.
+    # Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment
+
+    is_post_deployment = False
+
+    dependencies = [
+        ("sentry", "0910_make_organizationmemberteam_is_active_default"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="email",
+            name="email",
+            field=sentry.db.models.fields.citext.CIEmailField(max_length=200, unique=True),
+        ),
+        migrations.AlterField(
+            model_name="useremail",
+            name="email",
+            field=models.EmailField(max_length=200),
+        ),
+    ]

src/sentry/models/organizationmemberteam.py

@@ -31,7 +31,7 @@ class OrganizationMemberTeam(ReplicatedRegionModel):
     organizationmember = FlexibleForeignKey("sentry.OrganizationMember")
     # an inactive membership simply removes the team from the default list
     # but still allows them to re-join without request
-    is_active = models.BooleanField(default=True)
+    is_active = models.BooleanField(db_default=True)
     role = models.CharField(max_length=32, null=True, blank=True)
 
     class Meta:

src/sentry/users/models/email.py

@@ -22,7 +22,7 @@ class Email(Model):
     __relocation_dependencies__ = {"sentry.User"}
     __relocation_custom_ordinal__ = ["email"]
 
-    email = CIEmailField(_("email address"), unique=True, max_length=75)
+    email = CIEmailField(_("email address"), unique=True, max_length=200)
     date_added = models.DateTimeField(default=timezone.now)
 
     class Meta:

src/sentry/users/models/useremail.py

@@ -59,7 +59,7 @@ class UserEmail(ControlOutboxProducingModel):
     __relocation_custom_ordinal__ = ["user", "email"]
 
     user = FlexibleForeignKey(settings.AUTH_USER_MODEL, related_name="emails")
-    email = models.EmailField(_("email address"), max_length=75)
+    email = models.EmailField(_("email address"), max_length=200)
     validation_hash = models.CharField(max_length=32, default=get_secure_token)
     date_hash_added = models.DateTimeField(default=timezone.now)
     is_verified = models.BooleanField(

src/sentry/workflow_engine/processors/workflow.py

@@ -313,9 +313,10 @@ def process_workflows(event_data: WorkflowEventData) -> set[Workflow]:
             },
         )
     # in order to check if workflow engine is firing 1:1 with the old system, we must only count once rather than each action
-    metrics.incr(
-        "workflow_engine.process_workflows.fired_actions",
-        tags={"detector_type": detector.type},
-    )
+    if len(actions) > 0:
+        metrics.incr(
+            "workflow_engine.process_workflows.fired_actions",
+            tags={"detector_type": detector.type},
+        )
 
     return triggered_workflows

static/app/components/searchQueryBuilder/context.tsx

@@ -36,6 +36,7 @@ interface SearchQueryBuilderContextData {
   filterKeys: TagCollection;
   focusOverride: FocusOverride | null;
   getFieldDefinition: (key: string, kind?: FieldKind) => FieldDefinition | null;
+  getSuggestedFilterKey: (key: string) => string | null;
   getTagValues: (tag: Tag, query: string) => Promise<string[]>;
   handleSearch: (query: string) => void;
   parseQuery: (query: string) => ParseResult | null;
@@ -78,6 +79,7 @@ export function SearchQueryBuilderProvider({
   filterKeys,
   filterKeyMenuWidth = 360,
   filterKeySections,
+  getSuggestedFilterKey,
   getTagValues,
   onSearch,
   placeholder,
@@ -139,6 +141,7 @@ export function SearchQueryBuilderProvider({
       filterKeySections: filterKeySections ?? [],
       filterKeyMenuWidth,
       filterKeys,
+      getSuggestedFilterKey: getSuggestedFilterKey ?? ((key: string) => key),
       getTagValues,
       getFieldDefinition: fieldDefinitionGetter,
       dispatch,
@@ -160,6 +163,7 @@ export function SearchQueryBuilderProvider({
     filterKeySections,
     filterKeyMenuWidth,
     filterKeys,
+    getSuggestedFilterKey,
     getTagValues,
     fieldDefinitionGetter,
     dispatch,

static/app/components/searchQueryBuilder/index.spec.tsx

@@ -90,8 +90,8 @@ const FILTER_KEYS: TagCollection = {
     key: 'tags[foo,string]',
     name: 'foo',
   },
-  'tags[bar,string]': {
-    key: 'tags[bar,string]',
+  'tags[bar,number]': {
+    key: 'tags[bar,number]',
     name: 'bar',
   },
 };
@@ -3458,4 +3458,90 @@ describe('SearchQueryBuilder', function () {
       expect(option).toHaveTextContent('bar');
     });
   });
+
+  describe('autocomplete using suggestions', function () {
+    function getSuggestedFilterKey(key: string) {
+      if (key === 'foo') {
+        return 'tags[foo,string]';
+      }
+
+      if (key === 'bar') {
+        return 'tags[bar,number]';
+      }
+
+      return key;
+    }
+
+    it('replace string key with suggestion when autocompleting', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(getLastInput());
+      await userEvent.keyboard('foo:');
+      await userEvent.keyboard('{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[foo,string]'})
+      ).toHaveTextContent('foo');
+    });
+
+    it('replace number key with suggestion when autocompleting', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(getLastInput());
+      await userEvent.keyboard('bar:');
+      await userEvent.keyboard('{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[bar,number]'})
+      ).toHaveTextContent('bar');
+    });
+
+    it('replaces string key with suggestion on enter', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          initialQuery="browser.name:firefox"
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(
+        screen.getByRole('button', {name: 'Edit key for filter: browser.name'})
+      );
+      await userEvent.keyboard('foo{Enter}{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[foo,string]'})
+      ).toHaveTextContent('foo');
+    });
+
+    it('replaces number key with suggestion on enter', async function () {
+      render(
+        <SearchQueryBuilder
+          {...defaultProps}
+          initialQuery="browser.name:firefox"
+          getSuggestedFilterKey={getSuggestedFilterKey}
+        />
+      );
+
+      await userEvent.click(
+        screen.getByRole('button', {name: 'Edit key for filter: browser.name'})
+      );
+      await userEvent.keyboard('bar{Enter}{Escape}');
+
+      expect(
+        screen.getByRole('button', {name: 'Edit key for filter: tags[bar,number]'})
+      ).toHaveTextContent('bar');
+    });
+  });
 });

static/app/components/searchQueryBuilder/index.tsx

@@ -81,6 +81,13 @@ export interface SearchQueryBuilderProps {
    * will only render a warning if the value is truthy
    */
   getFilterTokenWarning?: (key: string) => React.ReactNode;
+  /**
+   * This is used when a user types in a search key and submits the token.
+   * The submission happens when the user types a colon or presses enter.
+   * When this happens, this function is used to map the user input to a
+   * known column.
+   */
+  getSuggestedFilterKey?: (key: string) => string | null;
   /**
    * Allows for customization of the invalid token messages.
    */