Merge branch 'master' into romtsn/feat/android-tombstones-onboarding-banner

Author: romtsn

eslint.config.ts

@@ -405,6 +405,7 @@ export default typescript.config([
       'prefer-promise-reject-errors': 'off', // Disabled in favor of @typescript-eslint/prefer-promise-reject-errors
       'object-shorthand': ['error', 'properties'],
       'prefer-arrow-callback': ['error', {allowNamedFunctions: true}],
+      quotes: ['error', 'single', {avoidEscape: true, allowTemplateLiterals: false}],
       radix: 'error',
       'require-await': 'off', // Disabled in favor of @typescript-eslint/require-await
       'spaced-comment': [

scripts/analyze-styled.ts

@@ -422,7 +422,7 @@ if (!config.startDate) {
     if (config.targetFile) {
       logger.fatal(`❌ File not found: ${config.targetFile}`);
     } else {
-      logger.fatal(`❌ No .tsx files found in search directory`);
+      logger.fatal('❌ No .tsx files found in search directory');
     }
     process.exit(1);
   }

scripts/build-js-loader.ts

@@ -17,7 +17,7 @@ import * as ts from 'typescript';
  * then verify the build output of both generated `js.tmpl` files and check all three files in.
  */
 
-const header = `{% load sentry_helpers %}`;
+const header = '{% load sentry_helpers %}';
 const loaderScriptPath = './src/sentry/templates/sentry/js-sdk-loader.ts';
 const loaderTmplPath = './src/sentry/templates/sentry/js-sdk-loader.js.tmpl';
 const loaderMinTmplPath = './src/sentry/templates/sentry/js-sdk-loader.min.js.tmpl';

scripts/routes.ts

@@ -148,7 +148,7 @@ const useDefaults = (values.defaults as boolean) ?? false;
 if (!showAll && Object.keys(userParams).length === 0 && !useDefaults) {
   const bin = path.basename(process.argv[1] ?? '');
   console.error(`Usage: node ${bin} [OPTIONS] --<param> <value> [...]`);
-  console.error(`Run with --help for full usage.`);
+  console.error('Run with --help for full usage.');
   process.exit(1);
 }
 

scripts/type-coverage-diff.ts

@@ -529,7 +529,7 @@ async function main() {
 
     console.log(
       colors.dim(
-        `\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff`
+        '\n📝 Note: Only showing type issues on lines that were literally added (+) or removed (-) in git diff'
       )
     );
 

src/sentry/api/base.py

@@ -75,6 +75,7 @@
     "all_silo_endpoint",
     "internal_cell_silo_endpoint",
     "internal_all_silo_endpoint",
+    "internal_control_silo_endpoint",
 ]
 
 PAGINATION_DEFAULT_PER_PAGE = 100
@@ -723,6 +724,12 @@ def __call__(self, decorated_obj: Any) -> Any:
 mode 404s will be returned.
 """
 
+internal_control_silo_endpoint = EndpointSiloLimit(SiloMode.CONTROL, internal=True)
+"""
+Apply to endpoints that exist in CONTROL silo that
+should not be included in the frontend URL mapping
+"""
+
 cell_silo_endpoint = EndpointSiloLimit(SiloMode.CELL)
 """
 Apply to endpoints that exist in CELL silo.

src/sentry/api/bases/organization_events.py

@@ -29,7 +29,7 @@
 from sentry.api.helpers.teams import get_teams
 from sentry.api.serializers.snuba import SnubaTSResultSerializer
 from sentry.api.utils import handle_query_errors
-from sentry.discover.arithmetic import is_equation, strip_equation
+from sentry.discover.arithmetic import is_equation, parse_arithmetic, strip_equation
 from sentry.discover.models import (
     DatasetSourcesTypes,
     DiscoverSavedQuery,
@@ -52,7 +52,7 @@
 from sentry.search.eap.occurrences.rollout_utils import EAPOccurrencesComparator
 from sentry.search.eap.types import AdditionalQueries, SupportedTraceItemType
 from sentry.search.events.constants import DURATION_UNITS, SIZE_UNITS
-from sentry.search.events.fields import get_function_alias
+from sentry.search.events.fields import get_function_alias, is_function
 from sentry.search.events.types import SAMPLING_MODES, SnubaParams
 from sentry.snuba import discover
 from sentry.snuba.dataset import Dataset
@@ -346,22 +346,25 @@ def handle_unit_meta(
 
     def _get_rate_unit(self, field: str) -> str | None:
         """Get the rate unit for a field by checking for known rate functions."""
-        # Only use the opening parenthesis to identify rate functions because
-        # some functions may contain arguments, making a direct string match not work.
-        per_second_fns = {"eps(", "sps(", "tps(", "sample_eps(", "per_second("}
-        per_minute_fns = {"epm(", "spm(", "tpm(", "sample_epm(", "per_minute("}
-
-        if any(field.startswith(fn) for fn in per_second_fns):
-            return "1/second"
-        if any(field.startswith(fn) for fn in per_minute_fns):
-            return "1/minute"
+        per_second_fns = {"eps", "sps", "tps", "sample_eps", "per_second", "per_second_if"}
+        per_minute_fns = {"epm", "spm", "tpm", "sample_epm", "per_minute", "per_minute_if"}
+
         # For equation fields, check if any known rate function appears in the expression
-        if field.startswith("equation|"):
-            for fn in per_second_fns:
-                if fn in field:
+        if is_equation(field):
+            _, _, functions = parse_arithmetic(strip_equation(field))
+            for function in functions:
+                if function_match := is_function(function):
+                    function_name = function_match.group("function")
+                    if function_name in per_second_fns:
+                        return "1/second"
+                    elif function_name in per_minute_fns:
+                        return "1/minute"
+        else:
+            if function_match := is_function(field):
+                function_name = function_match.group("function")
+                if function_name in per_second_fns:
                     return "1/second"
-            for fn in per_minute_fns:
-                if fn in field:
+                if function_name in per_minute_fns:
                     return "1/minute"
         return None
 

src/sentry/api/endpoints/organization_insights_tree.py

@@ -1,5 +1,6 @@
 import logging
 import re
+from typing import NamedTuple
 
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -12,6 +13,33 @@
 logger = logging.getLogger(__name__)
 
 
+class _ExtractionPattern(NamedTuple):
+    """Extraction pattern for component type and path from span.description.
+    group(1) = kind/type (mapped through kind_map when present), group(2) = path.
+    """
+
+    regex: re.Pattern[str]
+    kind_map: dict[str, str] | None = None
+
+
+# SDK <10.32.0: '{component_type} ({path})'
+# e.g. 'Page Server Component (/dashboard)'
+_ParenthesisPattern = _ExtractionPattern(
+    regex=re.compile(r"^(.*?)\s+\((.*?)\)$"),
+)
+
+# SDK >=10.32.0: 'resolve {page|root layout|layout} server component "{route_or_segment}"'
+# e.g. 'resolve page server component "/dashboard"'
+_ResolvePattern = _ExtractionPattern(
+    regex=re.compile(r'^resolve (page|root layout|layout) server component(?:\s+"(.*)")?$'),
+    kind_map={
+        "page": "Page Server Component",
+        "layout": "Layout Server Component",
+        "root layout": "Layout Server Component",
+    },
+)
+
+
 @cell_silo_endpoint
 class OrganizationInsightsTreeEndpoint(OrganizationEventsEndpoint):
     """
@@ -41,22 +69,27 @@ def get(self, request: Request, organization: Organization) -> Response:
         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+\((.*?)\)$")
+    _EXTRACTION_PATTERNS = (_ParenthesisPattern, _ResolvePattern)
+
+    @staticmethod
+    def _parse_path(path: str | None) -> list[str]:
+        if not path:
+            return []
+        parts = path.strip("/").split("/")
+        return parts if parts != [""] else []
 
+    def _separate_span_description_info(self, response):
         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 = []
+            component_type = None
+            path_components: list[str] = []
+
+            for pattern, kind_map in self._EXTRACTION_PATTERNS:
+                match = pattern.match(line["span.description"])
+                if match:
+                    component_type = kind_map[match.group(1)] if kind_map else match.group(1)
+                    path_components = self._parse_path(match.group(2))
+                    break
+
             line["function.nextjs.component_type"] = component_type
             line["function.nextjs.path"] = path_components
 

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

@@ -1,6 +1,8 @@
 from collections.abc import MutableMapping
 from typing import Any, TypedDict
 
+from django.db.models import prefetch_related_objects
+
 from sentry.api.serializers import Serializer, register
 from sentry.models.groupsearchview import GroupSearchView
 from sentry.models.groupsearchviewlastvisited import GroupSearchViewLastVisited
@@ -33,6 +35,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
+        prefetch_related_objects(item_list, "projects")
         attrs: MutableMapping[Any, Any] = {}
 
         last_visited_views = GroupSearchViewLastVisited.objects.filter(
@@ -68,7 +71,7 @@ def get_attrs(self, item_list, user, **kwargs) -> MutableMapping[Any, Any]:
         return attrs
 
     def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewSerializerResponse:
-        projects = [-1] if obj.is_all_projects else list(obj.projects.values_list("id", flat=True))
+        projects = [-1] if obj.is_all_projects else [p.id for p in obj.projects.all()]
 
         return {
             "id": str(obj.id),

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

@@ -3,7 +3,6 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models.groupsearchview import (
     GroupSearchViewSerializer,
-    GroupSearchViewSerializerResponse,
 )
 from sentry.models.groupsearchviewstarred import GroupSearchViewStarred
 from sentry.models.savedsearch import SORT_LITERALS
@@ -28,13 +27,14 @@ def __init__(self, *args, **kwargs):
         self.organization = kwargs.pop("organization", None)
         super().__init__(*args, **kwargs)
 
-    def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
-        serialized_view: GroupSearchViewSerializerResponse = serialize(
-            obj.group_search_view,
+    def get_attrs(self, item_list, user, **kwargs):
+        views = [item.group_search_view for item in item_list]
+        serialized_views = serialize(
+            views,
             user,
-            serializer=GroupSearchViewSerializer(
-                organization=self.organization,
-            ),
+            serializer=GroupSearchViewSerializer(organization=self.organization),
         )
+        return dict(zip(item_list, serialized_views))
 
-        return serialized_view
+    def serialize(self, obj, attrs, user, **kwargs) -> GroupSearchViewStarredSerializerResponse:
+        return attrs