ref(event_manager): Fix typing issues for event_manager

pyproject.toml

@@ -442,7 +442,6 @@ module = [
     "sentry.discover.endpoints.discover_key_transactions",
     "sentry.discover.endpoints.serializers",
     "sentry.discover.tasks",
-    "sentry.event_manager",
     "sentry.eventstore.base",
     "sentry.eventstore.compressor",
     "sentry.eventstore.models",
@@ -1157,7 +1156,6 @@ module = [
     "tests.sentry.eventstore.test_models",
     "tests.sentry.eventstream.kafka.test_protocol",
     "tests.sentry.eventstream.test_eventstream",
-    "tests.sentry.eventtypes.test_default",
     "tests.sentry.eventtypes.test_error",
     "tests.sentry.features.test_manager",
     "tests.sentry.grouping.test_enhancer",

src/sentry/attachments/__init__.py

@@ -1,4 +1,4 @@
-__all__ = ["attachment_cache", "CachedAttachment"]
+__all__ = ["attachment_cache", "CachedAttachment", "MissingAttachmentChunks"]
 
 from django.conf import settings
 

src/sentry/event_manager.py

@@ -19,7 +19,6 @@
     Optional,
     Sequence,
     Tuple,
-    Type,
     TypedDict,
     Union,
     cast,
@@ -55,15 +54,8 @@
 from sentry.culprit import generate_culprit
 from sentry.dynamic_sampling import LatestReleaseBias, LatestReleaseParams
 from sentry.eventstore.processing import event_processing_store
-from sentry.eventtypes import (
-    CspEvent,
-    DefaultEvent,
-    ErrorEvent,
-    ExpectCTEvent,
-    ExpectStapleEvent,
-    HpkpEvent,
-    TransactionEvent,
-)
+from sentry.eventtypes import EventType
+from sentry.eventtypes.transaction import TransactionEvent
 from sentry.grouping.api import (
     BackgroundGroupingConfigLoader,
     GroupingConfig,
@@ -1249,13 +1241,15 @@ def _tsdb_record_all_metrics(jobs: Sequence[Job]) -> None:
             records.append((TSDBModel.users_affected_by_project, project_id, (user.tag_value,)))
 
         if incrs:
-            tsdb.incr_multi(incrs, timestamp=event.datetime, environment_id=environment.id)
+            tsdb.backend.incr_multi(incrs, timestamp=event.datetime, environment_id=environment.id)
 
         if records:
-            tsdb.record_multi(records, timestamp=event.datetime, environment_id=environment.id)
+            tsdb.backend.record_multi(
+                records, timestamp=event.datetime, environment_id=environment.id
+            )
 
         if frequencies:
-            tsdb.record_frequency_multi(frequencies, timestamp=event.datetime)
+            tsdb.backend.record_frequency_multi(frequencies, timestamp=event.datetime)
 
 
 @metrics.wraps("save_event.nodestore_save_many")
@@ -1427,17 +1421,6 @@ def _get_event_user_impl(
     return euser
 
 
-EventType = Union[
-    DefaultEvent,
-    ErrorEvent,
-    CspEvent,
-    HpkpEvent,
-    ExpectCTEvent,
-    ExpectStapleEvent,
-    TransactionEvent,
-]
-
-
 def get_event_type(data: Mapping[str, Any]) -> EventType:
     return eventtypes.get(data.get("type", "default"))()
 
@@ -1911,7 +1894,7 @@ def _process_existing_aggregate(
     return bool(is_regression)
 
 
-Attachment = Type[CachedAttachment]
+Attachment = CachedAttachment
 
 
 def discard_event(job: Job, attachments: Sequence[Attachment]) -> None:
@@ -1927,7 +1910,7 @@ def discard_event(job: Job, attachments: Sequence[Attachment]) -> None:
 
     project = job["event"].project
 
-    quotas.refund(
+    quotas.backend.refund(
         project,
         key=job["project_key"],
         timestamp=job["start_time"],
@@ -1964,7 +1947,7 @@ def discard_event(job: Job, attachments: Sequence[Attachment]) -> None:
         )
 
     if attachment_quantity:
-        quotas.refund(
+        quotas.backend.refund(
             project,
             key=job["project_key"],
             timestamp=job["start_time"],
@@ -2088,7 +2071,7 @@ def filter_attachments_for_group(attachments: list[Attachment], job: Job) -> lis
         cache.set(crashreports_key, max_crashreports, CRASH_REPORT_TIMEOUT)
 
     if refund_quantity:
-        quotas.refund(
+        quotas.backend.refund(
             project,
             key=job["project_key"],
             timestamp=job["start_time"],

src/sentry/eventtypes/__init__.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 from .base import DefaultEvent
 from .error import ErrorEvent
 from .generic import GenericEvent
@@ -17,3 +19,13 @@
 
 get = default_manager.get
 register = default_manager.register
+
+EventType = Union[
+    DefaultEvent,
+    ErrorEvent,
+    CspEvent,
+    HpkpEvent,
+    ExpectCTEvent,
+    ExpectStapleEvent,
+    TransactionEvent,
+]

src/sentry/grouping/result.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Sequence, TypedDict, Union
 
+from sentry.db.models import NodeData
 from sentry.utils.safe import get_path, safe_execute, set_path
 
-EventData = Dict[str, Any]
 EventMetadata = Dict[str, Any]
 
 
@@ -63,7 +63,7 @@ def _strip_tree_label(tree_label: TreeLabel, truncate: bool = False) -> Stripped
     return rv
 
 
-def _write_tree_labels(tree_labels: Sequence[Optional[TreeLabel]], event_data: EventData) -> None:
+def _write_tree_labels(tree_labels: Sequence[Optional[TreeLabel]], event_data: NodeData) -> None:
     event_labels: List[Optional[StrippedTreeLabel]] = []
     event_data["hierarchical_tree_labels"] = event_labels
 
@@ -97,7 +97,7 @@ class CalculatedHashes:
     hierarchical_hashes: Sequence[str]
     tree_labels: Sequence[Optional[TreeLabel]]
 
-    def write_to_event(self, event_data: EventData) -> None:
+    def write_to_event(self, event_data: NodeData) -> None:
         event_data["hashes"] = self.hashes
 
         if self.hierarchical_hashes:
@@ -106,7 +106,7 @@ def write_to_event(self, event_data: EventData) -> None:
             safe_execute(_write_tree_labels, self.tree_labels, event_data, _with_transaction=False)
 
     @classmethod
-    def from_event(cls, event_data: EventData) -> Optional["CalculatedHashes"]:
+    def from_event(cls, event_data: NodeData) -> Optional["CalculatedHashes"]:
         hashes = event_data.get("hashes")
         hierarchical_hashes = event_data.get("hierarchical_hashes") or []
         tree_labels = event_data.get("hierarchical_tree_labels") or []

src/sentry/tsdb/__init__.py

@@ -5,6 +5,7 @@
 from .base import BaseTSDB
 from .dummy import DummyTSDB
 
-LazyServiceWrapper(
+backend = LazyServiceWrapper(
     BaseTSDB, settings.SENTRY_TSDB, settings.SENTRY_TSDB_OPTIONS, dangerous=[DummyTSDB]
-).expose(locals())
+)
+backend.expose(locals())

tests/sentry/eventtypes/test_default.py

@@ -1,4 +1,4 @@
-from sentry.eventtypes import DefaultEvent
+from sentry.eventtypes.base import DefaultEvent
 from sentry.testutils import TestCase
 from sentry.testutils.silo import region_silo_test