fix(analytics): mypy type issues

Author: constantinius

src/sentry/analytics/events/first_new_feedback_sent.py

@@ -6,7 +6,7 @@ class FirstNewFeedbackSentEvent(analytics.Event):
     organization_id: str
     project_id: str
     platform: str | None = None
-    user_id: str | None = None
+    user_id: int | None = None
 
 
 analytics.register(FirstNewFeedbackSentEvent)

src/sentry/analytics/events/first_sourcemaps_sent.py

@@ -3,7 +3,7 @@
 
 @analytics.eventclass("first_sourcemaps.sent")
 class FirstSourcemapsSentEvent(analytics.Event):
-    user_id: str
+    user_id: int
     organization_id: str
     project_id: str
     platform: str | None = None

src/sentry/analytics/events/issue_resolved.py

@@ -3,11 +3,11 @@
 
 @analytics.eventclass("issue.resolved")
 class IssueResolvedEvent(analytics.Event):
-    user_id: str | None = None
-    project_id: str | None = None
+    user_id: int | None = None
+    project_id: int | None = None
     default_user_id: str
-    organization_id: str
-    group_id: str
+    organization_id: int
+    group_id: int
     resolution_type: str
     # TODO: make required once we validate that all events have this
     issue_category: str | None = None

src/sentry/analytics/events/onboarding_complete.py

@@ -3,8 +3,8 @@
 
 @analytics.eventclass("onboarding.complete")
 class OnboardingCompleteEvent(analytics.Event):
-    user_id: str
-    organization_id: str
+    user_id: int
+    organization_id: int
     referrer: str
 
 

src/sentry/analytics/events/plugin_enabled.py

@@ -3,7 +3,7 @@
 
 @analytics.eventclass("plugin.enabled")
 class PluginEnabledEvent(analytics.Event):
-    user_id: str
+    user_id: int | None
     organization_id: str
     project_id: str
     plugin: str

src/sentry/integrations/analytics.py

@@ -4,15 +4,15 @@
 @analytics.eventclass("integration.added")
 class IntegrationAddedEvent(analytics.Event):
     provider: str
-    id: str
-    organization_id: str
-    user_id: str | None = None
-    default_user_id: str
+    id: int
+    organization_id: int
+    user_id: int | None = None
+    default_user_id: int
 
 
 @analytics.eventclass("integration.disabled.notified")
 class IntegrationDisabledNotified(analytics.Event):
-    organization_id: str
+    organization_id: int
     provider: str
     integration_type: str
     integration_id: str
@@ -22,7 +22,7 @@ class IntegrationDisabledNotified(analytics.Event):
 @analytics.eventclass("integration.issue.created")
 class IntegrationIssueCreatedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
     user_id: str | None = None
     default_user_id: str
@@ -31,7 +31,7 @@ class IntegrationIssueCreatedEvent(analytics.Event):
 @analytics.eventclass("integration.issue.linked")
 class IntegrationIssueLinkedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
     user_id: str | None = None
     default_user_id: str
@@ -40,41 +40,41 @@ class IntegrationIssueLinkedEvent(analytics.Event):
 @analytics.eventclass("integration.issue.status.synced")
 class IntegrationIssueStatusSyncedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
 
 
 @analytics.eventclass("integration.issue.assignee.synced")
 class IntegrationIssueAssigneeSyncedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
 
 
 @analytics.eventclass("integration.issue.comments.synced")
 class IntegrationIssueCommentsSyncedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
 
 
 @analytics.eventclass("integration.repo.added")
 class IntegrationRepoAddedEvent(analytics.Event):
     provider: str
-    id: str
+    id: int
     organization_id: str
 
 
 @analytics.eventclass("integration.resolve.commit")
 class IntegrationResolveCommitEvent(analytics.Event):
-    provider: str
-    id: str
+    provider: str | None
+    id: int
     organization_id: str
 
 
 @analytics.eventclass("integration.resolve.pr")
 class IntegrationResolvePREvent(analytics.Event):
-    provider: str
+    provider: str | None
     id: str
     organization_id: str
 
@@ -83,11 +83,11 @@ class IntegrationResolvePREvent(analytics.Event):
 class IntegrationStacktraceLinkEvent(analytics.Event):
     provider: str
     config_id: str
-    project_id: str
-    organization_id: str
+    project_id: int
+    organization_id: int
     filepath: str
     status: str
-    link_fetch_iterations: str
+    link_fetch_iterations: int
     platform: str | None = None
 
 

src/sentry/integrations/tasks/create_comment.py

@@ -73,6 +73,5 @@ def create_comment(external_issue_id: int, user_id: int, group_note_id: int) ->
                 provider=installation.model.provider,
                 id=installation.model.id,
                 organization_id=external_issue.organization_id,
-                user_id=user_id,
             )
         )

src/sentry/integrations/tasks/sync_status_inbound.py

@@ -300,7 +300,6 @@ def sync_status_inbound(
                     organization_id=organization_id,
                     group_id=group.id,
                     resolution_type="with_third_party_app",
-                    provider=provider.key,
                     issue_type=group.issue_type.slug,
                     issue_category=group.issue_category.name.lower(),
                 )

src/sentry/integrations/tasks/update_comment.py

@@ -73,6 +73,5 @@ def update_comment(external_issue_id: int, user_id: int, group_note_id: int) ->
                 provider=installation.model.provider,
                 id=installation.model.id,
                 organization_id=external_issue.organization_id,
-                user_id=user_id,
             )
         )

src/sentry/receivers/features.py

@@ -64,6 +64,7 @@
     transaction_processed,
     user_feedback_received,
 )
+from sentry.users.models.user import User
 from sentry.utils import metrics
 from sentry.utils.javascript import has_sourcemap
 
@@ -399,7 +400,6 @@ def record_alert_rule_edited(
             user_id=user_id,
             default_user_id=default_user_id,
             organization_id=project.organization_id,
-            project_id=project.id,
             rule_id=rule.id,
             rule_type=rule_type,
             is_api_token=is_api_token,
@@ -408,7 +408,7 @@ def record_alert_rule_edited(
 
 
 @plugin_enabled.connect(weak=False)
-def record_plugin_enabled(plugin, project, user, **kwargs):
+def record_plugin_enabled(plugin, project, user: User | None, **kwargs):
     analytics.record(
         PluginEnabledEvent(
             user_id=user.id if user else None,