Reapply "feat(integrations): Add integration_id tag to SLO lifecycle metrics" (#108270)

## Summary
- Reverts the revert (378f650) to re-apply the original PR #108137
- The Sentry issue (SENTRY-5JQ3) that triggered the revert was a
pre-existing error (SENTRY-5HAA, 19k occurrences, archived) — transient
500s from the integration proxy on GitHub's `/rate_limit` endpoint
- The new SLO wrapper on `get_rate_limit` simply created a new issue
group for the same underlying error that was already being tracked under
`get_blame_for_files`

## Original PR
#108137

## Test plan
- [x] Verified SENTRY-5JQ3 is the same root cause as pre-existing
SENTRY-5HAA
- [ ] Monitor after merge for any unexpected issues

Author: trevor-e

src/sentry/integrations/github/client.py

@@ -25,6 +25,10 @@
     FileBlameInfo,
     SourceLineInfo,
 )
+from sentry.integrations.source_code_management.metrics import (
+    SCMIntegrationInteractionEvent,
+    SCMIntegrationInteractionType,
+)
 from sentry.integrations.source_code_management.repo_trees import RepoTreesClient
 from sentry.integrations.source_code_management.repository import RepositoryClient
 from sentry.integrations.source_code_management.status_check import StatusCheckClient
@@ -410,7 +414,12 @@ def get_rate_limit(self, specific_resource: str = "core") -> GithubRateLimitInfo
         """This gives information of the current rate limit"""
         # There's more but this is good enough
         assert specific_resource in ("core", "search", "graphql")
-        return GithubRateLimitInfo(self.get("/rate_limit")["resources"][specific_resource])
+        with SCMIntegrationInteractionEvent(
+            interaction_type=SCMIntegrationInteractionType.GET_RATE_LIMIT,
+            provider_key=self.integration_name,
+            integration_id=self.integration.id,
+        ).capture():
+            return GithubRateLimitInfo(self.get("/rate_limit")["resources"][specific_resource])
 
     # This method is used by RepoTreesIntegration
     def get_remaining_api_requests(self) -> int:

src/sentry/integrations/github/integration.py

@@ -237,6 +237,10 @@ class GitHubIntegration(
 ):
     integration_name = IntegrationProviderSlug.GITHUB
 
+    @property
+    def integration_id(self) -> int:
+        return self.model.id
+
     # IssueSyncIntegration configuration keys
     comment_key = "sync_comments"
     outbound_status_key = "sync_status_forward"

src/sentry/integrations/github_enterprise/integration.py

@@ -177,6 +177,10 @@ class GitHubEnterpriseIntegration(
     def integration_name(self) -> str:
         return IntegrationProviderSlug.GITHUB_ENTERPRISE.value
 
+    @property
+    def integration_id(self) -> int:
+        return self.model.id
+
     def get_client(self):
         if not self.org_integration:
             raise IntegrationError("Organization Integration does not exist")

src/sentry/integrations/gitlab/integration.py

@@ -123,6 +123,10 @@ class GitlabIntegration(
     def integration_name(self) -> str:
         return IntegrationProviderSlug.GITLAB
 
+    @property
+    def integration_id(self) -> int:
+        return self.model.id
+
     def get_client(self) -> GitLabApiClient:
         try:
             # eagerly populate this just for the error message

src/sentry/integrations/perforce/integration.py

@@ -172,6 +172,10 @@ class PerforceIntegration(RepositoryIntegration, CommitContextIntegration):
 
     integration_name = "perforce"
 
+    @property
+    def integration_id(self) -> int:
+        return self.model.id
+
     def __init__(
         self,
         model: Integration,

src/sentry/integrations/project_management/metrics.py

@@ -45,3 +45,6 @@ def get_integration_domain(self) -> IntegrationDomain:
 
     def get_interaction_type(self) -> str:
         return str(self.action_type)
+
+    def get_integration_id(self) -> int | None:
+        return self.integration.id

src/sentry/integrations/source_code_management/commit_context.py

@@ -130,6 +130,11 @@ class CommitContextIntegration(ABC):
     def integration_name(self) -> str:
         raise NotImplementedError
 
+    @property
+    @abstractmethod
+    def integration_id(self) -> int:
+        raise NotImplementedError
+
     @abstractmethod
     def get_client(self) -> CommitContextClient:
         raise NotImplementedError
@@ -145,6 +150,7 @@ def get_blame_for_files(
         with CommitContextIntegrationInteractionEvent(
             interaction_type=SCMIntegrationInteractionType.GET_BLAME_FOR_FILES,
             provider_key=self.integration_name,
+            integration_id=self.integration_id,
         ).capture() as lifecycle:
             try:
                 client = self.get_client()
@@ -224,6 +230,7 @@ def queue_pr_comment_task_if_needed(
         with CommitContextIntegrationInteractionEvent(
             interaction_type=SCMIntegrationInteractionType.QUEUE_COMMENT_TASK,
             provider_key=self.integration_name,
+            integration_id=self.integration_id,
             organization_id=project.organization_id,
             project=project,
             commit=commit,
@@ -334,6 +341,7 @@ def create_or_update_comment(
         with CommitContextIntegrationInteractionEvent(
             interaction_type=interaction_type,
             provider_key=self.integration_name,
+            integration_id=self.integration_id,
             repository=repo,
             pull_request_id=pr.id,
         ).capture():

src/sentry/integrations/source_code_management/metrics.py

@@ -52,6 +52,9 @@ class SCMIntegrationInteractionType(StrEnum):
     # Status Checks
     CREATE_STATUS_CHECK = "create_status_check"
 
+    # Rate Limiting
+    GET_RATE_LIMIT = "get_rate_limit"
+
 
 @dataclass
 class SCMIntegrationInteractionEvent(IntegrationEventLifecycleMetric):
@@ -73,6 +76,9 @@ def get_integration_name(self) -> str:
     def get_interaction_type(self) -> str:
         return str(self.interaction_type)
 
+    def get_integration_id(self) -> int | None:
+        return self.integration_id
+
     def get_extras(self) -> Mapping[str, Any]:
         return {
             "organization_id": (self.organization_id if self.organization_id else None),

src/sentry/integrations/utils/metrics.py

@@ -9,6 +9,7 @@
 
 import sentry_sdk
 
+from sentry import options
 from sentry.exceptions import RestrictedIPAddress
 from sentry.integrations.base import IntegrationDomain
 from sentry.integrations.types import EventLifecycleOutcome
@@ -86,12 +87,23 @@ def get_metric_key(self, outcome: EventLifecycleOutcome) -> str:
         tokens = ("integrations", self.get_metrics_domain(), str(outcome))
         return ".".join(tokens)
 
+    def get_integration_id(self) -> int | None:
+        """Return the integration ID if available. Override in subclasses."""
+        return None
+
     def get_metric_tags(self) -> Mapping[str, str]:
-        return {
+        tags: dict[str, str] = {
             "integration_domain": str(self.get_integration_domain()),
             "integration_name": self.get_integration_name(),
             "interaction_type": self.get_interaction_type(),
         }
+        # TODO(telkins): Remove killswitch once we no longer need integration_id on SLO metrics
+        integration_id = self.get_integration_id()
+        if integration_id is not None and options.get(
+            "integrations.slo.integration-id-tag-enabled"
+        ):
+            tags["integration_id"] = str(integration_id)
+        return tags
 
     def capture(
         self, assume_success: bool = True, sample_log_rate: float = 1.0

src/sentry/metrics/middleware.py

@@ -21,6 +21,11 @@
         "batching_consumer.batch.size",
         "batching_consumer.batch.flush",
         "batching_consumer.batch.flush.normalized",
+        # TODO(telkins): Remove once we figure out interaction_type org breakdown
+        "integrations.slo.started",
+        "integrations.slo.success",
+        "integrations.slo.halted",
+        "integrations.slo.failure",
     ]
 )