refactor(replay) - reduce bottom header

migrations_lockfile.txt

@@ -31,7 +31,7 @@ releases: 0004_cleanup_failed_safe_deletes
 
 replays: 0006_add_bulk_delete_job
 
-sentry: 1009_add_date_updated_to_organizationmapping
+sentry: 1010_add_organizationcontributors_table
 
 social_auth: 0003_social_auth_json_field
 

package.json

@@ -68,13 +68,13 @@
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-player": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/react": "10.23.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/react": "10.27.0",
     "@sentry/release-parser": "^1.3.1",
     "@sentry/status-page-list": "^0.6.1",
     "@sentry/toolbar": "1.0.0-beta.16",
-    "@sentry/webpack-plugin": "4.4.0",
+    "@sentry/webpack-plugin": "4.6.1",
     "@stripe/react-stripe-js": "^3.9.2",
     "@stripe/stripe-js": "^5.10.0",
     "@swc/plugin-emotion": "11.0.3",
@@ -190,7 +190,7 @@
     "@prettier/plugin-oxc": "0.0.4",
     "@sentry-internal/rrweb-types": "2.40.0",
     "@sentry/jest-environment": "6.1.0",
-    "@sentry/profiling-node": "10.23.0",
+    "@sentry/profiling-node": "10.27.0",
     "@styled/typescript-styled-plugin": "^1.0.1",
     "@tanstack/eslint-plugin-query": "5.83.1",
     "@testing-library/dom": "10.4.0",
@@ -223,7 +223,7 @@
     "jest-environment-jsdom": "30.0.4",
     "jest-fail-on-console": "3.3.1",
     "jest-junit": "16.0.0",
-    "knip": "5.64.0",
+    "knip": "5.71.0",
     "postcss-styled-syntax": "0.7.0",
     "react-refresh": "0.18.0",
     "stylelint": "16.10.0",

pyproject.toml

@@ -312,7 +312,6 @@ ignore_missing_imports = true
 # - python3 -m tools.mypy_helpers.find_easiest_modules
 [[tool.mypy.overrides]]
 module = [
-    "sentry.api.endpoints.organization_events_meta",
     "sentry.api.endpoints.organization_releases",
     "sentry.api.paginator",
     "sentry.db.postgres.base",

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sentry
-version = 25.12.0.dev0
+version = 25.11.1
 description = A realtime logging and aggregation server.
 long_description = file: README.md
 long_description_content_type = text/markdown

src/sentry/api/bases/organization_events.py

@@ -215,10 +215,6 @@ def quantize_date_params(
             )
         return results
 
-
-class OrganizationEventsV2EndpointBase(OrganizationEventsEndpointBase):
-    owner = ApiOwner.DATA_BROWSING
-
     def build_cursor_link(self, request: HttpRequest, name: str, cursor: Cursor | None) -> str:
         # The base API function only uses the last query parameter, but this endpoint
         # needs all the parameters, particularly for the "field" query param.
@@ -776,7 +772,7 @@ def serialize_accuracy_data(
         return serialized_values
 
 
-class KeyTransactionBase(OrganizationEventsV2EndpointBase):
+class KeyTransactionBase(OrganizationEventsEndpointBase):
     def has_feature(self, organization: Organization, request: Request) -> bool:
         return features.has("organizations:performance-view", organization, actor=request.user)
 

src/sentry/api/endpoints/builtin_symbol_sources.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 from django.conf import settings
 from rest_framework.request import Request
 from rest_framework.response import Response
@@ -6,6 +8,8 @@
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import Endpoint, region_silo_endpoint
 from sentry.api.serializers import serialize
+from sentry.models.organization import Organization
+from sentry.utils.console_platforms import organization_has_console_platform_access
 
 
 def normalize_symbol_source(key, source):
@@ -26,10 +30,36 @@ class BuiltinSymbolSourcesEndpoint(Endpoint):
     permission_classes = ()
 
     def get(self, request: Request, **kwargs) -> Response:
-        sources = [
-            normalize_symbol_source(key, source)
-            for key, source in settings.SENTRY_BUILTIN_SOURCES.items()
-        ]
+        platform = request.GET.get("platform")
+
+        # Get organization if organization context is available
+        organization = None
+        organization_id_or_slug = kwargs.get("organization_id_or_slug")
+        if organization_id_or_slug:
+            try:
+                if str(organization_id_or_slug).isdecimal():
+                    organization = Organization.objects.get_from_cache(id=organization_id_or_slug)
+                else:
+                    organization = Organization.objects.get_from_cache(slug=organization_id_or_slug)
+            except Organization.DoesNotExist:
+                pass
+
+        sources = []
+        for key, source in settings.SENTRY_BUILTIN_SOURCES.items():
+            source_platforms: list[str] | None = cast("list[str] | None", source.get("platforms"))
+
+            # If source has platform restrictions, check if current platform matches
+            if source_platforms is not None:
+                if not platform or platform not in source_platforms:
+                    continue
+
+                # Platform matches - now check if organization has access to this console platform
+                if not organization or not organization_has_console_platform_access(
+                    organization, platform
+                ):
+                    continue
+
+            sources.append(normalize_symbol_source(key, source))
 
         sources.sort(key=lambda s: s["name"])
         return Response(serialize(sources))

src/sentry/api/endpoints/organization_ai_conversations.py

@@ -12,7 +12,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
@@ -52,7 +52,7 @@ def validate_sort(self, value):
 
 
 @region_silo_endpoint
-class OrganizationAIConversationsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationAIConversationsEndpoint(OrganizationEventsEndpointBase):
     """Endpoint for fetching AI agent conversation traces."""
 
     publish_status = {

src/sentry/api/endpoints/organization_events.py

@@ -12,7 +12,7 @@
 from sentry import features
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.helpers.error_upsampling import (
     is_errors_query_for_error_upsampled_projects,
     transform_orderby_for_error_upsampling,
@@ -85,7 +85,7 @@ class EventsApiResponse(TypedDict):
 
 @extend_schema(tags=["Discover"])
 @region_silo_endpoint
-class OrganizationEventsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PUBLIC,
     }
@@ -164,14 +164,6 @@ def get(self, request: Request, organization: Organization) -> Response:
         """
         Retrieves discover (also known as events) data for a given organization.
 
-        **Eventsv2 Deprecation Note**: Users who may be using the `eventsv2` endpoint should update their requests to the `events` endpoint outline in this document.
-        The `eventsv2` endpoint is not a public endpoint and has no guaranteed availability. If you are not making any API calls to `eventsv2`, you can safely ignore this.
-        Changes between `eventsv2` and `events` include:
-        - Field keys in the response now match the keys in the requested `field` param exactly.
-        - The `meta` object in the response now shows types in the nested `field` object.
-
-        Aside from the url change, there are no changes to the request payload itself.
-
         **Note**: This endpoint is intended to get a table of results, and is not for doing a full export of data sent to
         Sentry.
 
@@ -536,12 +528,10 @@ def get_rpc_config():
                     )
                 elif scoped_dataset == TraceMetrics:
                     # tracemetrics uses aggregate conditions
-                    metric_name, metric_type, metric_unit = get_trace_metric_from_request(request)
+                    metric = get_trace_metric_from_request(request)
 
                     return TraceMetricsSearchResolverConfig(
-                        metric_name=metric_name,
-                        metric_type=metric_type,
-                        metric_unit=metric_unit,
+                        metric=metric,
                         use_aggregate_conditions=use_aggregate_conditions,
                         auto_fields=True,
                         disable_aggregate_extrapolation=disable_aggregate_extrapolation,

src/sentry/api/endpoints/organization_events_facets.py

@@ -8,7 +8,7 @@
 from sentry import tagstore
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors, update_snuba_params_with_timestamp
 from sentry.models.organization import Organization
@@ -27,7 +27,7 @@ class _KeyTopValues(TypedDict):
 
 
 @region_silo_endpoint
-class OrganizationEventsFacetsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsFacetsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_facets_performance.py

@@ -12,7 +12,7 @@
 from sentry import features, tagstore
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
@@ -39,7 +39,7 @@
 DEFAULT_TAG_KEY_LIMIT = 5
 
 
-class OrganizationEventsFacetsPerformanceEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsFacetsPerformanceEndpointBase(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_has_measurements.py

@@ -9,7 +9,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.snuba import discover
@@ -50,7 +50,7 @@ def validate(self, data):
 
 
 @region_silo_endpoint
-class OrganizationEventsHasMeasurementsEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsHasMeasurementsEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_histogram.py

@@ -7,7 +7,7 @@
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.snuba import discover
@@ -44,7 +44,7 @@ def validate_field(self, fields):
 
 
 @region_silo_endpoint
-class OrganizationEventsHistogramEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsHistogramEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_meta.py

@@ -8,11 +8,7 @@
 from sentry import features, options, search
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import (
-    NoProjects,
-    OrganizationEventsEndpointBase,
-    OrganizationEventsV2EndpointBase,
-)
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.event_search import parse_search_query
 from sentry.api.helpers.environments import get_environment_func
 from sentry.api.helpers.group_index import build_query_params_from_request
@@ -147,13 +143,17 @@ def get(self, request: Request, organization: Organization) -> Response:
         with handle_query_errors():
             with sentry_sdk.start_span(op="discover.endpoint", name="filter_creation"):
                 projects = self.get_projects(request, organization)
+                # Filter out None values from environments
+                environments = [e for e in snuba_params.environments if e is not None]
                 query_kwargs = build_query_params_from_request(
-                    request, organization, projects, snuba_params.environments
+                    request, organization, projects, environments
                 )
                 query_kwargs["limit"] = 5
                 try:
                     # Need to escape quotes in case some "joker" has a transaction with quotes
-                    transaction_name = UNESCAPED_QUOTE_RE.sub('\\"', lookup_keys["transaction"])
+                    transaction_name = UNESCAPED_QUOTE_RE.sub(
+                        '\\"', lookup_keys["transaction"] or ""
+                    )
                     parsed_terms = parse_search_query(f'transaction:"{transaction_name}"')
                 except ParseError:
                     return Response({"detail": "Invalid transaction search"}, status=400)
@@ -181,7 +181,7 @@ def get(self, request: Request, organization: Organization) -> Response:
 
 
 @region_silo_endpoint
-class OrganizationSpansSamplesEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationSpansSamplesEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }
@@ -198,11 +198,13 @@ def get(self, request: Request, organization: Organization) -> Response:
 
         with handle_query_errors():
             if use_eap:
-                result = get_eap_span_samples(request, snuba_params, orderby)
+                result: EAPResponse | EventsResponse = get_eap_span_samples(
+                    request, snuba_params, orderby
+                )
                 dataset = Spans
             else:
                 result = get_span_samples(request, snuba_params, orderby)
-                dataset = spans_indexed
+                dataset = spans_indexed  # type: ignore[assignment]
 
         return Response(
             self.handle_results_with_meta(
@@ -282,9 +284,10 @@ def get_span_samples(
             span_ids.append(top)
 
     if len(span_ids) > 0:
-        query = f"span_id:[{','.join(span_ids)}] {request.query_params.get('query')}"
+        user_query = request.query_params.get("query") or ""
+        query = f"span_id:[{','.join(span_ids)}] {user_query}"
     else:
-        query = request.query_params.get("query")
+        query = request.query_params.get("query") or ""
 
     return spans_indexed.query(
         selected_columns=selected_columns,
@@ -320,7 +323,7 @@ def get_eap_span_samples(
         "trace",
     ]
 
-    query_string = request.query_params.get("query")
+    query_string = request.query_params.get("query") or ""
     bounds_query_string = f"{column}:>{lower_bound}ms {column}:<{upper_bound}ms {query_string}"
 
     rpc_res = Spans.run_table_query(

src/sentry/api/endpoints/organization_events_spans_histogram.py

@@ -5,7 +5,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.utils import handle_query_errors
 from sentry.models.organization import Organization
 from sentry.search.events.types import Span
@@ -36,7 +36,7 @@ def validate_span(self, span: str) -> Span:
 
 
 @region_silo_endpoint
-class OrganizationEventsSpansHistogramEndpoint(OrganizationEventsV2EndpointBase):
+class OrganizationEventsSpansHistogramEndpoint(OrganizationEventsEndpointBase):
     publish_status = {
         "GET": ApiPublishStatus.PRIVATE,
     }

src/sentry/api/endpoints/organization_events_spans_performance.py

@@ -17,7 +17,7 @@
 
 from sentry.api.api_publish_status import ApiPublishStatus
 from sentry.api.base import region_silo_endpoint
-from sentry.api.bases import NoProjects, OrganizationEventsV2EndpointBase
+from sentry.api.bases import NoProjects, OrganizationEventsEndpointBase
 from sentry.api.paginator import GenericOffsetPaginator
 from sentry.api.utils import handle_query_errors
 from sentry.discover.arithmetic import is_equation, strip_equation
@@ -86,7 +86,7 @@ class SpanPerformanceColumn:
 }
 
 
-class OrganizationEventsSpansEndpointBase(OrganizationEventsV2EndpointBase):
+class OrganizationEventsSpansEndpointBase(OrganizationEventsEndpointBase):
     def get_snuba_params(
         self,
         request: Request,