Merge branch 'master' into billy/replay-2-releases-drawer-needs-to-have-deeplinks

Author: billyvg

.github/workflows/backend.yml

@@ -87,13 +87,15 @@ jobs:
       fail-fast: false
       matrix:
         # XXX: When updating this, make sure you also update MATRIX_INSTANCE_TOTAL.
-        instance: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
+        instance:
+          [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
         pg-version: ['14']
 
     env:
       # XXX: `MATRIX_INSTANCE_TOTAL` must be hardcoded to the length of `strategy.matrix.instance`.
       # If this increases, make sure to also increase `flags.backend.after_n_builds` in `codecov.yml`.
-      MATRIX_INSTANCE_TOTAL: 11
+      MATRIX_INSTANCE_TOTAL: 22
+      TEST_GROUP_STRATEGY: roundrobin
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

.vscode/settings.json

@@ -33,7 +33,8 @@
     "editor.tabSize": 4,
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-      "source.organizeImports": "explicit"
+      "source.organizeImports": "explicit",
+      "source.unusedImports": "explicit"
     },
     "editor.defaultFormatter": "ms-python.black-formatter"
   },

eslint.config.mjs

@@ -632,7 +632,7 @@ export default typescript.config([
       'unicorn/prefer-array-flat-map': 'error',
       'unicorn/prefer-array-flat': 'off', // TODO(ryan953): Fix violations and enable this rule
       'unicorn/prefer-array-index-of': 'error',
-      'unicorn/prefer-array-some': 'off', // TODO(ryan953): Fix violations and enable this rule
+      'unicorn/prefer-array-some': 'error',
       'unicorn/prefer-date-now': 'error',
       'unicorn/prefer-default-parameters': 'warn', // TODO(ryan953): Fix violations and enable this rule
       'unicorn/prefer-export-from': 'off', // TODO(ryan953): Fix violations and enable this rule

migrations_lockfile.txt

@@ -19,12 +19,12 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0004_index_together
 
-sentry: 0864_move_monitors
+sentry: 0865_file_offsets
 
 social_auth: 0002_default_auto_field
 
 tempest: 0002_make_message_type_nullable
 
 uptime: 0031_translate_uptime_object_headers_to_lists_take_three
 
-workflow_engine: 0042_workflow_fire_history_add_fired_actions_bool
+workflow_engine: 0043_create_incidentgroupopenperiod_lookup_table

requirements-base.txt

@@ -65,8 +65,8 @@ requests>=2.32.3
 rfc3339-validator>=0.1.2
 rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
-sentry-arroyo>=2.20.8
-sentry-kafka-schemas>=1.1.4
+sentry-arroyo>=2.21.0
+sentry-kafka-schemas>=1.1.6
 sentry-ophio==1.0.0
 sentry-protos>=0.1.66
 sentry-redis-tools>=0.5.0

requirements-dev-frozen.txt

@@ -180,14 +180,14 @@ rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
 selenium==4.16.0
-sentry-arroyo==2.20.8
+sentry-arroyo==2.21.0
 sentry-cli==2.16.0
 sentry-covdefaults-disable-branch-coverage==1.0.2
 sentry-devenv==1.16.0
 sentry-forked-django-stubs==5.1.3.post2
 sentry-forked-djangorestframework-stubs==3.15.3.post1
 sentry-forked-email-reply-parser==0.5.12.post1
-sentry-kafka-schemas==1.1.4
+sentry-kafka-schemas==1.1.6
 sentry-ophio==1.0.0
 sentry-protos==0.1.66
 sentry-redis-tools==0.5.0

requirements-frozen.txt

@@ -123,9 +123,9 @@ rfc3986-validator==0.1.1
 rpds-py==0.20.0
 rsa==4.8
 s3transfer==0.10.0
-sentry-arroyo==2.20.8
+sentry-arroyo==2.21.0
 sentry-forked-email-reply-parser==0.5.12.post1
-sentry-kafka-schemas==1.1.4
+sentry-kafka-schemas==1.1.6
 sentry-ophio==1.0.0
 sentry-protos==0.1.66
 sentry-redis-tools==0.5.0

src/sentry/api/endpoints/organization_insights_tree.py

@@ -0,0 +1,62 @@
+import logging
+import re
+
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from sentry.api.api_publish_status import ApiPublishStatus
+from sentry.api.base import region_silo_endpoint
+from sentry.api.endpoints.organization_events import OrganizationEventsEndpoint
+
+logger = logging.getLogger(__name__)
+
+
+@region_silo_endpoint
+class OrganizationInsightsTreeEndpoint(OrganizationEventsEndpoint):
+    """
+    Endpoint for querying Next.js Insights data to display a tree view of files and components.
+
+    Currently, the component and path information is extracted from the span.description field using a regex.
+    In the future, this data will be properly structured through:
+    1. The Next.js SDK adding these as explicit attributes
+    2. EAP adding support for array data storage and querying
+
+    These improvements will enable more efficient querying and level-by-level tree navigation.
+    This endpoint is temporary and will be replaced by the standard /events/ endpoint once
+    these features are implemented elsewhere in the system.
+    """
+
+    publish_status = {
+        "GET": ApiPublishStatus.EXPERIMENTAL,
+    }
+
+    def get(self, request: Request, organization) -> Response:
+        if not self.has_feature(organization, request):
+            return Response(status=404)
+
+        if not request.GET.get("useRpc", False) or not request.GET.get("noPagination", False):
+            return Response(status=404)
+
+        response = super().get(request, organization)
+        return self._separate_span_description_info(response)
+
+    def _separate_span_description_info(self, response):
+        # Regex to split string into '{component_type}{space}({path})'
+        pattern = re.compile(r"^(.*?)\s+\((.*?)\)$")
+
+        for line in response.data["data"]:
+            match = pattern.match(line["span.description"])
+            if match:
+                component_type = match.group(1)
+                path = match.group(2)
+                path_components = path.strip("/").split("/")
+                if not path_components or (len(path_components) == 1 and path_components[0] == ""):
+                    path_components = ["/"]  # Handle root path case
+
+            else:
+                component_type = None
+                path_components = []
+            line["function.nextjs.component_type"] = component_type
+            line["function.nextjs.path"] = path_components
+
+        return response

src/sentry/api/endpoints/organization_pinned_searches.py

@@ -66,7 +66,14 @@ def put(self, request: Request, organization) -> Response:
                 "visibility": GroupSearchViewVisibility.ORGANIZATION,
             },
         )
-        default_view_id = default_view.id if created else default_view
+        if created:
+            default_view_id = default_view.id
+        else:
+            default_view_id = GroupSearchView.objects.get(
+                organization=organization,
+                user_id=request.user.id,
+            ).id
+
         GroupSearchViewStarred.objects.create_or_update(
             organization=organization,
             user_id=request.user.id,

src/sentry/api/endpoints/warmup.py

@@ -1,9 +1,17 @@
+import django.db.models.sql.compiler  # NOQA
 from django.conf import settings
 from django.urls import reverse
-from django.utils.translation import override
+from django.utils import translation
 from rest_framework.request import Request
 from rest_framework.response import Response
 
+import sentry.identity.services.identity.impl  # NOQA
+import sentry.integrations.services.integration.impl  # NOQA
+import sentry.middleware.integrations.parsers.plugin  # NOQA
+import sentry.notifications.services.impl  # NOQA
+import sentry.sentry_apps.services.app.impl  # NOQA
+import sentry.users.services.user.impl  # NOQA
+import sentry.users.services.user_option.impl  # NOQA
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, all_silo_endpoint
@@ -24,7 +32,17 @@ def get(self, request: Request) -> Response:
         # this fixes an issue we were seeing where many languages trying
         # to resolve at once would cause lock contention
         for lang, _ in settings.LANGUAGES:
-            with override(lang):
+            with translation.override(lang):
                 reverse("sentry-warmup")
 
+        # for each possible language we support, warm up the translations
+        # cache for faster access
+        for lang, _ in settings.LANGUAGES:
+            try:
+                language = translation.get_supported_language_variant(lang)
+            except LookupError:
+                pass
+            else:
+                translation.activate(language)
+
         return Response(200)

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

@@ -34,19 +34,20 @@ class ExploreSavedQueryResponse(ExploreSavedQueryResponseOptional):
     lastVisited: str
     createdBy: UserSerializerResponse
     starred: bool
+    position: int | None
 
 
 @register(ExploreSavedQuery)
 class ExploreSavedQueryModelSerializer(Serializer):
     def get_attrs(self, item_list, user, **kwargs):
         result: DefaultDict[str, dict] = defaultdict(lambda: {"created_by": {}})
 
-        starred_query_ids = set(
+        starred_queries = dict(
             ExploreSavedQueryStarred.objects.filter(
                 explore_saved_query__in=item_list,
                 user_id=user.id,
                 organization=item_list[0].organization if item_list else None,
-            ).values_list("explore_saved_query_id", flat=True)
+            ).values_list("explore_saved_query_id", "position")
         )
 
         service_serialized = user_service.serialize_many(
@@ -65,7 +66,12 @@ def get_attrs(self, item_list, user, **kwargs):
             result[explore_saved_query]["created_by"] = serialized_users.get(
                 str(explore_saved_query.created_by_id)
             )
-            result[explore_saved_query]["starred"] = explore_saved_query.id in starred_query_ids
+            if explore_saved_query.id in starred_queries:
+                result[explore_saved_query]["starred"] = True
+                result[explore_saved_query]["position"] = starred_queries[explore_saved_query.id]
+            else:
+                result[explore_saved_query]["starred"] = False
+                result[explore_saved_query]["position"] = None
 
         return result
 
@@ -89,6 +95,7 @@ def serialize(self, obj, attrs, user, **kwargs) -> ExploreSavedQueryResponse:
             "lastVisited": obj.last_visited,
             "createdBy": attrs.get("created_by"),
             "starred": attrs.get("starred"),
+            "position": attrs.get("position"),
         }
 
         for key in query_keys:

src/sentry/api/urls.py

@@ -16,6 +16,7 @@
     OrganizationEventsRootCauseAnalysisEndpoint,
 )
 from sentry.api.endpoints.organization_fork import OrganizationForkEndpoint
+from sentry.api.endpoints.organization_insights_tree import OrganizationInsightsTreeEndpoint
 from sentry.api.endpoints.organization_member_invite.details import (
     OrganizationMemberInviteDetailsEndpoint,
 )
@@ -2901,6 +2902,11 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         name="sentry-api-0-project-seer-preferences",
     ),
     *workflow_urls.project_urlpatterns,
+    re_path(
+        r"^(?P<organization_id_or_slug>[^\/]+)/insights/tree/$",
+        OrganizationInsightsTreeEndpoint.as_view(),
+        name="sentry-api-0-organization-insights-tree",
+    ),
 ]
 
 TEAM_URLS = [

src/sentry/backup/comparators.py

@@ -918,6 +918,9 @@ def get_default_comparators() -> dict[str, list[JSONScrubbingComparator]]:
             "workflow_engine.dataconditionalertruletrigger": [
                 DateUpdatedComparator("date_updated", "date_added")
             ],
+            "workflow_engine.incidentgroupopenperiod": [
+                DateUpdatedComparator("date_updated", "date_added")
+            ],
             "tempest.tempestcredentials": [
                 DateUpdatedComparator("date_updated", "date_added"),
             ],

src/sentry/db/models/fields/bounded.py

@@ -11,11 +11,16 @@
     "BoundedBigIntegerField",
     "BoundedPositiveIntegerField",
     "BoundedPositiveBigIntegerField",
+    "WrappingU32IntegerField",
 )
 
+I32_MAX = 2_147_483_647  # 2**31 - 1
+U32_MAX = 4_294_967_295  # 2**32 - 1
+I64_MAX = 9_223_372_036_854_775_807  # 2**63 - 1
+
 
 class BoundedIntegerField(models.IntegerField):
-    MAX_VALUE = 2147483647
+    MAX_VALUE = I32_MAX
 
     def get_prep_value(self, value: int) -> int:
         if value:
@@ -25,7 +30,7 @@ def get_prep_value(self, value: int) -> int:
 
 
 class BoundedPositiveIntegerField(models.PositiveIntegerField):
-    MAX_VALUE = 2147483647
+    MAX_VALUE = I32_MAX
 
     def get_prep_value(self, value: int) -> int:
         if value:
@@ -34,8 +39,35 @@ def get_prep_value(self, value: int) -> int:
         return super().get_prep_value(value)
 
 
+class WrappingU32IntegerField(models.IntegerField):
+    """
+    This type allows storing a full unsigned `u32` value by manually wrapping it around,
+    so it is stored as a signed `i32` value in the database.
+    """
+
+    MIN_VALUE = 0
+    MAX_VALUE = U32_MAX
+
+    def get_prep_value(self, value: int) -> int:
+        if value:
+            value = int(value)
+            assert self.MIN_VALUE <= value <= self.MAX_VALUE
+
+            if value > I32_MAX:
+                value = value - 2**32
+
+        return super().get_prep_value(value)
+
+    def from_db_value(self, value: int | None, expression, connection) -> int | None:
+        if value is None:
+            return None
+        if value < 0:
+            return value + 2**32
+        return value
+
+
 class BoundedAutoField(models.AutoField):
-    MAX_VALUE = 2147483647
+    MAX_VALUE = I32_MAX
 
     def get_prep_value(self, value: int) -> int:
         if value:
@@ -49,7 +81,7 @@ def get_prep_value(self, value: int) -> int:
     class BoundedBigIntegerField(models.BigIntegerField):
         description = _("Big Integer")
 
-        MAX_VALUE = 9223372036854775807
+        MAX_VALUE = I64_MAX
 
         def get_internal_type(self) -> str:
             return "BigIntegerField"
@@ -63,7 +95,7 @@ def get_prep_value(self, value: int) -> int:
     class BoundedPositiveBigIntegerField(models.PositiveBigIntegerField):
         description = _("Positive big integer")
 
-        MAX_VALUE = 9223372036854775807
+        MAX_VALUE = I64_MAX
 
         def get_internal_type(self) -> str:
             return "PositiveBigIntegerField"
@@ -77,7 +109,7 @@ def get_prep_value(self, value: int) -> int:
     class BoundedBigAutoField(models.BigAutoField):
         description = _("Big Integer")
 
-        MAX_VALUE = 9223372036854775807
+        MAX_VALUE = I64_MAX
 
         def get_internal_type(self) -> str:
             return "BigAutoField"