Browse Source

ref: fix typing for event_id (it is str) (#72718)

split out from my Job is TypedDict branch

<!-- Describe your PR here. -->
anthony sottile 9 months ago
parent
commit
6696768a88

+ 1 - 1
src/sentry/api/endpoints/group_ai_autofix.py

@@ -48,7 +48,7 @@ class GroupAutofixEndpoint(GroupEndpoint):
     }
 
     def _get_serialized_event(
-        self, event_id: int, group: Group, user: AbstractBaseUser | AnonymousUser
+        self, event_id: str, group: Group, user: AbstractBaseUser | AnonymousUser
     ) -> dict[str, Any] | None:
         event = eventstore.backend.get_event_by_id(group.project.id, event_id, group_id=group.id)
 

+ 4 - 4
src/sentry/eventstore/base.py

@@ -226,12 +226,12 @@ class EventStorage(Service):
 
     def get_event_by_id(
         self,
-        project_id,
-        event_id,
-        group_id=None,
+        project_id: int,
+        event_id: str,
+        group_id: int | None = None,
         skip_transaction_groupevent=False,
         tenant_ids=None,
-        occurrence_id=None,
+        occurrence_id: str | None = None,
     ):
         """
         Gets a single event of any event type given a project_id and event_id.

+ 1 - 1
src/sentry/eventstore/reprocessing/base.py

@@ -45,7 +45,7 @@ class ReprocessingStore(Service):
         self,
         project_id: int,
         group_id: int,
-        event_id: int,
+        event_id: str,
         date_val: datetime,
         old_primary_hash: str,
     ) -> None:

+ 1 - 1
src/sentry/eventstore/reprocessing/redis.py

@@ -93,7 +93,7 @@ class RedisReprocessingStore(ReprocessingStore):
         self,
         project_id: int,
         group_id: int,
-        event_id: int,
+        event_id: str,
         date_val: datetime,
         old_primary_hash: str,
     ) -> None:

+ 3 - 3
src/sentry/eventstore/snuba/backend.py

@@ -299,9 +299,9 @@ class SnubaEventStorage(EventStorage):
 
     def get_event_by_id(
         self,
-        project_id,
-        event_id,
-        group_id=None,
+        project_id: int,
+        event_id: str,
+        group_id: int | None = None,
         skip_transaction_groupevent=False,
         tenant_ids=None,
         occurrence_id: str | None = None,

+ 1 - 1
src/sentry/issues/related/trace_connected.py

@@ -28,7 +28,7 @@ def trace_connected_analysis(
     if event_id:
         # If we are passing an specific event_id, we need to get the project_id
         assert project_id is not None
-        event = eventstore.backend.get_event_by_id(project_id, event_id, group_id=group.id)
+        event = eventstore.backend.get_event_by_id(int(project_id), event_id, group_id=group.id)
         # If we are requesting an specific event, we want to be notified with an error
         assert event is not None
         # This ensures that the event is actually part of the group and we are notified

+ 1 - 1
src/sentry/reprocessing2.py

@@ -315,7 +315,7 @@ def _send_delete_old_primary_hash_messages(
 def buffered_delete_old_primary_hash(
     project_id: int,
     group_id: int,
-    event_id: int | None = None,
+    event_id: str | None = None,
     datetime: datetime | None = None,
     old_primary_hash: str | None = None,
     current_primary_hash: str | None = None,

+ 2 - 1
src/sentry/tasks/post_process.py

@@ -512,7 +512,8 @@ def post_process_group(
     cache_key,
     group_id=None,
     occurrence_id: str | None = None,
-    project_id: int | None = None,
+    *,
+    project_id: int,
     **kwargs,
 ):
     """

+ 1 - 0
tests/relay_integration/test_sdk.py

@@ -43,6 +43,7 @@ def post_event_with_sdk(settings, relay_server, wait_for_ingest_consumer):
 
     def inner(*args, **kwargs):
         event_id = sentry_sdk.capture_event(*args, **kwargs)
+        assert event_id is not None
         sentry_sdk.flush()
 
         with sentry_sdk.scope.use_scope(current_scope):

+ 4 - 0
tests/sentry/mail/test_actions.py

@@ -162,6 +162,7 @@ class NotifyEmailTest(RuleTestCase, PerformanceIssueTestCase):
                 is_new_group_environment=False,
                 cache_key=write_event_to_cache(event),
                 group_id=event.group_id,
+                project_id=self.project.id,
             )
 
         assert len(mail.outbox) == 1
@@ -199,6 +200,7 @@ class NotifyEmailTest(RuleTestCase, PerformanceIssueTestCase):
                 is_new_group_environment=False,
                 cache_key=write_event_to_cache(event),
                 group_id=event.group_id,
+                project_id=self.project.id,
             )
 
         assert len(mail.outbox) == 1
@@ -235,6 +237,7 @@ class NotifyEmailTest(RuleTestCase, PerformanceIssueTestCase):
                 is_new_group_environment=False,
                 cache_key=write_event_to_cache(event),
                 group_id=event.group_id,
+                project_id=self.project.id,
             )
 
         # See that the ActiveMembers default results in notifications still being sent
@@ -318,6 +321,7 @@ class NotifyEmailTest(RuleTestCase, PerformanceIssueTestCase):
                 is_new_group_environment=False,
                 cache_key=write_event_to_cache(event),
                 group_id=event.group_id,
+                project_id=self.project.id,
             )
 
         assert len(mail.outbox) == 3

Some files were not shown because too many files changed in this diff