Merge branch 'master' into scttcper/resolved-release-pr-link

Author: scttcper

pyproject.toml

@@ -57,7 +57,7 @@ dependencies = [
   "mmh3>=4.0.0",
   "msgspec>=0.19.0",
   "msgpack>=1.2.1",
-  "objectstore-client>=0.1.11",
+  "objectstore-client>=0.1.13",
   "openai>=1.3.5",
   "orjson>=3.10.10",
   "packaging>=24.1",
@@ -85,7 +85,7 @@ dependencies = [
   "rfc3339-validator>=0.1.2",
   "rfc3986-validator>=0.1.1",
   # [end] jsonschema format validators
-  "sentry-arroyo>=2.41.1",
+  "sentry-arroyo>=2.41.3",
   "sentry-conventions>=0.15.0",
   "sentry-forked-email-reply-parser>=0.5.12.post1",
   "sentry-kafka-schemas>=2.1.40",

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

@@ -4,7 +4,7 @@
 from collections import defaultdict
 from collections.abc import Sequence
 from datetime import datetime, timezone
-from typing import Any, TypedDict
+from typing import Any, NotRequired, TypedDict
 
 import sentry_sdk
 import sqlparse
@@ -16,11 +16,13 @@
 from sentry.api.serializers.models.release import GroupEventReleaseSerializer
 from sentry.api.serializers.models.userreport import UserReportSerializerResponse
 from sentry.api.serializers.types import GroupEventReleaseSerializerResponse
+from sentry.eventtypes import EventTypeStr
 from sentry.grouping.api import GroupingConfig
+from sentry.interfaces.sdk import EventSdkApiContext
 from sentry.interfaces.user import EventUserApiContext
 from sentry.issues.issue_occurrence import IssueOccurrenceResponse
 from sentry.models.eventattachment import EventAttachment
-from sentry.models.eventerror import EventError
+from sentry.models.eventerror import EventError, EventErrorApiContext
 from sentry.models.release import Release
 from sentry.models.userreport import UserReport
 from sentry.sdk_updates import SdkSetupState, get_suggested_updates
@@ -53,6 +55,11 @@ class EventTag(EventTagOptional):
     value: str
 
 
+class MeasurementValue(TypedDict):
+    value: float
+    unit: NotRequired[str | None]
+
+
 def get_crash_files(events):
     event_ids = [x.event_id for x in events if x.platform == "native"]
     if event_ids:
@@ -160,12 +167,12 @@ class BaseEventSerializerResponse(TypedDict):
     size: int | None
     entries: list[Any]
     dist: str | None
-    sdk: dict[str, str]
+    sdk: EventSdkApiContext | None
     context: dict[str, Any] | None
     packages: dict[str, Any]
-    type: str
-    metadata: Any
-    errors: list[Any]
+    type: EventTypeStr
+    metadata: dict[str, Any]
+    errors: list[EventErrorApiContext]
     occurrence: IssueOccurrenceResponse | None
     _meta: dict[str, Any]
 
@@ -179,10 +186,10 @@ class ErrorEventFields(TypedDict, total=False):
 
 
 class TransactionEventFields(TypedDict, total=False):
-    startTimestamp: datetime
-    endTimestamp: datetime
-    measurements: Any
-    breakdowns: Any
+    startTimestamp: float
+    endTimestamp: float
+    measurements: dict[str, MeasurementValue] | None
+    breakdowns: dict[str, dict[str, MeasurementValue]] | None
 
 
 class EventSerializerResponse(
@@ -599,7 +606,7 @@ def serialize(self, obj, attrs, user, **kwargs):
         "platform": str | None,
         "dateCreated": datetime,
         "crashFile": str | None,
-        "metadata": dict[str, Any] | None,
+        "metadata": dict[str, Any],
     },
 )
 

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

@@ -16,6 +16,7 @@
 from sentry.api.serializers import Serializer, register, serialize
 from sentry.api.serializers.models.actor import ActorSerializer, ActorSerializerResponse
 from sentry.constants import LOG_LEVELS
+from sentry.eventtypes import EventTypeStr
 from sentry.integrations.mixins.issues import IssueBasicIntegration
 from sentry.integrations.services.integration import integration_service
 from sentry.issues.grouptype import GroupCategory
@@ -135,7 +136,7 @@ class BaseGroupSerializerResponse(BaseGroupResponseOptional):
     seerAutofixLastTriggered: datetime | None
     seerExplorerAutofixLastTriggered: datetime | None
     project: GroupProjectResponse
-    type: str
+    type: EventTypeStr
     issueType: str
     issueCategory: str
     metadata: dict[str, Any]
@@ -1201,7 +1202,7 @@ class SimpleGroupSerializerResponse(TypedDict):
     substatus: GroupSubStatusStr | None
     platform: str | None
     project: GroupProjectResponse
-    type: str
+    type: EventTypeStr
     issueType: str
     issueCategory: str
     metadata: dict[str, Any]

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

@@ -26,6 +26,7 @@
     snuba_tsdb,
 )
 from sentry.constants import StatsPeriod
+from sentry.eventtypes import EventTypeStr
 from sentry.integrations.api.serializers.models.external_issue import ExternalIssueSerializer
 from sentry.integrations.models.external_issue import ExternalIssue
 from sentry.issues.grouptype import GroupCategory
@@ -265,7 +266,7 @@ class StreamGroupSerializerSnubaResponse(TypedDict):
     seerAutofixLastTriggered: NotRequired[datetime | None]
     seerExplorerAutofixLastTriggered: NotRequired[datetime | None]
     project: NotRequired[GroupProjectResponse]
-    type: NotRequired[str]
+    type: NotRequired[EventTypeStr]
     issueType: NotRequired[str]
     issueCategory: NotRequired[str]
     metadata: NotRequired[dict[str, Any]]

src/sentry/api/urls.py

@@ -520,9 +520,6 @@
 from sentry.seer.endpoints.organization_seer_agent_pr_groups import (
     OrganizationSeerAgentPRGroupsEndpoint,
 )
-from sentry.seer.endpoints.organization_seer_agent_runs import (
-    OrganizationSeerAgentRunsEndpoint,
-)
 from sentry.seer.endpoints.organization_seer_agent_update import (
     OrganizationSeerAgentUpdateEndpoint,
 )
@@ -2361,11 +2358,6 @@ def create_group_urls(name_prefix: str) -> list[URLPattern | URLResolver]:
         OrganizationSeerAgentChatEndpoint.as_view(),
         name="sentry-api-0-organization-seer-explorer-chat-run-id",
     ),
-    re_path(
-        r"^(?P<organization_id_or_slug>[^/]+)/seer/explorer-runs/$",
-        OrganizationSeerAgentRunsEndpoint.as_view(),
-        name="sentry-api-0-organization-seer-explorer-runs",
-    ),
     re_path(
         r"^(?P<organization_id_or_slug>[^/]+)/seer/runs/$",
         OrganizationSeerRunsEndpoint.as_view(),

src/sentry/apidocs/examples/event_examples.py

@@ -2,9 +2,13 @@
 
 from drf_spectacular.utils import OpenApiExample
 
-from sentry.api.serializers.models.event import EventSerializerResponse, GroupEventDetailsResponse
+from sentry.api.serializers.models.event import (
+    EventSerializerResponse,
+    GroupEventDetailsResponse,
+    SimpleEventSerializerResponse,
+)
 
-SIMPLE_EVENT = {
+SIMPLE_EVENT: SimpleEventSerializerResponse = {
     "eventID": "9fac2ceed9344f2bbfdd1fdacb0ed9b1",
     "tags": [
         {"key": "browser", "value": "Chrome 60.0"},
@@ -16,7 +20,7 @@
         {"key": "release", "value": "17642328ead24b51867165985996d04b29310337"},
         {"key": "server_name", "value": "web1.example.com"},
     ],
-    "dateCreated": "2020-09-11T17:46:36Z",
+    "dateCreated": datetime.fromisoformat("2020-09-11T17:46:36Z"),
     "user": None,
     "message": "",
     "title": "This is an example Python exception",
@@ -28,7 +32,10 @@
     "location": "example.py:123",
     "culprit": "/books/new/",
     "projectID": "49271",
-    "metadata": None,
+    "metadata": {
+        "type": "ExampleException",
+        "value": "This is an example Python exception",
+    },
 }
 
 GROUP_EVENT: GroupEventDetailsResponse = {

src/sentry/apidocs/examples/organization_examples.py

@@ -956,7 +956,7 @@ class OrganizationExamples:
                     "packages": {"my.package": "1.0.0"},
                     "platform": "python",
                     "projectID": "1",
-                    "sdk": {},
+                    "sdk": {"name": "sentry.python", "version": "2.0.0"},
                     "size": 7055,
                     "tags": [
                         {"key": "browser", "value": "Chrome 28.0"},

src/sentry/eventtypes/__init__.py

@@ -1,4 +1,5 @@
 from sentry.eventtypes.base import DefaultEvent
+from sentry.eventtypes.base import EventTypeStr as EventTypeStr
 from sentry.eventtypes.error import ErrorEvent
 from sentry.eventtypes.feedback import FeedbackEvent
 from sentry.eventtypes.generic import GenericEvent

src/sentry/eventtypes/base.py

@@ -1,15 +1,28 @@
 from collections.abc import Mapping, MutableMapping
-from typing import Any
+from typing import Any, ClassVar, Literal
 from warnings import warn
 
 from sentry.utils.safe import get_path
 from sentry.utils.strings import strip, truncatechars
 
 # Note: Detecting eventtypes is implemented in the Relay Rust library.
 
+EventTypeStr = Literal[
+    "default",
+    "error",
+    "csp",
+    "nel",
+    "hpkp",
+    "expectct",
+    "expectstaple",
+    "transaction",
+    "generic",
+    "feedback",
+]
+
 
 class BaseEvent:
-    key: str  # abstract
+    key: ClassVar[EventTypeStr]  # abstract
 
     def get_metadata(self, data: MutableMapping[str, Any]) -> dict[str, str]:
         metadata = self.extract_metadata(data)
@@ -42,7 +55,7 @@ def to_string(self, metadata: dict[str, str | None]) -> str:
 
 
 class DefaultEvent(BaseEvent):
-    key = "default"
+    key: ClassVar[EventTypeStr] = "default"
 
     def extract_metadata(self, data: MutableMapping[str, Any]) -> dict[str, str]:
         message = strip(

src/sentry/features/temporary.py

@@ -204,6 +204,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:preprod-build-distribution-pr-comments", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable enforcement of preprod distribution quota checks (when disabled, distribution quota checks always return True)
     manager.add("organizations:preprod-enforce-distribution-quota", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
+    # Enable preprod PR comments for size analysis
+    manager.add("organizations:preprod-size-analysis-pr-comments", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enable preprod size monitors frontend
     manager.add("organizations:preprod-size-monitors-frontend", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Enables the playstation ingestion in relay
@@ -342,6 +344,8 @@ def register_temporary_features(manager: FeatureManager) -> None:
     manager.add("organizations:seer-public-rpc", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=False)
     # Organizations on the old usage-based (v0) Seer plan
     manager.add("organizations:seer-added", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
+    # Enables auto-conversion of number operators for search query builder
+    manager.add("organizations:search-query-builder-number-operator-conversion", OrganizationFeature, FeatureHandlerStrategy.FLAGPOLE, api_expose=True)
     # Organizations on the new seat-based Seer plan
     manager.add("organizations:seat-based-seer-enabled", OrganizationFeature, FeatureHandlerStrategy.INTERNAL, api_expose=True)
     # Render Sentry App schema-backed forms using the backend JSON form adapter.