Catch agnostic HTTPError in sonarqube check() and swap the test (#24249)

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>

Author: mwdd146980

sonarqube/changelog.d/22676.changed

@@ -0,0 +1 @@
+Catch the backend-agnostic ``HTTPError`` when collecting metadata and metrics so the check keeps working after the httpx migration.

sonarqube/datadog_checks/sonarqube/check.py

@@ -6,6 +6,7 @@
 from requests.exceptions import RequestException
 
 from datadog_checks.base import AgentCheck, ConfigurationError
+from datadog_checks.base.utils.http_exceptions import HTTPError
 
 from .constants import CATEGORIES, MAX_PAGES, NUMERIC_TYPES
 
@@ -31,8 +32,8 @@ def check(self, _):
         try:
             self.collect_metadata()
             self.collect_metrics()
-        except RequestException as e:
-            self.log.error('RequestException: %s', e)
+        except (RequestException, HTTPError) as e:
+            self.log.error('Error querying the SonarQube API: %s', e)
             self.service_check(self.SERVICE_CHECK_CONNECT, self.CRITICAL, tags=self._tags, message=str(e))
         else:
             self.service_check(self.SERVICE_CHECK_CONNECT, self.OK, tags=self._tags)

sonarqube/tests/test_unit.py

@@ -4,8 +4,8 @@
 import os
 
 import mock
-import requests
 
+from datadog_checks.base.utils.http_exceptions import HTTPError
 from datadog_checks.base.utils.http_testing import MockHTTPResponse
 
 from .common import HERE
@@ -14,7 +14,7 @@
 
 def test_service_check_critical(aggregator, dd_run_check, sonarqube_check, web_instance):
     with mock.patch('datadog_checks.sonarqube.check.SonarqubeCheck.http') as mock_http:
-        mock_http.get.side_effect = requests.exceptions.RequestException('Req Exception')
+        mock_http.get.side_effect = HTTPError('HTTP error')
         check = sonarqube_check(web_instance)
         global_tags = ['endpoint:{}'.format(web_instance['web_endpoint'])]
         global_tags.extend(web_instance['tags'])