Merge branch 'master' into ryan953/rm-nonbadges

Author: ryan953

CHANGES

@@ -1,3 +1,35 @@
+24.4.0
+------
+
+### Various fixes & improvements
+
+- Revert "ref(stories): Collapse `app` root (#68939)" (13dcc607) by @getsentry-bot
+- feat(ui): Add `actor` to delegating Avatar component (#68933) by @evanpurkhiser
+- ref(ui): Consolidate TeamBadge (#68927) by @evanpurkhiser
+- ref(stories): Improve types on TreeMapping (#68940) by @evanpurkhiser
+- ref(stories): Collapse `app` root (#68939) by @evanpurkhiser
+- feat(perf): Use `@sentry/status-page-list` for domain status link (#68899) by @gggritso
+- deps(ui): Update react-router to latest v3, create-react-class (#68926) by @scttcper
+- fix(trace): fix drawer bg color (#68934) by @JonasBa
+- feat(issue-details): Revise Context UI behind feature flag (#68081) by @leeandher
+- Revert "feat(replay): Persist has-viewed state to the server when replays are seen (#68743)" (ad312261) by @getsentry-bot
+- feat(perf): Bump "Requests" module from "Alpha" to "Beta" (#68930) by @gggritso
+- feat(perf): Adjust HTTP sample table column widths (#68901) by @gggritso
+- chore(self-hosted): 24.3.0 release tests (#67091) by @hubertdeng123
+- deps(ui): Remove react-test-renderer (#68929) by @scttcper
+- fix(trace): fix text overlaps (#68928) by @JonasBa
+- fix(replay): Fix canvas replays when seeking without actively playing (#68646) by @billyvg
+- fix(perf): Link Response module domains to a specific project (#68905) by @gggritso
+-  chore(issues): Remove legacy browser flag from BE  (#67717) by @leeandher
+- ref(uI): Cleanup unused ts-ignore after update (#68924) by @scttcper
+- fix(replay): Fixes type error if same param is in url (#68851) by @c298lee
+- fix(bug): logging bug (#68919) by @ykamo001
+- fix(crons): Update slug in quotas when deleting monitors (#68917) by @evanpurkhiser
+- chore(relocation): Add server-side Sentry capture logging (#68906) by @azaslavsky
+- feat(replays): Delete videos on replay delete request (#68463) by @cmanallen
+
+_Plus 1311 more_
+
 24.3.0
 ------
 

migrations_lockfile.txt

@@ -9,5 +9,5 @@ feedback: 0004_index_together
 hybridcloud: 0016_add_control_cacheversion
 nodestore: 0002_nodestore_no_dictfield
 replays: 0004_index_together
-sentry: 0696_remove_monitor_owner_actor_id
+sentry: 0697_remove_monitor_owner_actor_id_db
 social_auth: 0002_default_auto_field

package.json

@@ -62,6 +62,7 @@
     "@sentry/node": "^7.109.0",
     "@sentry/react": "^7.109.0",
     "@sentry/release-parser": "^1.3.1",
+    "@sentry/status-page-list": "^0.0.1",
     "@sentry/types": "^7.109.0",
     "@sentry/utils": "^7.109.0",
     "@spotlightjs/spotlight": "^1.2.13",
@@ -86,7 +87,7 @@
     "@types/react-lazyload": "3.2.3",
     "@types/react-grid-layout": "^1.3.2",
     "@types/react-mentions": "4.1.6",
-    "@types/react-router": "^3.0.22",
+    "@types/react-router": "^3.0.28",
     "@types/react-select": "4.0.18",
     "@types/react-sparklines": "^1.7.2",
     "@types/react-virtualized": "^9.21.22",
@@ -157,7 +158,7 @@
     "react-lazyload": "^3.2.1",
     "react-mentions": "4.4.2",
     "react-popper": "^2.3.0",
-    "react-router": "3.2.0",
+    "react-router": "3.2.6",
     "react-select": "4.3.1",
     "react-sparklines": "1.7.0",
     "react-virtualized": "^9.22.5",
@@ -203,7 +204,6 @@
     "jest-sentry-environment": "3.0.0",
     "postcss-styled-syntax": "0.6.4",
     "react-refresh": "0.14.0",
-    "react-test-renderer": "18.2.0",
     "stylelint": "16.2.1",
     "stylelint-config-recommended": "^14.0.0",
     "terser": "5.27.0",

pyproject.toml

@@ -589,6 +589,7 @@ disable_error_code = [
 [[tool.mypy.overrides]]
 module = [
     "sentry.api.endpoints.issues.*",
+    "sentry.api.helpers.source_map_helper",
     "sentry.buffer.base",
     "sentry.buffer.redis",
     "sentry.eventstore.reprocessing.redis",

requirements-base.txt

@@ -64,10 +64,10 @@ rfc3986-validator>=0.1.1
 # [end] jsonschema format validators
 sentry-arroyo>=2.16.5
 sentry-kafka-schemas>=0.1.68
-sentry-ophio==0.2.6
+sentry-ophio==0.2.7
 sentry-redis-tools>=0.1.7
 sentry-relay>=0.8.56
-sentry-sdk>=2.0.0rc5
+sentry-sdk==2.0.0rc3
 snuba-sdk>=2.0.32
 simplejson>=3.17.6
 sqlparse>=0.4.4

requirements-dev-frozen.txt

@@ -181,10 +181,10 @@ sentry-devenv==1.6.2
 sentry-forked-django-stubs==4.2.7.post3
 sentry-forked-djangorestframework-stubs==3.14.5.post1
 sentry-kafka-schemas==0.1.68
-sentry-ophio==0.2.6
+sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.56
-sentry-sdk==2.0.0rc5
+sentry-sdk==2.0.0rc3
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0

requirements-frozen.txt

@@ -121,10 +121,10 @@ rsa==4.8
 s3transfer==0.10.0
 sentry-arroyo==2.16.5
 sentry-kafka-schemas==0.1.68
-sentry-ophio==0.2.6
+sentry-ophio==0.2.7
 sentry-redis-tools==0.1.7
 sentry-relay==0.8.56
-sentry-sdk==2.0.0rc5
+sentry-sdk==2.0.0rc3
 sentry-usage-accountant==0.0.10
 simplejson==3.17.6
 six==1.16.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sentry
-version = 24.4.0.dev0
+version = 24.5.0.dev0
 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

@@ -6,6 +6,7 @@
 from urllib.parse import quote as urlquote
 
 import sentry_sdk
+from django.http import HttpRequest
 from django.utils import timezone
 from rest_framework.exceptions import ParseError, ValidationError
 from rest_framework.request import Request
@@ -125,7 +126,7 @@ def get_snuba_dataclass(
             return params, filter_params
 
     def get_snuba_params(
-        self, request: Request, organization: Organization, check_global_views: bool = True
+        self, request: HttpRequest, organization: Organization, check_global_views: bool = True
     ) -> ParamsType:
         with sentry_sdk.start_span(op="discover.endpoint", description="filter_params"):
             if (

src/sentry/api/endpoints/organization_events_trace.py

@@ -3,7 +3,7 @@
 from collections.abc import Callable, Iterable, Mapping, Sequence
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime, timedelta
-from typing import Any, Deque, Optional, TypedDict, TypeVar, cast
+from typing import Any, Deque, Optional, TypedDict, TypeVar
 
 import sentry_sdk
 from django.http import Http404, HttpRequest, HttpResponse
@@ -44,11 +44,13 @@
     "SnubaTransaction",
     {
         "id": str,
+        "issue_occurrences": Sequence[IssueOccurrence],
         "transaction.status": int,
         "transaction.op": str,
         "transaction.duration": int,
         "transaction": str,
         "timestamp": str,
+        "occurrence_spans": Sequence[dict[str, object]],
         "precise.start_ts": int,
         "precise.finish_ts": int,
         "trace.span": str,
@@ -187,7 +189,7 @@ def nodestore_event(self) -> Event | None:
                 )
         return self._nodestore_event
 
-    def load_performance_issues(self, light: bool, snuba_params: ParamsType) -> None:
+    def load_performance_issues(self, light: bool, snuba_params: ParamsType | None) -> None:
         """Doesn't get suspect spans, since we don't need that for the light view"""
         for group_id in self.event["issue.ids"]:
             group = Group.objects.filter(id=group_id, project=self.event["project.id"]).first()
@@ -322,7 +324,7 @@ def full_dict(
             return
         else:
             visited.add(self.event["id"])
-        result = cast(FullResponse, self.to_dict())
+        result = self.to_dict()
         if detailed and "transaction.status" in self.event:
             result.update(
                 {
@@ -423,7 +425,7 @@ def count_performance_issues(trace_id: str, params: Mapping[str, str]) -> int:
     )
     transaction_query.columns.append(Function("count()", alias="total_groups"))
     count = transaction_query.run_query("api.trace-view.count-performance-issues")
-    return cast(int, count["data"][0].get("total_groups", 0))
+    return count["data"][0].get("total_groups", 0)
 
 
 @sentry_sdk.tracing.trace
@@ -593,9 +595,7 @@ def query_trace_data(
                 for key, value in zip(result["measurements.key"], result["measurements.value"])
             }
 
-    return cast(Sequence[SnubaTransaction], transformed_results[0]), cast(
-        Sequence[SnubaError], transformed_results[1]
-    )
+    return transformed_results[0], transformed_results[1]
 
 
 def build_span_query(trace_id, spans_params, query_spans):
@@ -886,16 +886,16 @@ def get(self, request: HttpRequest, organization: Organization, trace_id: str) -
             return Response(status=404)
 
         # Detailed is deprecated now that we want to use spans instead
-        detailed: bool = request.GET.get("detailed", "0") == "1"
+        detailed = request.GET.get("detailed", "0") == "1"
         # Temporary url params until we finish migrating the frontend
-        use_spans: bool = request.GET.get("useSpans", "0") == "1"
+        use_spans = request.GET.get("useSpans", "0") == "1"
         update_snuba_params_with_timestamp(request, params)
 
         sentry_sdk.set_tag("trace_view.using_spans", str(use_spans))
         if detailed and use_spans:
             raise ParseError("Cannot return a detailed response while using spans")
-        limit: int = min(int(request.GET.get("limit", MAX_TRACE_SIZE)), 10_000)
-        event_id: str | None = request.GET.get("event_id") or request.GET.get("eventId")
+        limit = min(int(request.GET.get("limit", MAX_TRACE_SIZE)), 10_000)
+        event_id = request.GET.get("event_id") or request.GET.get("eventId")
 
         # Only need to validate event_id as trace_id is validated in the URL
         if event_id and not is_event_id(event_id):
@@ -1318,9 +1318,11 @@ def serialize(
                         parent_events[child_event["id"]] = TraceEvent(
                             child_event,
                             current_event["id"],
-                            previous_event.generation + 1
-                            if previous_event.generation is not None
-                            else None,
+                            (
+                                previous_event.generation + 1
+                                if previous_event.generation is not None
+                                else None
+                            ),
                             snuba_params=params,
                         )
                         # Add this event to its parent's children

src/sentry/api/endpoints/user_details.py

@@ -26,6 +26,7 @@
 from sentry.models.organizationmapping import OrganizationMapping
 from sentry.models.organizationmembermapping import OrganizationMemberMapping
 from sentry.models.user import User
+from sentry.models.useremail import UserEmail
 from sentry.services.hybrid_cloud.organization import organization_service
 from sentry.services.hybrid_cloud.organization.model import RpcOrganizationDeleteState
 from sentry.services.hybrid_cloud.user.serial import serialize_generic_user
@@ -184,6 +185,13 @@ def put(self, request: Request, user) -> Response:
         :param string default_issue_event: Event displayed by default, "recommended", "latest" or "oldest"
         :auth: required
         """
+        if "username" in request.data:
+            verified_email_found = UserEmail.objects.filter(
+                user_id=user.id, email=request.data["username"], is_verified=True
+            ).exists()
+            if not verified_email_found:
+                return Response({"detail": "Verified email address is not found."}, status=400)
+
         # We want to prevent superusers from setting users to superuser or staff
         # because this is only done through _admin. This will always be enforced
         # once the feature flag is removed.

src/sentry/api/helpers/default_inbound_filters.py

@@ -1,4 +1,3 @@
-from sentry import features
 from sentry.ingest import inbound_filters
 
 
@@ -13,29 +12,17 @@ def set_default_inbound_filters(
         "filtered-transaction",
     ),
 ):
-    if features.has("organizations:legacy-browser-update", organization):
-        browser_subfilters = [
-            "ie",
-            "firefox",
-            "chrome",
-            "safari",
-            "opera",
-            "opera_mini",
-            "android",
-            "edge",
-        ]
-    else:
-        browser_subfilters = [
-            "ie_pre_9",
-            "ie9",
-            "ie10",
-            "ie11",
-            "safari_pre_6",
-            "opera_pre_15",
-            "opera_mini_pre_8",
-            "android_pre_4",
-            "edge_pre_79",
-        ]
+
+    browser_subfilters = [
+        "ie",
+        "firefox",
+        "chrome",
+        "safari",
+        "opera",
+        "opera_mini",
+        "android",
+        "edge",
+    ]
 
     for filter_id in filters:
         state: dict[str, bool | list[str]] = {}