♻️ ref: use new interaction event class

Author: iamrajjoshi

src/sentry/integrations/source_code_management/commit_context.py

@@ -15,14 +15,15 @@
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
 from sentry.integrations.source_code_management.metrics import (
     CommitContextHaltReason,
-    SCMIntegrationInteractionEvent,
+    CommitContextIntegrationInteractionEvent,
     SCMIntegrationInteractionType,
 )
 from sentry.locks import locks
 from sentry.models.commit import Commit
 from sentry.models.group import Group
 from sentry.models.groupowner import GroupOwner
 from sentry.models.options.organization_option import OrganizationOption
+from sentry.models.organization import Organization
 from sentry.models.project import Project
 from sentry.models.pullrequest import (
     CommentType,
@@ -92,10 +93,23 @@ def integration_name(self) -> str:
     def get_client(self) -> CommitContextClient:
         raise NotImplementedError
 
-    def record_event(self, event: SCMIntegrationInteractionType):
-        return SCMIntegrationInteractionEvent(
+    def record_event(
+        self,
+        event: SCMIntegrationInteractionType,
+        organization: Organization | None = None,
+        project: Project | None = None,
+        commit: Commit | None = None,
+        repository: Repository | None = None,
+        pull_request: PullRequest | None = None,
+    ):
+        return CommitContextIntegrationInteractionEvent(
             interaction_type=event,
             provider_key=self.integration_name,
+            organization=organization,
+            project=project,
+            commit=commit,
+            repository=repository,
+            pull_request=pull_request,
         )
 
     def get_blame_for_files(
@@ -142,15 +156,11 @@ def queue_comment_task_if_needed(
         group_id: int,
     ) -> None:
         with self.record_event(
-            SCMIntegrationInteractionType.QUEUE_COMMENT_TASK
+            SCMIntegrationInteractionType.QUEUE_COMMENT_TASK,
+            organization=project.organization,
+            project=project,
+            commit=commit,
         ).capture() as lifecycle:
-            lifecycle.add_extras(
-                {
-                    "project_id": project.id,
-                    "organization_id": project.organization_id,
-                    "commit_id": commit.id,
-                }
-            )
             if not OrganizationOption.objects.get_value(
                 organization=project.organization,
                 key="sentry:github_pr_bot",
@@ -301,17 +311,9 @@ def create_or_update_comment(
             else SCMIntegrationInteractionType.UPDATE_COMMENT
         )
 
-        with self.record_event(interaction_type).capture() as lifecycle:
-            lifecycle.add_extras(
-                {
-                    "repository_id": repo.id,
-                    "organization_id": repo.organization_id,
-                    "pull_request_id": pullrequest_id,
-                    "comment_type": comment_type,
-                    "language": language,
-                }
-            )
-
+        with self.record_event(
+            interaction_type, repository=repo, pull_request_id=pullrequest_id
+        ).capture():
             if pr_comment is None:
                 resp = client.create_comment(
                     repo=repo.name,

src/sentry/integrations/source_code_management/metrics.py

@@ -8,7 +8,10 @@
 from sentry.integrations.models.organization_integration import OrganizationIntegration
 from sentry.integrations.services.integration import RpcOrganizationIntegration
 from sentry.integrations.utils.metrics import IntegrationEventLifecycleMetric
+from sentry.models.commit import Commit
 from sentry.models.organization import Organization
+from sentry.models.project import Project
+from sentry.models.repository import Repository
 from sentry.organizations.services.organization import RpcOrganization
 
 
@@ -76,6 +79,28 @@ class LinkAllReposHaltReason(StrEnum):
     REPOSITORY_NOT_CREATED = "repository_not_created"
 
 
+@dataclass
+class CommitContextIntegrationInteractionEvent(SCMIntegrationInteractionEvent):
+    """
+    An instance to be recorded of a CommitContextIntegration feature call.
+    """
+
+    project: Project | None = None
+    commit: Commit | None = None
+    repository: Repository | None = None
+    pull_request_id: int | None = None
+
+    def get_extras(self) -> Mapping[str, Any]:
+        parent_extras = super().get_extras()
+        return {
+            **parent_extras,
+            "project_id": (self.project.id if self.project else None),
+            "commit_id": (self.commit.id if self.commit else None),
+            "repository_id": (self.repository.id if self.repository else None),
+            "pull_request_id": self.pull_request_id,
+        }
+
+
 class CommitContextHaltReason(StrEnum):
     """Common reasons why a commit context integration may halt without success/failure."""