Revert "feat(integration-slack): store request error counts and disable on broken (#52994)"

This reverts commit 75d6446.

Author: ceorourke

src/sentry/conf/server.py

@@ -112,7 +112,6 @@ def env(
 SENTRY_TRANSACTION_NAMES_REDIS_CLUSTER = "default"
 SENTRY_WEBHOOK_LOG_REDIS_CLUSTER = "default"
 SENTRY_ARTIFACT_BUNDLES_INDEXING_REDIS_CLUSTER = "default"
-SENTRY_INTEGRATION_ERROR_LOG_REDIS_CLUSTER = "default"
 SENTRY_DEBUG_FILES_REDIS_CLUSTER = "default"
 
 # Hosts that are allowed to use system token authentication.
@@ -1342,8 +1341,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str:
     "organizations:crons-timeline-listing-page": False,
     # Enable usage of customer domains on the frontend
     "organizations:customer-domains": False,
-    # Allow disabling integrations when broken is detected
-    "organizations:slack-disable-on-broken": False,
     # Enable the 'discover' interface.
     "organizations:discover": False,
     # Enables events endpoint rate limit

src/sentry/features/__init__.py

@@ -260,10 +260,8 @@
 default_manager.add("organizations:pr-comment-bot", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:ds-org-recalibration", OrganizationFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("organizations:slack-use-new-lookup", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
-default_manager.add("organizations:slack-disable-on-broken", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 default_manager.add("organizations:sourcemaps-bundle-flat-file-indexing", OrganizationFeature, FeatureHandlerStrategy.REMOTE)
 
-
 # Project scoped features
 default_manager.add("projects:alert-filters", ProjectFeature, FeatureHandlerStrategy.INTERNAL)
 default_manager.add("projects:custom-inbound-filters", ProjectFeature, FeatureHandlerStrategy.INTERNAL)

src/sentry/integrations/discord/client.py

@@ -37,7 +37,7 @@ def __init__(
             org_integration_id = infer_org_integration(
                 integration_id=integration_id, ctx_logger=logger
             )
-        super().__init__(integration_id, org_integration_id, verify_ssl, logging_context)
+        super().__init__(org_integration_id, verify_ssl, logging_context)
 
     @control_silo_function
     def authorize_request(self, prepared_request: PreparedRequest) -> PreparedRequest:

src/sentry/integrations/request_buffer.py

@@ -38,12 +38,7 @@ def __init__(
                 integration_id=self.integration_id, ctx_logger=logger
             )
 
-        super().__init__(
-            org_integration_id=org_integration_id,
-            verify_ssl=verify_ssl,
-            integration_id=integration_id,
-            logging_context=logging_context,
-        )
+        super().__init__(org_integration_id, verify_ssl, logging_context)
 
     @control_silo_function
     def authorize_request(self, prepared_request: PreparedRequest) -> PreparedRequest:
@@ -62,19 +57,13 @@ def authorize_request(self, prepared_request: PreparedRequest) -> PreparedReques
         if not integration:
             logger.info("no_integration", extra={"path_url": prepared_request.path_url})
             return prepared_request
+
         token = (
             integration.metadata.get("user_access_token") or integration.metadata["access_token"]
         )
         prepared_request.headers["Authorization"] = f"Bearer {token}"
         return prepared_request
 
-    def is_response_fatal(self, response: Response) -> bool:
-        resp_json = response.json()
-        if not resp_json.get("ok"):
-            if "account_inactive" == resp_json.get("error", ""):
-                return True
-            return False
-
     def track_response_data(
         self,
         code: Union[str, int],
@@ -85,6 +74,7 @@ def track_response_data(
         # if no span was passed, create a dummy to which to add data to avoid having to wrap every
         # span call in `if span`
         span = span or Span()
+
         try:
             span.set_http_status(int(code))
         except ValueError:

src/sentry/integrations/slack/client.py

@@ -77,7 +77,7 @@ class SlackIntegration(SlackNotifyBasicMixin, IntegrationInstallation):
     def get_client(self) -> SlackClient:
         if not self.org_integration:
             raise IntegrationError("Organization Integration does not exist")
-        return SlackClient(org_integration_id=self.org_integration.id, integration_id=self.model.id)
+        return SlackClient(org_integration_id=self.org_integration.id)
 
     def get_config_data(self) -> Mapping[str, str]:
         metadata_ = self.model.metadata

src/sentry/integrations/slack/integration.py

@@ -68,7 +68,7 @@ def get_provider(self) -> IntegrationProvider:
 
     def delete(self, *args, **kwds):
         with outbox_context(
-            transaction.atomic(using=router.db_for_write(OrganizationIntegration)), flush=False
+            transaction.atomic(router.db_for_write(OrganizationIntegration)), flush=False
         ):
             for organization_integration in self.organizationintegration_set.all():
                 organization_integration.delete()
@@ -107,7 +107,7 @@ def add_organization(self, organization: RpcOrganization, user=None, default_aut
         from sentry.models import OrganizationIntegration
 
         try:
-            with transaction.atomic(using=router.db_for_write(OrganizationIntegration)):
+            with transaction.atomic(router.db_for_write(OrganizationIntegration)):
                 org_integration, created = OrganizationIntegration.objects.get_or_create(
                     organization_id=organization.id,
                     integration_id=self.id,
@@ -134,11 +134,3 @@ def add_organization(self, organization: RpcOrganization, user=None, default_aut
                 },
             )
             return False
-
-    def disable(self):
-        """
-        Disable this integration
-        """
-
-        self.update(status=ObjectStatus.DISABLED)
-        self.save()