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

# Conflicts:
#	tests/js/fixtures/dataConditions.ts
#	tests/js/fixtures/detectors.ts

Author: TkDodo

fixtures/events/performance_problems/n-plus-one-db/n-plus-one-db-mongoose.json

@@ -5,28 +5,28 @@ ahead of you.
 To resolve this, rebase against latest master and regenerate your migration. This file
 will then be regenerated, and you should be able to merge without conflicts.
 
-explore: 0004_add_explore_last_visited_table
+explore: 0001_squashed_0004_add_explore_last_visited_table
 
-feedback: 0004_index_together
+feedback: 0001_squashed_0004_index_together
 
-flags: 0004_add_flag_audit_log_provider_column
+flags: 0001_squashed_0004_add_flag_audit_log_provider_column
 
-hybridcloud: 0021_django_arrayfield_scope_list
+hybridcloud: 0001_squashed_0021_django_arrayfield_scope_list
 
-insights: 0001_add_starred_transactions_model
+insights: 0001_squashed_0001_add_starred_transactions_model
 
-monitors: 0005_record_date_in_progress_state
+monitors: 0001_squashed_0005_record_date_in_progress_state
 
-nodestore: 0002_nodestore_no_dictfield
+nodestore: 0001_squashed_0002_nodestore_no_dictfield
 
-replays: 0005_drop_replay_index
+replays: 0001_squashed_0005_drop_replay_index
 
-sentry: 0904_onboarding_task_project_id_idx
+sentry: 0908_increase_email_field_length
 
-social_auth: 0002_default_auto_field
+social_auth: 0001_squashed_0002_default_auto_field
 
-tempest: 0002_make_message_type_nullable
+tempest: 0001_squashed_0002_make_message_type_nullable
 
-uptime: 0042_extra_uptime_indexes
+uptime: 0001_squashed_0042_extra_uptime_indexes
 
-workflow_engine: 0065_add_status_to_detector_and_workflow
+workflow_engine: 0001_squashed_0065_add_status_to_detector_and_workflow

migrations_lockfile.txt

@@ -64,6 +64,9 @@ def is_not_2fa_compliant(
         if request.user.is_authenticated and request.user.is_sentry_app:
             return False
 
+        if request.user.is_anonymous:
+            return False
+
         if is_active_superuser(request):
             return False
 

src/sentry/api/bases/organization.py

@@ -63,13 +63,15 @@ class TraceExplorerAIQuery(OrganizationEndpoint):
     @staticmethod
     def post(request: Request, organization: Organization) -> Response:
         """
-        Checks if we are able to run Autofix on the given group.
+        Request to translate a natural language query into a sentry EQS query.
         """
         if not request.user.is_authenticated:
             return Response(status=status.HTTP_400_BAD_REQUEST)
 
         project_ids = [int(x) for x in request.data.get("project_ids", [])]
         natural_language_query = request.data.get("natural_language_query")
+        limit = request.data.get("limit", 1)
+        use_flyout = request.data.get("use_flyout", True)
 
         if len(project_ids) == 0 or not natural_language_query:
             return Response(
@@ -102,15 +104,50 @@ def post(request: Request, organization: Organization) -> Response:
             )
         data = send_translate_request(organization.id, project_ids, natural_language_query)
 
+        # XXX: This is a fallback to support the old response format until we fully support using multiple queries on the frontend
+        if "responses" in data and use_flyout:
+            if not data["responses"]:
+                logger.info("No results found for query")
+                return Response(
+                    {"detail": "No results found for query"},
+                    status=status.HTTP_404_NOT_FOUND,
+                )
+            data = data["responses"][0]
+        if "responses" not in data:
+            return Response(
+                {
+                    "status": "ok",
+                    "query": data["query"],  # the sentry EQS query as a string
+                    "stats_period": data["stats_period"],
+                    "group_by": list(data.get("group_by", [])),
+                    "visualization": list(
+                        data.get("visualization")
+                    ),  # [{chart_type: 1, y_axes: ["count_message"]}, ...]
+                    "sort": data["sort"],
+                }
+            )
+
+        data = data["responses"][:limit]
+
+        if len(data) == 0:
+            logger.info("No results found for query")
+            return Response(
+                {"detail": "No results found for query"},
+                status=status.HTTP_404_NOT_FOUND,
+            )
+
         return Response(
             {
                 "status": "ok",
-                "query": data["query"],  # the sentry EQS query as a string
-                "stats_period": data["stats_period"],
-                "group_by": list(data.get("group_by", [])),
-                "visualization": list(
-                    data.get("visualization")
-                ),  # [{chart_type: 1, y_axes: ["count_message"]}, ...]
-                "sort": data["sort"],
+                "queries": [
+                    {
+                        "query": query["query"],
+                        "stats_period": query["stats_period"],
+                        "group_by": list(query.get("group_by", [])),
+                        "visualization": list(query.get("visualization")),
+                        "sort": query["sort"],
+                    }
+                    for query in data
+                ],
             }
         )

src/sentry/api/endpoints/trace_explorer_ai_query.py

@@ -167,24 +167,26 @@ def determine_access(
         organization = org_context.organization
         extra = {"organization_id": organization.id, "user_id": user_id}
 
-        if self.is_not_2fa_compliant(request, organization):
-            logger.info(
-                "access.not-2fa-compliant.dry-run",
-                extra=extra,
-            )
-
+        is_token_access_allowed = False
         if request.auth and request.user and request.user.is_authenticated:
             request.access = access.from_request_org_and_scopes(
                 request=request,
                 rpc_user_org_context=org_context,
                 scopes=request.auth.get_scopes(),
             )
-            return
-
-        if request.auth:
+            is_token_access_allowed = True
+        elif request.auth:
             request.access = access.from_rpc_auth(
                 auth=request.auth, rpc_user_org_context=org_context
             )
+            is_token_access_allowed = True
+
+        if is_token_access_allowed:
+            if self.is_not_2fa_compliant(request, organization):
+                logger.info(
+                    "access.not-2fa-compliant.dry-run",
+                    extra=extra,
+                )
             return
 
         request.access = access.from_request_org_and_scopes(

src/sentry/api/permissions.py

@@ -288,7 +288,7 @@ class IntegrationExamples:
                                     "featureGate": "integrations-commits",
                                 },
                                 {
-                                    "description": "Create and link Sentry issue groups directly to a GitHub issue or pull\n        request in any of your repositories, providing a quick way to jump from\n        Sentry bug to tracked issue or PR!",
+                                    "description": "Create and link Sentry issue groups directly to a GitHub issue or pull\n        request in any of your repositories, providing a quick way to jump from\n        Sentry bug to tracked issue or PR.",
                                     "featureGate": "integrations-issue-basic",
                                 },
                                 {
@@ -331,7 +331,7 @@ class IntegrationExamples:
                                     "featureGate": "integrations-commits",
                                 },
                                 {
-                                    "description": "Create and link Sentry issue groups directly to a GitHub issue or pull\n        request in any of your repositories, providing a quick way to jump from\n        Sentry bug to tracked issue or PR!",
+                                    "description": "Create and link Sentry issue groups directly to a GitHub issue or pull\n        request in any of your repositories, providing a quick way to jump from\n        Sentry bug to tracked issue or PR.",
                                     "featureGate": "integrations-issue-basic",
                                 },
                                 {
@@ -433,7 +433,7 @@ class IntegrationExamples:
                             "description": "Connect your Sentry organization into one or more of your Jira cloud instances.\nGet started streamlining your bug squashing workflow by unifying your Sentry and\nJira instances together.",
                             "features": [
                                 {
-                                    "description": "Create and link Sentry issue groups directly to a Jira ticket in any of your\n        projects, providing a quick way to jump from a Sentry bug to tracked ticket!",
+                                    "description": "Create and link Sentry issue groups directly to a Jira ticket in any of your\n        projects, providing a quick way to jump from a Sentry bug to tracked ticket.",
                                     "featureGate": "integrations-issue-basic",
                                 },
                                 {
@@ -478,7 +478,7 @@ class IntegrationExamples:
                             "description": "Connect your Sentry organization into one or more of your Jira Server instances.\nGet started streamlining your bug squashing workflow by unifying your Sentry and\nJira instances together.",
                             "features": [
                                 {
-                                    "description": "Create and link Sentry issue groups directly to a Jira ticket in any of your\n        projects, providing a quick way to jump from Sentry bug to tracked ticket!",
+                                    "description": "Create and link Sentry issue groups directly to a Jira ticket in any of your\n        projects, providing a quick way to jump from Sentry bug to tracked ticket.",
                                     "featureGate": "integrations-issue-basic",
                                 },
                                 {
@@ -707,7 +707,7 @@ class IntegrationExamples:
                                     "featureGate": "integrations-commits",
                                 },
                                 {
-                                    "description": "Create and link Sentry issue groups directly to a Azure DevOps work item in any of\n        your projects, providing a quick way to jump from Sentry bug to tracked\n        work item!",
+                                    "description": "Create and link Sentry issue groups directly to a Azure DevOps work item in any of\n        your projects, providing a quick way to jump from Sentry bug to tracked\n        work item.",
                                     "featureGate": "integrations-issue-basic",
                                 },
                                 {

src/sentry/apidocs/examples/integration_examples.py

@@ -226,7 +226,7 @@
             "features": ["issue-basic"],
             "featureDescriptions": [
                 {
-                    "description": "Create and link Sentry issue groups directly to an Asana ticket in any of your\n            projects, providing a quick way to jump from a Sentry bug to tracked ticket!",
+                    "description": "Create and link Sentry issue groups directly to an Asana ticket in any of your\n            projects, providing a quick way to jump from a Sentry bug to tracked ticket.",
                     "featureGate": "issue-basic",
                 },
                 {

src/sentry/apidocs/examples/project_examples.py

@@ -11,7 +11,7 @@
 from django.db import models
 from django.utils.safestring import SafeString
 
-from sentry.utils import metrics
+from sentry.utils import json, metrics
 
 logger = logging.getLogger("celery.pickle")
 
@@ -114,6 +114,19 @@ def apply_async(self, *args, **kwargs):
         )
         should_sample = random.random() <= settings.CELERY_PICKLE_ERROR_REPORT_SAMPLE_RATE
         if should_complain or should_sample:
+            try:
+                param_size = json.dumps({"args": args, "kwargs": kwargs})
+                metrics.distribution(
+                    "celery.task.parameter_bytes",
+                    len(param_size.encode("utf8")),
+                    tags={"taskname": self.name},
+                    sample_rate=1.0,
+                )
+            except Exception as e:
+                logger.warning(
+                    "task.payload.measure.failure", extra={"error": str(e), "task": self.name}
+                )
+
             try:
                 good_use_of_pickle_or_bad_use_of_pickle(self, args, kwargs)
             except TypeError:

src/sentry/celery.py

@@ -4,6 +4,7 @@
 )
 from django.db.models import Field, Model
 from django.db.models.base import ModelBase
+from django.db.models.constraints import BaseConstraint
 from django_zero_downtime_migrations.backends.postgres.schema import (
     DatabaseSchemaEditorMixin,
     Unsafe,
@@ -67,6 +68,11 @@ def create_model(self, model: type[Model]) -> None:
             self.execute("CREATE EXTENSION IF NOT EXISTS btree_gist;")
         super().create_model(model)
 
+    def add_constraint(self, model: type[Model], constraint: BaseConstraint) -> None:
+        if isinstance(constraint, ExclusionConstraint):
+            self.execute("CREATE EXTENSION IF NOT EXISTS btree_gist;")
+        super().add_constraint(model, constraint)
+
 
 class SafePostgresDatabaseSchemaEditor(DatabaseSchemaEditorMixin, PostgresDatabaseSchemaEditor):
     add_field = translate_unsafeoperation_exception(PostgresDatabaseSchemaEditor.add_field)