Merge branch 'master' into priscila/feat/add-private-gaming-sdk-access-modal

Author: priscilawebdev

api-docs/paths/events/project-issues.json

@@ -1,7 +1,7 @@
 {
   "get": {
     "tags": ["Events"],
-    "description": "Return a list of issues (groups) bound to a project.  All parameters are supplied as query string parameters. \n\n A default query of ``is:unresolved`` is applied. To return results with other statuses send an new query value (i.e. ``?query=`` for all results).\n\nThe ``statsPeriod`` parameter can be used to select the timeline stats which should be present. Possible values are: ``\"\"`` (disable),``\"24h\"`` (default), ``\"14d\"``\n\nUser feedback items from the [User Feedback Widget](https://docs.sentry.io/product/user-feedback/#user-feedback-widget) are built off the issue platform, so to return a list of user feedback items for a specific project, filter for `issue.category:feedback`.",
+    "description": "**Deprecated**: This endpoint has been replaced with the [Organization Issues endpoint](/api/events/list-an-organizations-issues/) which\nsupports filtering on project and additional functionality.\n\nReturn a list of issues (groups) bound to a project.  All parameters are supplied as query string parameters. \n\n A default query of ``is:unresolved`` is applied. To return results with other statuses send an new query value (i.e. ``?query=`` for all results).\n\nThe ``statsPeriod`` parameter can be used to select the timeline stats which should be present. Possible values are: ``\"\"`` (disable),``\"24h\"`` (default), ``\"14d\"``\n\nUser feedback items from the [User Feedback Widget](https://docs.sentry.io/product/user-feedback/#user-feedback-widget) are built off the issue platform, so to return a list of user feedback items for a specific project, filter for `issue.category:feedback`.",
     "operationId": "List a Project's Issues",
     "parameters": [
       {

build-utils/remark-unwrap-mdx-paragraphs.ts

@@ -0,0 +1,60 @@
+import type {Node, Literal, Parent} from 'hast';
+
+import {visit} from 'unist-util-visit';
+
+/**
+ * Remark plugin that unwraps paragraphs with only JSX elements and paragraphs inside MDX components
+ *
+ * - Find paragraphs that only contain MDX JSX text and/or whitespace, replace with children
+ * - Find paragraphs that are the only children of MDX JSX elements, replace with children
+ *
+ */
+export function remarkUnwrapMdxParagraphs() {
+  return function (tree: Node) {
+    // unwrap paragraphs with only JSX text and whitespace
+    visit(tree, (node, index, parent: Parent) => {
+      if (isParagraph(node)) {
+        const hasOnlyJsxAndWhitespace = node.children.every(child => {
+          switch (true) {
+            case child.type === 'mdxJsxTextElement':
+              return true;
+            case isText(child):
+              // Allow only whitespace text nodes
+              return child.value.trim() === '';
+            default:
+              return false;
+          }
+        });
+        if (hasOnlyJsxAndWhitespace && parent && index !== undefined) {
+          // replace paragraph with its children
+          parent.children.splice(index, 1, ...node.children);
+          // return new index
+          return index + node.children.length - 1;
+        }
+      }
+      return;
+    });
+    // unwrap paragraphs that are only children of MDX JSX elements
+    visit(tree, ['mdxJsxFlowElement', 'mdxJsxTextElement'], node => {
+      if (
+        isMdxJsxNode(node) &&
+        node.children.length === 1 &&
+        isParagraph(node.children[0])
+      ) {
+        node.children = node.children[0].children;
+        return node.children.length - 1;
+      }
+      return;
+    });
+  };
+}
+
+function isParagraph(node?: Node): node is Parent {
+  return node?.type === 'paragraph';
+}
+function isText(node: Node): node is Literal {
+  return node.type === 'text';
+}
+function isMdxJsxNode(node: Node): node is Parent {
+  return node.type === 'mdxJsxFlowElement' || node.type === 'mdxJsxTextElement';
+}

fixtures/backup/datetime-millis.json

@@ -6,7 +6,7 @@
       "key": "sentry:option-with-unzeroed-millis",
       "last_updated": "2023-06-22T00:00:00.000Z",
       "last_updated_by": "unknown",
-      "value": "\"23.6.1\""
+      "value": "23.6.1"
     }
   },
   {
@@ -16,7 +16,7 @@
       "key": "sentry:option-with-zeroed-millis",
       "last_updated": "2023-06-22T00:00:00Z",
       "last_updated_by": "unknown",
-      "value": "\"23.6.1\""
+      "value": "23.6.1"
     }
   }
 ]

migrations_lockfile.txt

@@ -23,16 +23,16 @@ nodestore: 0001_squashed_0002_nodestore_no_dictfield
 
 notifications: 0001_move_notifications_models
 
-preprod: 0012_installablepreprod
+preprod: 0013_binary_uuid
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 0957_projecttemplateoption_json
+sentry: 0958_base_option_json_field
 
 social_auth: 0003_social_auth_json_field
 
 tempest: 0001_squashed_0002_make_message_type_nullable
 
 uptime: 0001_squashed_0042_extra_uptime_indexes
 
-workflow_engine: 0081_add_unique_constraint_to_detector_group
+workflow_engine: 0082_disconnect_error_detector_cron_workflows

pyproject.toml

@@ -117,7 +117,6 @@ module = [
     "sentry.eventstore.models",
     "sentry.identity.gitlab.provider",
     "sentry.identity.oauth2",
-    "sentry.incidents.endpoints.bases",
     "sentry.integrations.github.client",
     "sentry.integrations.gitlab.issues",
     "sentry.integrations.pagerduty.actions.form",
@@ -229,6 +228,7 @@ module = [
     "sentry.identity.github_enterprise.*",
     "sentry.identity.services.*",
     "sentry.identity.vsts_extension.*",
+    "sentry.incidents.endpoints.bases",
     "sentry.incidents.utils.*",
     "sentry.ingest.slicing",
     "sentry.integrations.discord.actions.*",
@@ -424,6 +424,7 @@ module = [
     "sentry.utils.iterators",
     "sentry.utils.javascript",
     "sentry.utils.kafka",
+    "sentry.utils.kafka_config",
     "sentry.utils.kvstore.*",
     "sentry.utils.lazy_service_wrapper",
     "sentry.utils.linksign",
@@ -463,6 +464,7 @@ module = [
     "sentry.workflow_engine.typings.*",
     "sentry.workflow_engine.utils.*",
     "sentry_plugins.base",
+    "social_auth.admin",
     "social_auth.migrations.*",
     "sudo.*",
     "tests.sentry.api.endpoints.issues.test_organization_derive_code_mappings",
@@ -507,7 +509,7 @@ module = [
     "tests.sentry.issues.test_status_change_consumer",
     "tests.sentry.issues.test_update_inbox",
     "tests.sentry.middleware.test_reporting_endpoint",
-    "tests.sentry.nodestore.bigtable.test_backend",
+    "tests.sentry.nodestore.*",
     "tests.sentry.organizations.*",
     "tests.sentry.post_process_forwarder.*",
     "tests.sentry.profiling.*",

rspack.config.ts

@@ -24,6 +24,8 @@ import {TsCheckerRspackPlugin} from 'ts-checker-rspack-plugin';
 
 // @ts-expect-error: ts(5097) importing `.ts` extension is required for resolution, but not enabled until `allowImportingTsExtensions` is added to tsconfig
 import LastBuiltPlugin from './build-utils/last-built-plugin.ts';
+// @ts-expect-error: ts(5097) importing `.ts` extension is required for resolution, but not enabled until `allowImportingTsExtensions` is added to tsconfig
+import {remarkUnwrapMdxParagraphs} from './build-utils/remark-unwrap-mdx-paragraphs.ts';
 import packageJson from './package.json' with {type: 'json'};
 
 const {env} = process;
@@ -296,6 +298,7 @@ const appConfig: Configuration = {
             loader: '@mdx-js/loader',
             options: {
               remarkPlugins: [
+                remarkUnwrapMdxParagraphs,
                 remarkFrontmatter,
                 remarkMdxFrontmatter,
                 remarkGfm,

src/sentry/analytics/events/weekly_report.py

@@ -1,15 +1,12 @@
 from sentry import analytics
 
 
+@analytics.eventclass("weekly_report.sent")
 class WeeklyReportSent(analytics.Event):
-    type = "weekly_report.sent"
-
-    attributes = (
-        analytics.Attribute("organization_id"),
-        analytics.Attribute("user_id"),
-        analytics.Attribute("notification_uuid"),
-        analytics.Attribute("user_project_count", type=int),
-    )
+    organization_id: int
+    user_id: int | None = None
+    notification_uuid: str
+    user_project_count: int
 
 
 analytics.register(WeeklyReportSent)

src/sentry/api/endpoints/project_rules.py

@@ -27,6 +27,7 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.slack.tasks.find_channel_id_for_rule import find_channel_id_for_rule
 from sentry.integrations.slack.utils.rule_status import RedisRuleStatus
+from sentry.models.project import Project
 from sentry.models.rule import Rule, RuleActivity, RuleActivityType
 from sentry.projects.project_rules.creator import ProjectRuleCreator
 from sentry.rules.actions import trigger_sentry_app_action_creators_for_issues
@@ -692,7 +693,7 @@ class ProjectRulesEndpoint(ProjectEndpoint):
         },
         examples=IssueAlertExamples.LIST_PROJECT_RULES,
     )
-    def get(self, request: Request, project) -> Response:
+    def get(self, request: Request, project: Project) -> Response:
         """
         Return a list of active issue alert rules bound to a project.
 
@@ -706,11 +707,15 @@ def get(self, request: Request, project) -> Response:
             status=ObjectStatus.ACTIVE,
         ).select_related("project")
 
+        expand = request.GET.getlist("expand", ["lastTriggered"])
+
         return self.paginate(
             request=request,
             queryset=queryset,
             order_by="-id",
-            on_results=lambda x: serialize(x, request.user),
+            on_results=lambda x: serialize(
+                x, request.user, RuleSerializer(expand=expand, project_slug=project.slug)
+            ),
         )
 
     @extend_schema(

src/sentry/api/helpers/group_index/delete.py

@@ -10,9 +10,11 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from sentry import audit_log, eventstream
+from sentry import audit_log, eventstream, options
 from sentry.api.base import audit_logger
+from sentry.deletions.defaults.group import GROUP_CHUNK_SIZE
 from sentry.deletions.tasks.groups import delete_groups as delete_groups_task
+from sentry.deletions.tasks.groups import delete_groups_for_project
 from sentry.issues.grouptype import GroupCategory
 from sentry.models.group import Group, GroupStatus
 from sentry.models.grouphash import GroupHash
@@ -47,6 +49,11 @@ def delete_group_list(
     # deterministic sort for sanity, and for very large deletions we'll
     # delete the "smaller" groups first
     group_list.sort(key=lambda g: (g.times_seen, g.id))
+
+    # Assert that all groups belong to the same project
+    if not all(g.project_id == project.id for g in group_list):
+        raise ValueError("All groups must belong to the same project")
+
     group_ids = []
     error_ids = []
     for g in group_list:
@@ -80,8 +87,6 @@ def delete_group_list(
         status__in=[GroupStatus.PENDING_DELETION, GroupStatus.DELETION_IN_PROGRESS]
     ).update(status=GroupStatus.PENDING_DELETION, substatus=None)
 
-    eventstream_state = eventstream.backend.start_delete_groups(project.id, group_ids)
-
     # The moment groups are marked as pending deletion, we create audit entries
     # so that we can see who requested the deletion. Even if anything after this point
     # fails, we will still have a record of who requested the deletion.
@@ -95,13 +100,25 @@ def delete_group_list(
     # `Group` instances that are pending deletion
     GroupInbox.objects.filter(project_id=project.id, group__id__in=group_ids).delete()
 
-    delete_groups_task.apply_async(
-        kwargs={
-            "object_ids": group_ids,
-            "transaction_id": str(transaction_id),
-            "eventstream_state": eventstream_state,
-        }
-    )
+    if options.get("deletions.groups.use-new-task"):
+        # Schedule a task per GROUP_CHUNK_SIZE batch of groups
+        for i in range(0, len(group_ids), GROUP_CHUNK_SIZE):
+            delete_groups_for_project.apply_async(
+                kwargs={
+                    "project_id": project.id,
+                    "object_ids": group_ids[i : i + GROUP_CHUNK_SIZE],
+                    "transaction_id": str(transaction_id),
+                }
+            )
+    else:
+        eventstream_state = eventstream.backend.start_delete_groups(project.id, group_ids)
+        delete_groups_task.apply_async(
+            kwargs={
+                "object_ids": group_ids,
+                "transaction_id": str(transaction_id),
+                "eventstream_state": eventstream_state,
+            }
+        )
 
 
 def create_audit_entries(

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

@@ -233,9 +233,9 @@ def get_attrs(self, item_list, user, **kwargs):
                     rule_id = workflow_rule_lookup.get(wfh["workflow_id"])
                     if rule_id:
                         # Take the maximum date between RuleFireHistory and WorkflowFireHistory
-                        existing_date = last_triggered_lookup[rule_id]
+                        existing_date = last_triggered_lookup.get(rule_id)
                         new_date = wfh["date_added"]
-                        if new_date > existing_date:
+                        if (existing_date and new_date > existing_date) or not existing_date:
                             last_triggered_lookup[rule_id] = new_date
 
             # Set the results