Catch agnostic HTTP error types in prefect and swap the pagination raise

Widen PrefectClient.http_exceptions to admit the backend-agnostic HTTP
error types alongside the requests ones, and raise HTTPInvalidURLError
instead of requests' InvalidURL from check_pagination_url so the check
stays correct after the httpx migration.

Author: mwdd146980

prefect/datadog_checks/prefect/check.py

@@ -14,6 +14,12 @@
 
 from datadog_checks.base import AgentCheck
 from datadog_checks.base.utils.common import pattern_filter
+from datadog_checks.base.utils.http_exceptions import (
+    HTTPConnectionError,
+    HTTPInvalidURLError,
+    HTTPStatusError,
+    HTTPTimeoutError,
+)
 
 from .config_models import ConfigMixin
 from .metrics import METRICS_SPEC
@@ -666,7 +672,17 @@ class PrefectClient:
     """HTTP client wrapping GET/POST requests and pagination for the Prefect API."""
 
     def __init__(self, url: str, http: RequestsWrapper, log: CheckLoggingAdapter):
-        self.http_exceptions = (HTTPError, InvalidURL, ConnectionError, Timeout, JSONDecodeError)
+        self.http_exceptions = (
+            HTTPError,
+            InvalidURL,
+            ConnectionError,
+            Timeout,
+            JSONDecodeError,
+            HTTPStatusError,
+            HTTPInvalidURLError,
+            HTTPConnectionError,
+            HTTPTimeoutError,
+        )
         self.url = url
         parsed_url = urlparse(url)
         self.base_url_scheme = parsed_url.scheme
@@ -696,7 +712,7 @@ def post(self, endpoint: str, payload: dict | None = None) -> Any:
     def check_pagination_url(self, next_page: str):
         parsed_next_page = urlparse(next_page)
         if parsed_next_page.scheme != self.base_url_scheme or parsed_next_page.netloc != self.base_url_netloc:
-            raise InvalidURL(f'Invalid next_page URL with unexpected host: {next_page}')
+            raise HTTPInvalidURLError(f'Invalid next_page URL with unexpected host: {next_page}')
 
     def paginate_filter(self, endpoint: str, payload: dict | None = None) -> list[dict]:
         """Implements pagination for /filter endpoints using limit/offset loop."""

prefect/tests/conftest.py

@@ -133,13 +133,29 @@ def mock_prefect_client(mocker):
 
     from requests.exceptions import ConnectionError, HTTPError, InvalidURL, Timeout
 
+    from datadog_checks.base.utils.http_exceptions import (
+        HTTPConnectionError,
+        HTTPInvalidURLError,
+        HTTPStatusError,
+        HTTPTimeoutError,
+    )
     from datadog_checks.prefect.check import PrefectClient
 
     get_responses = _load_fixture("get_metrics.json")
     post_responses = _load_fixture("post_metrics.json")
 
     mock_client = create_autospec(PrefectClient, instance=True)
-    mock_client.http_exceptions = (HTTPError, InvalidURL, ConnectionError, Timeout, JSONDecodeError)
+    mock_client.http_exceptions = (
+        HTTPError,
+        InvalidURL,
+        ConnectionError,
+        Timeout,
+        JSONDecodeError,
+        HTTPStatusError,
+        HTTPInvalidURLError,
+        HTTPConnectionError,
+        HTTPTimeoutError,
+    )
 
     mock_client.get.side_effect = lambda endpoint, **kwargs: get_responses[endpoint]
     mock_client.paginate_filter.side_effect = lambda endpoint, payload=None: post_responses[endpoint]

prefect/tests/test_unit.py

@@ -3,9 +3,9 @@
 from unittest.mock import Mock
 
 import pytest
-from requests.exceptions import InvalidURL
 
 from datadog_checks.base.stubs.aggregator import AggregatorStub
+from datadog_checks.base.utils.http_exceptions import HTTPInvalidURLError
 from datadog_checks.dev.utils import get_metadata_metrics
 from datadog_checks.prefect import PrefectCheck
 from datadog_checks.prefect.check import PrefectClient
@@ -632,7 +632,7 @@ def test_paginate_events_rejects_external_next_page():
     log.error.assert_called_once()
     args = log.error.call_args[0]
     assert args[0] == "Could not collect next page of events: %s, data is incomplete"
-    assert isinstance(args[1], InvalidURL)
+    assert isinstance(args[1], HTTPInvalidURLError)
     assert str(args[1]) == "Invalid next_page URL with unexpected host: http://attacker.example/evil"