Add HTTPX2Wrapper MVP

datadog_checks_base/changelog.d/22676.added

@@ -1 +1 @@
-Add library-agnostic HTTP mocks/proto/exceptions and migrate intg tests.
+Add library-agnostic HTTP mocks/proto/exceptions and migrate intg tests. Add ``HTTPX2Wrapper``, an httpx2-backed HTTP client opt-in via the ``use_httpx2`` instance config flag. The default remains the existing requests-based client.

datadog_checks_base/datadog_checks/base/checks/base.py

@@ -400,6 +400,16 @@ def _get_metric_limit(self, instance=None):
 
         return limit
 
+    def _build_http_client(self, instance: dict[str, Any]) -> HTTPClientProtocol:
+        if is_affirmative(instance.get('use_httpx2', False)):
+            from datadog_checks.base.utils.httpx2 import HTTPX2Wrapper
+
+            return HTTPX2Wrapper(instance, self.init_config, self.HTTP_CONFIG_REMAPPER, self.log)
+        # See Performance Optimizations in this package's README.md.
+        from datadog_checks.base.utils.http import RequestsWrapper
+
+        return RequestsWrapper(instance, self.init_config, self.HTTP_CONFIG_REMAPPER, self.log)
+
     @property
     def http(self) -> HTTPClientProtocol:
         """
@@ -408,10 +418,7 @@ def http(self) -> HTTPClientProtocol:
         Only new checks or checks on Agent 6.13+ can and should use this for HTTP requests.
         """
         if not hasattr(self, '_http'):
-            # See Performance Optimizations in this package's README.md.
-            from datadog_checks.base.utils.http import RequestsWrapper
-
-            self._http = RequestsWrapper(self.instance or {}, self.init_config, self.HTTP_CONFIG_REMAPPER, self.log)
+            self._http = self._build_http_client(self.instance or {})
 
         return self._http
 

datadog_checks_base/datadog_checks/base/checks/openmetrics/v2/scraper/base_scraper.py

@@ -13,7 +13,7 @@
 from prometheus_client import Metric
 from prometheus_client.openmetrics.parser import text_fd_to_metric_families as parse_openmetrics
 from prometheus_client.parser import text_fd_to_metric_families as parse_prometheus
-from requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError as RequestsConnectionError
 
 from datadog_checks.base.agent import datadog_agent
 from datadog_checks.base.checks.openmetrics.v2.first_scrape_handler import first_scrape_handler
@@ -23,6 +23,7 @@
 from datadog_checks.base.constants import ServiceCheck
 from datadog_checks.base.errors import ConfigurationError
 from datadog_checks.base.utils.functions import no_op, return_true
+from datadog_checks.base.utils.http_exceptions import HTTPConnectionError
 
 
 class OpenMetricsScraper:
@@ -405,11 +406,11 @@ def stream_connection_lines(self):
                 self._content_type = connection.headers.get('Content-Type', '')
                 for line in connection.iter_lines(decode_unicode=True):
                     yield line
-        except ConnectionError as e:
+        except (RequestsConnectionError, HTTPConnectionError) as e:
             if self.ignore_connection_errors:
-                self.log.warning("OpenMetrics endpoint %s is not accessible", self.endpoint)
+                self.log.warning("OpenMetrics endpoint %s is not accessible: %s", self.endpoint, e)
             else:
-                raise e
+                raise
 
     def filter_connection_lines(self, line_streamer):
         """

datadog_checks_base/datadog_checks/base/utils/http_protocol.py

@@ -4,9 +4,11 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from typing import Any, Iterator, Protocol
+from datetime import timedelta
+from typing import Any, Iterator, Protocol, runtime_checkable
 
 
+@runtime_checkable
 class HTTPResponseProtocol(Protocol):
     status_code: int
     content: bytes
@@ -17,6 +19,16 @@ class HTTPResponseProtocol(Protocol):
     def ok(self) -> bool: ...
     @property
     def reason(self) -> str: ...
+    @property
+    def encoding(self) -> str | None: ...
+    @encoding.setter
+    def encoding(self, value: str | None) -> None: ...
+    @property
+    def url(self) -> str: ...
+    @property
+    def cookies(self) -> Mapping[str, str]: ...
+    @property
+    def elapsed(self) -> timedelta: ...
 
     def json(self, **kwargs: Any) -> Any: ...
     def raise_for_status(self) -> None: ...