Merge branch 'master' into zc/add-back-in-actor-constraints-idempotent

Author: corps

migrations_lockfile.txt

@@ -6,5 +6,5 @@ To resolve this, rebase against latest master and regenerate your migration. Thi
 will then be regenerated, and you should be able to merge without conflicts.
 
 nodestore: 0002_nodestore_no_dictfield
-sentry: 0416_add_actor_constraints
+sentry: 0418_add_actor_constraints
 social_auth: 0001_initial

src/sentry/api/endpoints/notifications/notification_actions_available.py

@@ -2,17 +2,15 @@
 from rest_framework.response import Response
 
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.organization_flag import FlaggedOrganizationEndpoint
+from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.constants import ObjectStatus
 from sentry.models.notificationaction import NotificationAction
 from sentry.models.organization import Organization
 from sentry.services.hybrid_cloud.integration import integration_service
 
 
 @region_silo_endpoint
-class NotificationActionsAvailableEndpoint(FlaggedOrganizationEndpoint):
-    feature_flags = ["organizations:notification-actions"]
-
+class NotificationActionsAvailableEndpoint(OrganizationEndpoint):
     def get(self, request: Request, organization: Organization) -> Response:
         """
         Responds with a payload serialized directly from running the 'serialize_available' methods

src/sentry/api/endpoints/notifications/notification_actions_details.py

@@ -7,7 +7,7 @@
 
 from sentry import audit_log
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.organization_flag import FlaggedOrganizationEndpoint
+from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.exceptions import ResourceDoesNotExist
 from sentry.api.serializers import serialize
 from sentry.api.serializers.rest_framework.notification_action import NotificationActionSerializer
@@ -18,16 +18,14 @@
 
 
 @region_silo_endpoint
-class NotificationActionsDetailsEndpoint(FlaggedOrganizationEndpoint):
+class NotificationActionsDetailsEndpoint(OrganizationEndpoint):
     """
     Manages a single NotificationAction via the action_id passed in the path.
     GET: Returns the serialized NotificationAction
     PUT: Update the entire NotificationAction, overwriting previous values
     DELETE: Delete the NotificationAction
     """
 
-    feature_flags = ["organizations:notification-actions"]
-
     def convert_args(self, request: Request, action_id: int, *args, **kwargs):
         parsed_args, parsed_kwargs = super().convert_args(request, *args, **kwargs)
         organization = parsed_kwargs["organization"]

src/sentry/api/endpoints/notifications/notification_actions_index.py

@@ -8,7 +8,7 @@
 
 from sentry import audit_log
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases.organization_flag import FlaggedOrganizationEndpoint
+from sentry.api.bases.organization import OrganizationEndpoint
 from sentry.api.paginator import OffsetPaginator
 from sentry.api.serializers.base import serialize
 from sentry.api.serializers.rest_framework.notification_action import NotificationActionSerializer
@@ -19,15 +19,13 @@
 
 
 @region_silo_endpoint
-class NotificationActionsIndexEndpoint(FlaggedOrganizationEndpoint):
+class NotificationActionsIndexEndpoint(OrganizationEndpoint):
     """
     View existing NotificationActions or create a new one.
     GET: Returns paginated, serialized NotificationActions for an organization
     POST: Create a new NotificationAction
     """
 
-    feature_flags = ["organizations:notification-actions"]
-
     def get(self, request: Request, organization: Organization) -> Response:
         queryset = NotificationAction.objects.filter(organization_id=organization.id)
         # If a project query is specified, filter out non-project-specific actions

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

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 from collections import defaultdict
 from datetime import datetime
 from typing import Any, Sequence
@@ -27,6 +28,7 @@
 CRASH_FILE_TYPES = {"event.minidump"}
 RESERVED_KEYS = frozenset(["user", "sdk", "device", "contexts"])
 FORMATTED_BREADCRUMB_CATEGORIES = frozenset(["query", "sql.query"])
+SQL_DOUBLEQUOTES_REGEX = re.compile(r"\"([a-zA-Z0-9_]+?)\"")
 
 
 def get_crash_files(events):
@@ -370,6 +372,9 @@ def _get_perf_problem(self, attrs):
         converted_problem["issueType"] = get_group_type_by_type_id(issue_type).slug
         return converted_problem
 
+    def _remove_doublequotes(self, message: str):
+        return SQL_DOUBLEQUOTES_REGEX.sub(r"\1", message)
+
     def _format_breadcrumb_messages(
         self, event_data: dict[str, Any], event: Event | GroupEvent, user: User
     ):
@@ -389,8 +394,13 @@ def _format_breadcrumb_messages(
                     breadcrumb_item["messageFormat"] = "sql"
                     breadcrumb_item["messageRaw"] = breadcrumb_item["message"]
                     breadcrumb_item["message"] = sqlparse.format(
-                        breadcrumb_item["message"], reindent_aligned=True
+                        breadcrumb_item["message"], reindent=True, wrap_after=80
                     )
+                    if breadcrumb_item["message"] != breadcrumb_item["messageRaw"]:
+                        breadcrumb_item["message"] = self._remove_doublequotes(
+                            breadcrumb_item["message"]
+                        )
+
             return event_data
         except Exception as exc:
             sentry_sdk.capture_exception(exc)

src/sentry/conf/server.py

@@ -1304,8 +1304,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME():
     "organizations:starfish-view": False,
     # Enable Session Stats down to a minute resolution
     "organizations:minute-resolution-sessions": True,
-    # Enable access to Notification Actions and their endpoints
-    "organizations:notification-actions": False,
     # Notify all project members when fallthrough is disabled, instead of just the auto-assignee
     "organizations:notification-all-recipients": False,
     # Enable performance issues dev options, includes changing detection thresholds and other parts of issues that we're using for development.

src/sentry/deletions/defaults/project.py

@@ -32,7 +32,6 @@ def get_child_relations(self, instance):
             models.GroupShare,
             models.GroupSubscription,
             models.LatestAppConnectBuildsCheck,
-            Monitor,
             models.ProjectBookmark,
             models.ProjectKey,
             models.ProjectTeam,
@@ -55,6 +54,7 @@ def get_child_relations(self, instance):
                 for m in model_list
             ]
         )
+        relations.append(ModelRelation(Monitor, {"project_id": instance.id}))
         relations.append(ModelRelation(models.Group, {"project_id": instance.id}))
         relations.append(
             ModelRelation(

src/sentry/features/__init__.py

@@ -113,7 +113,6 @@
 default_manager.add("organizations:device-class-synthesis", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:monitors", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:new-weekly-report", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
-default_manager.add("organizations:notification-actions", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:notification-all-recipients", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:onboarding", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)  # Only enabled in sentry.io to enable onboarding flows.
 default_manager.add("organizations:org-subdomains", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)

src/sentry/migrations/0416_drop_until_escalating_in_groupsnooze.py

@@ -0,0 +1,40 @@
+# Generated by Django 2.2.28 on 2023-04-06 21:30
+
+from django.db import migrations
+
+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. For
+    # the most part, 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 dangerous:
+    # - Large data migrations. Typically we want these to be run manually by ops 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
+    #   have ops run this and not block the deploy. Note that while adding an index is a schema
+    #   change, it's completely safe to run the operation after the code has deployed.
+    is_dangerous = False
+
+    dependencies = [
+        ("sentry", "0415_backfill_actor_team_and_user"),
+    ]
+
+    operations = [
+        migrations.SeparateDatabaseAndState(
+            database_operations=[
+                migrations.RunSQL(
+                    """
+                    ALTER TABLE "sentry_groupsnooze" DROP COLUMN "until_escalating";
+                    """,
+                    reverse_sql="""
+                    ALTER TABLE "sentry_groupsnooze" ADD COLUMN "until_escalating" BOOLEAN DEFAULT false
+                    """,
+                    hints={"tables": ["sentry_groupsnooze"]},
+                )
+            ],
+            state_operations=[],
+        )
+    ]

src/sentry/migrations/0417_backfill_groupedmessage_substatus.py

@@ -0,0 +1,70 @@
+# Generated by Django 2.2.28 on 2023-04-07 23:43
+
+from django.db import connection, migrations
+from psycopg2.extras import execute_values
+
+from sentry.models import GroupStatus, GroupSubStatus
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.utils.query import RangeQuerySetWrapperWithProgressBar
+
+BATCH_SIZE = 100
+
+UPDATE_QUERY = """
+    UPDATE sentry_groupedmessage
+    SET substatus = data.substatus
+    FROM (VALUES %s) as data (id, substatus)
+    WHERE sentry_groupedmessage.id = data.id
+"""
+
+
+def backfill_substatus(apps, schema_editor):
+    Group = apps.get_model("sentry", "Group")
+
+    queryset = RangeQuerySetWrapperWithProgressBar(
+        Group.objects.filter(status__in=(GroupStatus.UNRESOLVED, GroupStatus.IGNORED)).values_list(
+            "id", "status", "substatus"
+        ),
+        result_value_getter=lambda item: item[0],
+    )
+
+    cursor = connection.cursor()
+    batch = []
+
+    for group_id, status, substatus in queryset:
+        if status == GroupStatus.UNRESOLVED and substatus is None:
+            batch.append((group_id, GroupSubStatus.ONGOING))
+        elif status == GroupStatus.IGNORED and substatus is None:
+            batch.append((group_id, GroupSubStatus.UNTIL_ESCALATING))
+
+        if len(batch) >= BATCH_SIZE:
+            execute_values(cursor, UPDATE_QUERY, batch, page_size=BATCH_SIZE)
+            batch = []
+
+    if batch:
+        execute_values(cursor, UPDATE_QUERY, batch, page_size=BATCH_SIZE)
+
+
+class Migration(CheckedMigration):
+    # This flag is used to mark that a migration shouldn't be automatically run in production. For
+    # the most part, 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 dangerous:
+    # - Large data migrations. Typically we want these to be run manually by ops 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
+    #   have ops run this and not block the deploy. Note that while adding an index is a schema
+    #   change, it's completely safe to run the operation after the code has deployed.
+    is_dangerous = True
+
+    dependencies = [
+        ("sentry", "0416_drop_until_escalating_in_groupsnooze"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            backfill_substatus,
+            reverse_code=migrations.RunPython.noop,
+            hints={"tables": ["sentry_groupedmessage"]},
+        ),
+    ]