From e05e3027b85ad3c7d8110c9ecae7608b46476809 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 01:29:59 -0400 Subject: [PATCH 01/13] feat: add opentelemetry-exporter-http-transport package --- .../LICENSE | 201 +++++++++++++ .../README.rst | 23 ++ .../pyproject.toml | 52 ++++ .../exporter/http/transport/__init__.py | 2 + .../exporter/http/transport/_base.py | 50 ++++ .../exporter/http/transport/_otlp_client.py | 202 +++++++++++++ .../exporter/http/transport/_requests.py | 95 +++++++ .../exporter/http/transport/_urllib3.py | 109 +++++++ .../http/transport/version/__init__.py | 4 + .../test-requirements.txt | 13 + .../tests/__init__.py | 2 + .../tests/test_otlp_client.py | 269 ++++++++++++++++++ .../tests/test_requests_transport.py | 2 + pyproject.toml | 3 + tox.ini | 10 + uv.lock | 22 ++ 16 files changed, 1059 insertions(+) create mode 100644 exporter/opentelemetry-exporter-http-transport/LICENSE create mode 100644 exporter/opentelemetry-exporter-http-transport/README.rst create mode 100644 exporter/opentelemetry-exporter-http-transport/pyproject.toml create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/__init__.py create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_base.py create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py create mode 100644 exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/version/__init__.py create mode 100644 exporter/opentelemetry-exporter-http-transport/test-requirements.txt create mode 100644 exporter/opentelemetry-exporter-http-transport/tests/__init__.py create mode 100644 exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py create mode 100644 exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py diff --git a/exporter/opentelemetry-exporter-http-transport/LICENSE b/exporter/opentelemetry-exporter-http-transport/LICENSE new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/exporter/opentelemetry-exporter-http-transport/README.rst b/exporter/opentelemetry-exporter-http-transport/README.rst new file mode 100644 index 00000000000..378fc9528ce --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/README.rst @@ -0,0 +1,23 @@ +OpenTelemetry Exporters HTTP Transport +=============================== + +|pypi| + +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-http-transport.svg + :target: https://pypi.org/project/opentelemetry-exporter-http-transport/ + +TODO: Add description + +Installation +------------ + +:: + + pip install opentelemetry-exporter-http-transport + + +References +---------- + +* `OpenTelemetry `_ +* `OpenTelemetry Protocol Specification `_ diff --git a/exporter/opentelemetry-exporter-http-transport/pyproject.toml b/exporter/opentelemetry-exporter-http-transport/pyproject.toml new file mode 100644 index 00000000000..39991aa33a7 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/pyproject.toml @@ -0,0 +1,52 @@ +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[project] +name = "opentelemetry-exporter-http-transport" +dynamic = ["version"] +description = "OpenTelemetry Exporters HTTP transport" +readme = "README.rst" +license = "Apache-2.0" +requires-python = ">=3.10" +authors = [ + { name = "OpenTelemetry Authors", email = "cncf-opentelemetry-contributors@lists.cncf.io" }, +] +classifiers = [ + "Development Status :: 4 - Beta", + "Framework :: OpenTelemetry", + "Framework :: OpenTelemetry :: Exporters", + "Intended Audience :: Developers", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", +] +dependencies = [] + +[project.optional-dependencies] +urllib3 = [ + "urllib3 >= 1.11" +] +requests = [ + "requests ~= 2.7" +] + +[project.urls] +Homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-http-transport" +Repository = "https://github.com/open-telemetry/opentelemetry-python" + +[tool.hatch.version] +path = "src/opentelemetry/exporter/http/transport/version/__init__.py" + +[tool.hatch.build.targets.sdist] +include = [ + "/src", + "/tests", +] + +[tool.hatch.build.targets.wheel] +packages = ["src/opentelemetry"] diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/__init__.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/__init__.py new file mode 100644 index 00000000000..e57cf4aba95 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/__init__.py @@ -0,0 +1,2 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_base.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_base.py new file mode 100644 index 00000000000..a52de97a85c --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_base.py @@ -0,0 +1,50 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +from abc import ABC, abstractmethod +from dataclasses import dataclass + + +@dataclass(frozen=True, slots=True) +class BaseHTTPResult(ABC): + """Outcome of a single HTTP request made by a :class:`BaseHTTPTransport`. + + Either ``status_code`` and ``reason`` are populated (server responded), + or ``error`` is set (request failed before a response was received). + """ + + status_code: int | None = None + reason: str | None = None + error: Exception | None = None + + @abstractmethod + def is_connection_error(self) -> bool: + """Return ``True`` if the failure is a transport-level connection error.""" + + +class BaseHTTPTransport(ABC): + """Abstract HTTP transport interface used by OTLP HTTP exporters.""" + + @abstractmethod + def request( + self, + method: str, + url: str, + *, + headers: dict[str, str] | None = None, + timeout: float | None = None, + data: bytes | None = None, + ) -> BaseHTTPResult: + """Send an HTTP request and return the result. + + :param method: HTTP method (e.g. ``"POST"``). + :param url: Target URL. + :param headers: Optional HTTP headers to include in the request. + :param timeout: Optional request timeout in seconds. + :param data: Optional request body. + :returns: A :class:`BaseHTTPResult` describing the outcome. + """ + + @abstractmethod + def close(self) -> None: + """Release any resources held by the transport.""" diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py new file mode 100644 index 00000000000..a11b2f88293 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py @@ -0,0 +1,202 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +import enum +import gzip +import logging +import random +import threading +import time +import zlib +from collections.abc import Mapping +from dataclasses import dataclass +from http import HTTPStatus +from io import BytesIO +from typing import Final, Literal + +from opentelemetry.exporter.http.transport._base import ( + BaseHTTPResult, + BaseHTTPTransport, +) + +_logger = logging.getLogger(__name__) + +_MAX_RETRIES: Final[int] = 6 + + +def _is_retryable(status_code: int | None) -> bool: + if status_code is None: + return False + if status_code == HTTPStatus.REQUEST_TIMEOUT.value: + return True + if 500 <= status_code <= 599: + return True + return False + + +class Compression(enum.Enum): + NONE = "none" + DEFLATE = "deflate" + GZIP = "gzip" + + @staticmethod + def from_str(value: str) -> "Compression": + match value.strip().lower(): + case "none": + return Compression.NONE + case "deflate": + return Compression.DEFLATE + case "gzip": + return Compression.GZIP + case _: + _logger.warning("Unknown compression type: %s", value) + return Compression.NONE + + +@dataclass(slots=True, frozen=True) +class ExportResult: + """Outcome of an OTLP export attempt, including retry exhaustion.""" + + success: bool + status_code: int | None + reason: str | None + error: Exception | None + + +class OTLPHTTPClient: + """Sends serialized OTLP payloads over HTTP with retry logic. + + Compression, backoff, and connection-error recovery are handled internally. + Callers interact through the :meth:`export` and :meth:`close` methods. + """ + + def __init__( + self, + transport: BaseHTTPTransport, + endpoint: str, + timeout: float, + compression: Compression, + shutdown_event: threading.Event, + headers: Mapping[str, str], + kind: Literal["spans", "logs", "metrics"], + jitter: float = 0.2, + ) -> None: + self._transport = transport + self._endpoint = endpoint + self._timeout = timeout + self._compression = compression + self._shutdown_event = shutdown_event + self._headers = dict(headers) + self._kind = kind + self._jitter = min(max(jitter, 0.0), 1.0) + + def _compute_backoff(self, retry: int) -> float: + return 2**retry * random.uniform(1 - self._jitter, 1 + self._jitter) + + def _compress(self, serialized_data: bytes) -> bytes: + if self._compression is Compression.GZIP: + buf = BytesIO() + with gzip.GzipFile(fileobj=buf, mode="w") as gz: + gz.write(serialized_data) + return buf.getvalue() + if self._compression is Compression.DEFLATE: + return zlib.compress(serialized_data) + return serialized_data + + def _submit(self, data: bytes, timeout: float) -> BaseHTTPResult: + deadline = time.time() + timeout + result = self._transport.request( + "POST", + self._endpoint, + headers=self._headers, + data=data, + timeout=timeout, + ) + if ( + result.error is not None + and result.is_connection_error() + and (remaining := deadline - time.time()) > 0 + ): + # Immediately retry connection errors once without backoff. These + # usually indicate a stale pooled connection that the transport will + # reestablish on the next attempt. + result = self._transport.request( + "POST", + self._endpoint, + headers=self._headers, + data=data, + timeout=remaining, + ) + return result + + def export(self, data: bytes) -> ExportResult: + """Export a serialized payload, retrying on transient failures. + + :param data: Serialized bytes to send. + :returns: An :class:`ExportResult` indicating success or the reason for failure. + """ + data = self._compress(data) + deadline = time.time() + self._timeout + + for retry in range(_MAX_RETRIES): + backoff = self._compute_backoff(retry) + status_code: int | None = None + reason: str | None = None + export_error: Exception | None + retryable: bool + + try: + result = self._submit(data, max(deadline - time.time(), 0.0)) + # pylint: disable-next=broad-exception-caught + except Exception as error: + export_error = error + retryable = False + else: + status_code = result.status_code + reason = result.reason + if status_code is not None and 200 <= status_code < 400: + return ExportResult(True, status_code, reason, None) + export_error = result.error + retryable = ( + _is_retryable(status_code) + if status_code + else result.is_connection_error() + ) + + if not retryable: + _logger.error( + "Failed to export %s batch code: %s, reason: %s", + self._kind, + status_code, + reason or export_error or "unknown", + ) + return ExportResult(False, status_code, reason, export_error) + + if ( + retry + 1 == _MAX_RETRIES + or backoff > (deadline - time.time()) + or self._shutdown_event.is_set() + ): + _logger.error( + "Failed to export %s batch due to timeout, " + "max retries or shutdown.", + self._kind, + ) + return ExportResult(False, status_code, reason, export_error) + + _logger.warning( + "Transient error %s encountered while exporting %s batch, retrying in %.2fs.", + reason or export_error, + self._kind, + backoff, + ) + shutdown = self._shutdown_event.wait(backoff) + if shutdown: + _logger.warning("Shutdown in progress, aborting retry.") + break + + return ExportResult(False, None, None, None) + + def close(self) -> None: + """Close the underlying transport and release its resources.""" + self._transport.close() diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py new file mode 100644 index 00000000000..f673de316b8 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py @@ -0,0 +1,95 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +from __future__ import annotations + +import functools +import warnings +from dataclasses import dataclass +from typing import TYPE_CHECKING + +from opentelemetry.exporter.http.transport._base import ( + BaseHTTPResult, + BaseHTTPTransport, +) + +if TYPE_CHECKING: + import requests + + +@functools.cache +def _get_connection_error_types() -> tuple[type[Exception], ...]: + # pylint: disable-next=import-outside-toplevel + import requests.exceptions # noqa: PLC0415 + + return ( + requests.exceptions.ConnectionError, + requests.exceptions.ConnectTimeout, + requests.exceptions.ReadTimeout, + requests.exceptions.Timeout, + requests.exceptions.SSLError, + requests.exceptions.ProxyError, + ) + + +@dataclass(frozen=True, slots=True) +class RequestsHTTPResult(BaseHTTPResult): + def is_connection_error(self) -> bool: + if self.error is None: + return False + return isinstance(self.error, _get_connection_error_types()) + + +class RequestsHTTPTransport(BaseHTTPTransport): + def __init__( + self, + *, + verify: bool | str = True, + cert: str | tuple[str, str] | None = None, + session: requests.Session | None = None, + ) -> None: + # pylint: disable-next=import-outside-toplevel + import requests # noqa: PLC0415 + + self._session = session if session is not None else requests.Session() + self._session.verify = verify + if cert is not None: + self._session.cert = cert + + if verify is False: + # pylint: disable-next=import-outside-toplevel + from urllib3.exceptions import ( # noqa: PLC0415 + InsecureRequestWarning, + ) + + warnings.filterwarnings("ignore", category=InsecureRequestWarning) + + def request( + self, + method: str, + url: str, + *, + headers: dict[str, str] | None = None, + timeout: float | None = None, + data: bytes | None = None, + ) -> BaseHTTPResult: + try: + response = self._session.request( + method=method, + url=url, + headers=headers, + data=data, + timeout=timeout, + allow_redirects=False, + ) + # pylint: disable-next=broad-exception-caught + except Exception as error: + return RequestsHTTPResult(error=error) + + return RequestsHTTPResult( + status_code=response.status_code, + reason=response.reason, + ) + + def close(self) -> None: + self._session.close() diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py new file mode 100644 index 00000000000..a7292124b03 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py @@ -0,0 +1,109 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +import functools +import warnings +from dataclasses import dataclass + +from opentelemetry.exporter.http.transport._base import ( + BaseHTTPResult, + BaseHTTPTransport, +) + + +@functools.cache +def _get_connection_error_types() -> tuple[type[Exception], ...]: + # pylint: disable-next=import-outside-toplevel + import urllib3.exceptions # noqa: PLC0415 + + types: list[type[Exception]] = [ + urllib3.exceptions.ConnectionError, + urllib3.exceptions.NewConnectionError, + urllib3.exceptions.ConnectTimeoutError, + urllib3.exceptions.MaxRetryError, + urllib3.exceptions.ProtocolError, + ] + + # NameResolutionError was added in urllib3 2.0 + name_resolution_error = getattr( + urllib3.exceptions, "NameResolutionError", None + ) + if name_resolution_error is not None: + types.append(name_resolution_error) + + return tuple(types) + + +@dataclass(frozen=True, slots=True) +class Urllib3HTTPResult(BaseHTTPResult): + def is_connection_error(self) -> bool: + if self.error is None: + return False + return isinstance(self.error, _get_connection_error_types()) + + +class Urllib3HTTPTransport(BaseHTTPTransport): + def __init__( + self, + *, + verify: bool | str = True, + cert: str | tuple[str, str] | None = None, + ) -> None: + # pylint: disable-next=import-outside-toplevel + import urllib3 # noqa: PLC0415 + + pool_kwargs: dict[str, object] = { + "retries": urllib3.Retry(0, redirect=False), + } + if verify is False: + pool_kwargs["cert_reqs"] = "CERT_NONE" + warnings.filterwarnings( + "ignore", + category=urllib3.exceptions.InsecureRequestWarning, + ) + else: + pool_kwargs["cert_reqs"] = "CERT_REQUIRED" + if isinstance(verify, str): + pool_kwargs["ca_certs"] = verify + if isinstance(cert, tuple): + pool_kwargs["cert_file"] = cert[0] + pool_kwargs["key_file"] = cert[1] + elif isinstance(cert, str): + pool_kwargs["cert_file"] = cert + + self._pool = urllib3.PoolManager(**pool_kwargs) # type: ignore + + def request( + self, + method: str, + url: str, + *, + headers: dict[str, str] | None = None, + timeout: float | None = None, + data: bytes | None = None, + ) -> BaseHTTPResult: + # pylint: disable-next=import-outside-toplevel + import urllib3 # noqa: PLC0415 + + try: + response = self._pool.request( + method=method, + url=url, + headers=headers, + body=data, + timeout=urllib3.Timeout(total=timeout) + if timeout is not None + else None, + preload_content=True, + ) + # pylint: disable-next=broad-exception-caught + except Exception as error: + return Urllib3HTTPResult(error=error) + + return Urllib3HTTPResult( + status_code=response.status, + reason=response.reason, + ) + + def close(self) -> None: + self._pool.clear() diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/version/__init__.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/version/__init__.py new file mode 100644 index 00000000000..716ad67f7d6 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/version/__init__.py @@ -0,0 +1,4 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +__version__ = "0.63b0.dev" diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt new file mode 100644 index 00000000000..97c17291f48 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt @@ -0,0 +1,13 @@ +asgiref==3.7.2 +importlib-metadata==6.11.0 +iniconfig==2.0.0 +packaging==24.0 +pluggy==1.6.0 +protobuf==6.31.1 +py-cpuinfo==9.0.0 +pytest==7.4.4 +tomli==2.0.1 +typing_extensions==4.12.0 +wrapt==1.16.0 +zipp==3.19.2 +-e exporter/opentelemetry-exporter-http-transport diff --git a/exporter/opentelemetry-exporter-http-transport/tests/__init__.py b/exporter/opentelemetry-exporter-http-transport/tests/__init__.py new file mode 100644 index 00000000000..e57cf4aba95 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/tests/__init__.py @@ -0,0 +1,2 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py new file mode 100644 index 00000000000..e30aaa71a04 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py @@ -0,0 +1,269 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +import gzip +import threading +import unittest +import zlib +from dataclasses import dataclass +from unittest.mock import Mock, patch + +from opentelemetry.exporter.http.transport._base import ( + BaseHTTPResult, + BaseHTTPTransport, +) +from opentelemetry.exporter.http.transport._otlp_client import ( + Compression, + OTLPHTTPClient, +) + + +@dataclass(frozen=True, slots=True) +class _TestHTTPResult(BaseHTTPResult): + connection_error: bool = False + + def is_connection_error(self) -> bool: + return self.connection_error + + +class _TestHTTPTransport(BaseHTTPTransport): + def __init__(self, *results): + self.results = list(results) + self.requests = [] + self.closed = False + + def request( + self, + method, + url, + *, + headers=None, + timeout=None, + data=None, + ): + self.requests.append( + { + "method": method, + "url": url, + "headers": headers, + "timeout": timeout, + "data": data, + } + ) + result = self.results.pop(0) + if isinstance(result, Exception): + raise result + return result + + def close(self): + self.closed = True + + +class TestOTLPHTTPClient(unittest.TestCase): + @staticmethod + def _client( + transport, + *, + timeout=5.0, + compression=Compression.NONE, + shutdown_event=None, + jitter=0.0, + ): + return OTLPHTTPClient( + transport=transport, + endpoint="http://example.test/v1/traces", + timeout=timeout, + compression=compression, + shutdown_event=shutdown_event or threading.Event(), + headers={"content-type": "application/x-protobuf"}, + kind="spans", + jitter=jitter, + ) + + def test_export_returns_success_for_success_status_codes(self): + cases = ( + (200, "OK"), + (204, "No Content"), + (302, "Found"), + ) + + for status_code, reason in cases: + with self.subTest(status_code=status_code): + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=status_code, reason=reason) + ) + client = self._client(transport) + + result = client.export(b"payload") + + self.assertTrue(result.success) + self.assertEqual(result.status_code, status_code) + self.assertEqual(result.reason, reason) + self.assertIsNone(result.error) + + @patch( + "opentelemetry.exporter.http.transport._otlp_client.time.time", + side_effect=(100.0, 100.0, 100.0), + ) + def test_export_sends_request_arguments(self, mock_time): + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=200, reason="OK") + ) + client = self._client(transport, timeout=3.0) + + client.export(b"payload") + + self.assertEqual(len(transport.requests), 1) + self.assertEqual( + transport.requests[0], + { + "method": "POST", + "url": "http://example.test/v1/traces", + "headers": {"content-type": "application/x-protobuf"}, + "timeout": 3.0, + "data": b"payload", + }, + ) + self.assertEqual(mock_time.call_count, 3) + + def test_export_compresses_payload(self): + cases = ( + ( + Compression.NONE, + lambda data: data, + ), + ( + Compression.GZIP, + gzip.decompress, + ), + ( + Compression.DEFLATE, + zlib.decompress, + ), + ) + + for compression, decompress in cases: + with self.subTest(compression=compression): + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=200, reason="OK") + ) + client = self._client(transport, compression=compression) + + result = client.export(b"payload") + + self.assertTrue(result.success) + self.assertEqual( + decompress(transport.requests[0]["data"]), b"payload" + ) + + def test_export_retries_retryable_status_codes(self): + cases = ( + (408, "Request Timeout"), + (500, "Internal Server Error"), + (503, "Service Unavailable"), + ) + + for status_code, reason in cases: + with self.subTest(status_code=status_code): + shutdown_event = Mock(spec=threading.Event) + shutdown_event.is_set.return_value = False + shutdown_event.wait.return_value = False + transport = _TestHTTPTransport( + _TestHTTPResult( + status_code=status_code, + reason=reason, + ), + _TestHTTPResult(status_code=200, reason="OK"), + ) + client = self._client( + transport, + shutdown_event=shutdown_event, + ) + + result = client.export(b"payload") + + self.assertTrue(result.success) + self.assertEqual(len(transport.requests), 2) + shutdown_event.wait.assert_called_once_with(1.0) + + def test_export_retries_connection_errors_immediately(self): + error = RuntimeError("connection failed") + transport = _TestHTTPTransport( + _TestHTTPResult(error=error, connection_error=True), + _TestHTTPResult(status_code=200, reason="OK"), + ) + client = self._client(transport) + + result = client.export(b"payload") + + self.assertTrue(result.success) + self.assertEqual(len(transport.requests), 2) + self.assertAlmostEqual(transport.requests[0]["timeout"], 5.0, 2) + self.assertLessEqual( + transport.requests[1]["timeout"], + transport.requests[0]["timeout"], + ) + self.assertGreater(transport.requests[1]["timeout"], 0.0) + + def test_export_returns_failure_for_non_retryable_errors(self): + exception = RuntimeError("request failed") + cases = ( + ( + _TestHTTPResult(status_code=400, reason="Bad Request"), + 400, + "Bad Request", + None, + ), + ( + _TestHTTPResult(error=exception), + None, + None, + exception, + ), + ( + exception, + None, + None, + exception, + ), + ) + + for ( + response, + expected_status_code, + expected_reason, + expected_error, + ) in cases: + with self.subTest(response=type(response).__name__): + transport = _TestHTTPTransport(response) + client = self._client(transport) + + result = client.export(b"payload") + + self.assertFalse(result.success) + self.assertEqual(result.status_code, expected_status_code) + self.assertEqual(result.reason, expected_reason) + self.assertIs(result.error, expected_error) + + def test_export_returns_failure_when_shutdown_blocks_retry(self): + shutdown_event = Mock(spec=threading.Event) + shutdown_event.is_set.return_value = True + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=503, reason="Service Unavailable") + ) + client = self._client(transport, shutdown_event=shutdown_event) + + result = client.export(b"payload") + + self.assertFalse(result.success) + self.assertEqual(result.status_code, 503) + self.assertEqual(result.reason, "Service Unavailable") + shutdown_event.wait.assert_not_called() + + def test_close_closes_transport(self): + transport = _TestHTTPTransport() + client = self._client(transport) + + client.close() + + self.assertTrue(transport.closed) diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py new file mode 100644 index 00000000000..e57cf4aba95 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py @@ -0,0 +1,2 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 diff --git a/pyproject.toml b/pyproject.toml index 83b489aa940..09d0ef7526b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -9,6 +9,7 @@ dependencies = [ "opentelemetry-proto", "opentelemetry-proto-json", "opentelemetry-test-utils", + "opentelemetry-exporter-http-transport", "opentelemetry-exporter-otlp-proto-grpc", "opentelemetry-exporter-otlp-proto-http", "opentelemetry-exporter-otlp-proto-common", @@ -32,6 +33,7 @@ opentelemetry-proto = { workspace = true } opentelemetry-proto-json = { workspace = true } opentelemetry-semantic-conventions = { workspace = true } opentelemetry-test-utils = { workspace = true } +opentelemetry-exporter-http-transport = { workspace = true } opentelemetry-exporter-otlp-proto-grpc = { workspace = true } opentelemetry-exporter-otlp-proto-http = { workspace = true } opentelemetry-exporter-otlp-proto-common = { workspace = true } @@ -119,6 +121,7 @@ include = [ "opentelemetry-api", "opentelemetry-sdk", "opentelemetry-proto-json", + "exporter/opentelemetry-exporter-http-transport", "exporter/opentelemetry-exporter-otlp-proto-grpc", "exporter/opentelemetry-exporter-otlp-proto-http", "exporter/opentelemetry-exporter-otlp-json-common", diff --git a/tox.ini b/tox.ini index 22bdbbd77d6..b7797341374 100644 --- a/tox.ini +++ b/tox.ini @@ -44,6 +44,10 @@ envlist = ; opencensus-shim intentionally excluded from pypy3 (grpcio install fails) lint-opentelemetry-opencensus-shim + py3{10,11,12,13,14,14t}-test-opentelemetry-exporter-http-transport + pypy3-test-opentelemetry-exporter-http-transport + lint-opentelemetry-exporter-http-transport + py3{10,11,12,13,14}-test-opentelemetry-exporter-opencensus ; exporter-opencensus intentionally excluded from pypy3 lint-opentelemetry-exporter-opencensus @@ -136,6 +140,8 @@ deps = opentelemetry-protojson-gen-oldest: -r {toxinidir}/opentelemetry-proto-json/test-requirements.oldest.txt opentelemetry-protojson-gen-latest: -r {toxinidir}/opentelemetry-proto-json/test-requirements.latest.txt + opentelemetry-exporter-http-transport: -r {toxinidir}/exporter/opentelemetry-exporter-http-transport/test-requirements.txt + exporter-opencensus: -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt exporter-otlp-proto-common: -r {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt @@ -230,6 +236,9 @@ commands = test-opentelemetry-opencensus-shim: pytest {toxinidir}/shim/opentelemetry-opencensus-shim/tests {posargs} lint-opentelemetry-opencensus-shim: sh -c "cd shim && pylint --rcfile ../.pylintrc {toxinidir}/shim/opentelemetry-opencensus-shim" + test-opentelemetry-exporter-http-transport: pytest {toxinidir}/exporter/opentelemetry-exporter-http-transport/tests {posargs} + lint-opentelemetry-exporter-http-transport: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-http-transport" + test-opentelemetry-exporter-opencensus: pytest {toxinidir}/exporter/opentelemetry-exporter-opencensus/tests {posargs} lint-opentelemetry-exporter-opencensus: sh -c "cd exporter && pylint --rcfile ../.pylintrc {toxinidir}/exporter/opentelemetry-exporter-opencensus" @@ -402,6 +411,7 @@ deps = -e {toxinidir}/opentelemetry-semantic-conventions -e {toxinidir}/opentelemetry-sdk[file-configuration] -e {toxinidir}/tests/opentelemetry-test-utils + -e {toxinidir}/exporter/opentelemetry-exporter-http-transport -e {toxinidir}/exporter/opentelemetry-exporter-otlp-proto-common -e {toxinidir}/exporter/opentelemetry-exporter-otlp-json-common -e {toxinidir}/exporter/opentelemetry-exporter-otlp diff --git a/uv.lock b/uv.lock index e3402bd70b1..ec20b7b2f59 100644 --- a/uv.lock +++ b/uv.lock @@ -11,6 +11,7 @@ resolution-markers = [ members = [ "opentelemetry-api", "opentelemetry-codegen-json", + "opentelemetry-exporter-http-transport", "opentelemetry-exporter-otlp", "opentelemetry-exporter-otlp-json-common", "opentelemetry-exporter-otlp-proto-common", @@ -856,6 +857,25 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/45/a4/d59629684cef86a9da39241edd25dc2dff849d08def6200d50c951e1dd2a/opentelemetry_exporter_credential_provider_gcp-0.62b0-py3-none-any.whl", hash = "sha256:56d15d6486c40d9f958f34b1e9b4b6c9122789f5d136fc1381948b7b4b3af3ca", size = 8343, upload-time = "2026-04-09T14:39:18.399Z" }, ] +[[package]] +name = "opentelemetry-exporter-http-transport" +source = { editable = "exporter/opentelemetry-exporter-http-transport" } + +[package.optional-dependencies] +requests = [ + { name = "requests" }, +] +urllib3 = [ + { name = "urllib3" }, +] + +[package.metadata] +requires-dist = [ + { name = "requests", marker = "extra == 'requests'", specifier = "~=2.7" }, + { name = "urllib3", marker = "extra == 'urllib3'", specifier = ">=1.11" }, +] +provides-extras = ["requests", "urllib3"] + [[package]] name = "opentelemetry-exporter-otlp" source = { editable = "exporter/opentelemetry-exporter-otlp" } @@ -1035,6 +1055,7 @@ source = { virtual = "." } dependencies = [ { name = "opentelemetry-api" }, { name = "opentelemetry-codegen-json" }, + { name = "opentelemetry-exporter-http-transport" }, { name = "opentelemetry-exporter-otlp-json-common" }, { name = "opentelemetry-exporter-otlp-proto-common" }, { name = "opentelemetry-exporter-otlp-proto-grpc" }, @@ -1062,6 +1083,7 @@ dev = [ requires-dist = [ { name = "opentelemetry-api", editable = "opentelemetry-api" }, { name = "opentelemetry-codegen-json", editable = "codegen/opentelemetry-codegen-json" }, + { name = "opentelemetry-exporter-http-transport", editable = "exporter/opentelemetry-exporter-http-transport" }, { name = "opentelemetry-exporter-otlp-json-common", editable = "exporter/opentelemetry-exporter-otlp-json-common" }, { name = "opentelemetry-exporter-otlp-proto-common", editable = "exporter/opentelemetry-exporter-otlp-proto-common" }, { name = "opentelemetry-exporter-otlp-proto-grpc", editable = "exporter/opentelemetry-exporter-otlp-proto-grpc" }, From 5e4489481f89a09e38948bccfe76d5566d88ebb0 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 21:19:35 -0400 Subject: [PATCH 02/13] add remaining unit tests --- .../README.rst | 2 +- .../test-requirements.txt | 5 +- .../tests/test_otlp_client.py | 12 +- .../tests/test_requests_transport.py | 183 ++++++++++++++++++ .../tests/test_urllib3_transport.py | 178 +++++++++++++++++ pyproject.toml | 1 + 6 files changed, 373 insertions(+), 8 deletions(-) create mode 100644 exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py diff --git a/exporter/opentelemetry-exporter-http-transport/README.rst b/exporter/opentelemetry-exporter-http-transport/README.rst index 378fc9528ce..31c60b56bb8 100644 --- a/exporter/opentelemetry-exporter-http-transport/README.rst +++ b/exporter/opentelemetry-exporter-http-transport/README.rst @@ -1,5 +1,5 @@ OpenTelemetry Exporters HTTP Transport -=============================== +====================================== |pypi| diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt index 97c17291f48..e70cbbd8b08 100644 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt @@ -10,4 +10,7 @@ tomli==2.0.1 typing_extensions==4.12.0 wrapt==1.16.0 zipp==3.19.2 --e exporter/opentelemetry-exporter-http-transport +pook +requests +urllib3 +-e exporter/opentelemetry-exporter-http-transport[requests,urllib3] diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py index e30aaa71a04..0feedb359ae 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py @@ -80,7 +80,7 @@ def _client( jitter=jitter, ) - def test_export_returns_success_for_success_status_codes(self): + def test_export_success_status_codes(self): cases = ( (200, "OK"), (204, "No Content"), @@ -105,7 +105,7 @@ def test_export_returns_success_for_success_status_codes(self): "opentelemetry.exporter.http.transport._otlp_client.time.time", side_effect=(100.0, 100.0, 100.0), ) - def test_export_sends_request_arguments(self, mock_time): + def test_export_request_arguments(self, mock_time): transport = _TestHTTPTransport( _TestHTTPResult(status_code=200, reason="OK") ) @@ -156,7 +156,7 @@ def test_export_compresses_payload(self): decompress(transport.requests[0]["data"]), b"payload" ) - def test_export_retries_retryable_status_codes(self): + def test_export_retryable_status_codes(self): cases = ( (408, "Request Timeout"), (500, "Internal Server Error"), @@ -186,7 +186,7 @@ def test_export_retries_retryable_status_codes(self): self.assertEqual(len(transport.requests), 2) shutdown_event.wait.assert_called_once_with(1.0) - def test_export_retries_connection_errors_immediately(self): + def test_export_connection_errors(self): error = RuntimeError("connection failed") transport = _TestHTTPTransport( _TestHTTPResult(error=error, connection_error=True), @@ -205,7 +205,7 @@ def test_export_retries_connection_errors_immediately(self): ) self.assertGreater(transport.requests[1]["timeout"], 0.0) - def test_export_returns_failure_for_non_retryable_errors(self): + def test_export_non_retryable_errors(self): exception = RuntimeError("request failed") cases = ( ( @@ -245,7 +245,7 @@ def test_export_returns_failure_for_non_retryable_errors(self): self.assertEqual(result.reason, expected_reason) self.assertIs(result.error, expected_error) - def test_export_returns_failure_when_shutdown_blocks_retry(self): + def test_export_with_shutdown(self): shutdown_event = Mock(spec=threading.Event) shutdown_event.is_set.return_value = True transport = _TestHTTPTransport( diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py index e57cf4aba95..8ec7fc57431 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py @@ -1,2 +1,185 @@ # Copyright The OpenTelemetry Authors # SPDX-License-Identifier: Apache-2.0 + +from __future__ import annotations + +import unittest +from unittest.mock import MagicMock, patch + +import pook +import requests +import requests.exceptions + +from opentelemetry.exporter.http.transport._requests import ( + RequestsHTTPResult, + RequestsHTTPTransport, +) + +_TEST_URL = "http://example.test/v1/traces" + + +class TestRequestsHTTPResult(unittest.TestCase): + def test_is_connection_error(self): + cases = [ + (RequestsHTTPResult(status_code=200, reason="OK"), False), + ( + RequestsHTTPResult( + error=requests.exceptions.ConnectionError("error") + ), + True, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.ConnectTimeout("error") + ), + True, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.ReadTimeout("error") + ), + True, + ), + ( + RequestsHTTPResult(error=requests.exceptions.Timeout("error")), + True, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.SSLError("error") + ), + True, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.ProxyError("error") + ), + True, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.HTTPError("error") + ), + False, + ), + ( + RequestsHTTPResult( + error=requests.exceptions.RequestException("error") + ), + False, + ), + (RequestsHTTPResult(error=RuntimeError("error")), False), + (RequestsHTTPResult(error=ValueError("error")), False), + ] + for result, expected in cases: + with self.subTest(error_type=type(result.error).__name__): + self.assertEqual(result.is_connection_error(), expected) + + +# pylint: disable=protected-access,no-self-use +class TestRequestsHTTPTransport(unittest.TestCase): + @pook.on + def test_request_returns_status_code_and_reason(self): + cases = [ + (200, "OK"), + (400, "Bad Request"), + (503, "Service Unavailable"), + ] + for status_code, reason in cases: + with self.subTest(status_code=status_code): + pook.post(_TEST_URL).reply(status_code) + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertEqual(result.status_code, status_code) + self.assertEqual(result.reason, reason) + self.assertIsNone(result.error) + pook.reset() + + @pook.on + def test_request_result_is_not_a_connection_error(self): + pook.post(_TEST_URL).reply(200) + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertFalse(result.is_connection_error()) + + @pook.on + def test_request_forwards_headers(self): + headers = { + "content-type": "application/x-protobuf", + "x-custom": "value", + } + pook.post(_TEST_URL, headers=headers).reply(200) + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL, headers=headers) + self.assertEqual(result.status_code, 200) + self.assertTrue(pook.isdone()) + + @pook.on + def test_request_forwards_data(self): + pook.post(_TEST_URL, body=b"payload").reply(200) + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL, data=b"payload") + self.assertEqual(result.status_code, 200) + self.assertTrue(pook.isdone()) + + def test_request_catches_exception(self): + cases = [ + (RuntimeError("unexpected"), False), + (requests.exceptions.ConnectionError("failed"), True), + ] + for error, expected_is_connection_error in cases: + with self.subTest(error_type=type(error).__name__): + with patch("requests.Session.request", side_effect=error): + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertIsNone(result.status_code) + self.assertIsNone(result.reason) + self.assertIs(result.error, error) + self.assertEqual( + result.is_connection_error(), expected_is_connection_error + ) + + def test_verify_sets_session_verify(self): + cases = [ + (True, True), + (False, False), + ("/path/to/ca.pem", "/path/to/ca.pem"), + ] + for verify, expected in cases: + with self.subTest(verify=verify): + mock_session = MagicMock(spec=requests.Session) + RequestsHTTPTransport(verify=verify, session=mock_session) + self.assertEqual(mock_session.verify, expected) + + def test_cert_none_does_not_set_session_cert(self): + mock_session = MagicMock(spec=requests.Session) + RequestsHTTPTransport(cert=None, session=mock_session) + self.assertFalse(hasattr(mock_session, "cert")) + + def test_cert_sets_session_cert(self): + cases = [ + "/path/to/cert.pem", + ("/path/to/cert.pem", "/path/to/key.pem"), + ] + for cert in cases: + with self.subTest(cert=cert): + mock_session = MagicMock(spec=requests.Session) + RequestsHTTPTransport(cert=cert, session=mock_session) + self.assertEqual(mock_session.cert, cert) + + def test_custom_session_is_used(self): + mock_session = MagicMock(spec=requests.Session) + mock_session.request.return_value = MagicMock( + status_code=200, reason="OK" + ) + transport = RequestsHTTPTransport(session=mock_session) + result = transport.request("POST", _TEST_URL) + mock_session.request.assert_called_once() + self.assertEqual(result.status_code, 200) + self.assertEqual(result.reason, "OK") + + def test_close_closes_session(self): + mock_session = MagicMock(spec=requests.Session) + transport = RequestsHTTPTransport(session=mock_session) + transport.close() + mock_session.close.assert_called_once() diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py new file mode 100644 index 00000000000..9d0e6799e35 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py @@ -0,0 +1,178 @@ +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +from __future__ import annotations + + +import unittest +from unittest.mock import MagicMock, patch + +import pook +import urllib3 +import urllib3.exceptions + +from opentelemetry.exporter.http.transport._urllib3 import ( + Urllib3HTTPResult, + Urllib3HTTPTransport, +) + +_TEST_URL = "http://example.test/v1/traces" + +class TestUrllib3HTTPResult(unittest.TestCase): + def test_is_connection_error(self): + cases: list[tuple[Urllib3HTTPResult, bool]] = [ + (Urllib3HTTPResult(status_code=200, reason="OK"), False), + (Urllib3HTTPResult(error=urllib3.exceptions.ProtocolError("error")), True), + (Urllib3HTTPResult(error=urllib3.exceptions.NewConnectionError(None, "error")), True), + (Urllib3HTTPResult(error=urllib3.exceptions.ConnectTimeoutError(None, "error")), True), + (Urllib3HTTPResult(error=urllib3.exceptions.MaxRetryError(None, "http://x")), True), + (Urllib3HTTPResult(error=urllib3.exceptions.HTTPError("error")), False), + (Urllib3HTTPResult(error=urllib3.exceptions.ReadTimeoutError(None, "http://x", "timeout")), False), + (Urllib3HTTPResult(error=RuntimeError("error")), False), + (Urllib3HTTPResult(error=ValueError("error")), False), + ] + name_resolution_error = getattr( + urllib3.exceptions, "NameResolutionError", None + ) + if name_resolution_error is not None: + cases.append( + (Urllib3HTTPResult(error=name_resolution_error("host", None, "error")), True) + ) + for result, expected in cases: + with self.subTest(error_type=type(result.error).__name__): + self.assertEqual(result.is_connection_error(), expected) + + +# pylint: disable=protected-access,no-self-use +class TestUrllib3HTTPTransport(unittest.TestCase): + @pook.on + def test_request_returns_status_code_and_reason(self): + cases = [ + (200, "OK"), + (400, "Bad Request"), + (503, "Service Unavailable"), + ] + for status_code, reason in cases: + with self.subTest(status_code=status_code): + pook.post(_TEST_URL).reply(status_code) + transport = Urllib3HTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertEqual(result.status_code, status_code) + self.assertEqual(result.reason, reason) + self.assertIsNone(result.error) + pook.reset() + + @pook.on + def test_request_result_is_not_a_connection_error(self): + pook.post(_TEST_URL).reply(200) + transport = Urllib3HTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertFalse(result.is_connection_error()) + + @pook.on + def test_request_forwards_headers(self): + headers = {"content-type": "application/x-protobuf", "x-custom": "value"} + pook.post(_TEST_URL, headers=headers).reply(200) + transport = Urllib3HTTPTransport() + result = transport.request("POST", _TEST_URL, headers=headers) + self.assertEqual(result.status_code, 200) + self.assertTrue(pook.isdone()) + + @pook.on + def test_request_forwards_data(self): + pook.post(_TEST_URL, body=b"payload").reply(200) + transport = Urllib3HTTPTransport() + result = transport.request("POST", _TEST_URL, data=b"payload") + self.assertEqual(result.status_code, 200) + self.assertTrue(pook.isdone()) + + def test_request_catches_exception(self): + cases = [ + (RuntimeError("unexpected"), False), + (urllib3.exceptions.ProtocolError("failed"), True), + ] + for error, expected_is_connection_error in cases: + with self.subTest(error_type=type(error).__name__): + transport = Urllib3HTTPTransport() + with patch.object(transport._pool, "request", side_effect=error): + result = transport.request("POST", _TEST_URL) + self.assertIsNone(result.status_code) + self.assertIsNone(result.reason) + self.assertIs(result.error, error) + self.assertEqual( + result.is_connection_error(), expected_is_connection_error + ) + + def test_request_passes_timeout(self): + cases = [ + (3.5,), + (None,), + ] + for (timeout,) in cases: + with self.subTest(timeout=timeout): + transport = Urllib3HTTPTransport() + with patch.object(transport._pool, "request") as mock_request: + mock_request.return_value = MagicMock(status=200, reason="OK") + transport.request("POST", _TEST_URL, timeout=timeout) + timeout_kwarg = mock_request.call_args.kwargs["timeout"] + if timeout is not None: + self.assertIsInstance(timeout_kwarg, urllib3.Timeout) + self.assertEqual(timeout_kwarg.total, timeout) + else: + self.assertIsNone(timeout_kwarg) + + def test_verify_sets_pool_manager_kwargs(self): + cases = [ + (True, "CERT_REQUIRED", None), + (False, "CERT_NONE", None), + ("/path/to/ca.pem", "CERT_REQUIRED", "/path/to/ca.pem"), + ] + for verify, expected_cert_reqs, expected_ca_certs in cases: + with self.subTest(verify=verify): + with patch("urllib3.PoolManager") as mock_pm: + Urllib3HTTPTransport(verify=verify) + kwargs = mock_pm.call_args.kwargs + self.assertEqual(kwargs["cert_reqs"], expected_cert_reqs) + if expected_ca_certs is not None: + self.assertEqual(kwargs["ca_certs"], expected_ca_certs) + else: + self.assertNotIn("ca_certs", kwargs) + + def test_cert_none_does_not_set_cert_file(self): + with patch("urllib3.PoolManager") as mock_pm: + Urllib3HTTPTransport(cert=None) + self.assertNotIn("cert_file", mock_pm.call_args.kwargs) + + def test_cert_sets_pool_manager_kwargs(self): + cases = [ + ("/path/to/cert.pem", "/path/to/cert.pem", None), + ( + ("/path/to/cert.pem", "/path/to/key.pem"), + "/path/to/cert.pem", + "/path/to/key.pem", + ), + ] + for cert, expected_cert_file, expected_key_file in cases: + with self.subTest(cert=cert): + with patch("urllib3.PoolManager") as mock_pm: + Urllib3HTTPTransport(cert=cert) + kwargs = mock_pm.call_args.kwargs + self.assertEqual(kwargs["cert_file"], expected_cert_file) + if expected_key_file is not None: + self.assertEqual(kwargs["key_file"], expected_key_file) + else: + self.assertNotIn("key_file", kwargs) + + def test_retries_disabled(self): + with patch("urllib3.PoolManager") as mock_pm: + Urllib3HTTPTransport() + retries = mock_pm.call_args.kwargs["retries"] + self.assertIsInstance(retries, urllib3.Retry) + self.assertEqual(retries.total, 0) + self.assertFalse(retries.redirect) + + def test_close_clears_pool(self): + with patch("urllib3.PoolManager") as mock_pm: + transport = Urllib3HTTPTransport() + transport.close() + mock_pm.return_value.clear.assert_called_once() diff --git a/pyproject.toml b/pyproject.toml index 09d0ef7526b..a92252f876e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -140,6 +140,7 @@ exclude = [ "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/metric_reader_storage.py", "opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/view.py", "opentelemetry-sdk/benchmarks", + "exporter/opentelemetry-exporter-http-transport/tests", "exporter/opentelemetry-exporter-otlp-proto-grpc/tests", "exporter/opentelemetry-exporter-otlp-proto-http/tests", "exporter/opentelemetry-exporter-otlp-json-common/tests", From ba4a33441512aa7d9378520f73e9ba03e53569a0 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 21:43:23 -0400 Subject: [PATCH 03/13] improve unit tests --- .../tests/test_otlp_client.py | 121 ++++++++++++++++++ .../tests/test_urllib3_transport.py | 64 +++++++-- 2 files changed, 174 insertions(+), 11 deletions(-) diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py index 0feedb359ae..7e9b6cc2c60 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py @@ -5,6 +5,8 @@ import threading import unittest import zlib +from collections.abc import Callable, Iterator +from contextlib import contextmanager from dataclasses import dataclass from unittest.mock import Mock, patch @@ -18,6 +20,33 @@ ) +@contextmanager +def _mock_clock( + shutdown_event: Mock | None = None, +) -> Iterator[Callable[[float], None]]: + _now = [0.0] + + def advance(delta: float) -> None: + _now[0] += delta + + def get_time() -> float: + return _now[0] + + if shutdown_event is not None: + + def _wait(duration: float) -> bool: + advance(duration) + return False + + shutdown_event.wait.side_effect = _wait + + with patch( + "opentelemetry.exporter.http.transport._otlp_client.time.time", + side_effect=get_time, + ): + yield advance + + @dataclass(frozen=True, slots=True) class _TestHTTPResult(BaseHTTPResult): connection_error: bool = False @@ -51,6 +80,8 @@ def request( } ) result = self.results.pop(0) + if callable(result): + result = result() if isinstance(result, Exception): raise result return result @@ -267,3 +298,93 @@ def test_close_closes_transport(self): client.close() self.assertTrue(transport.closed) + + def test_export_timeout_decreases_per_retry(self): + shutdown_event = Mock(spec=threading.Event) + shutdown_event.is_set.return_value = False + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=503, reason="Service Unavailable"), + _TestHTTPResult(status_code=503, reason="Service Unavailable"), + _TestHTTPResult(status_code=200, reason="OK"), + ) + client = self._client( + transport, timeout=10.0, jitter=0.0, shutdown_event=shutdown_event + ) + + with _mock_clock(shutdown_event): + result = client.export(b"payload") + + # retry=0: wait(1.0) -> time=1.0, retry=1: wait(2.0) -> time=3.0, success + self.assertTrue(result.success) + self.assertAlmostEqual(transport.requests[0]["timeout"], 10.0) + self.assertAlmostEqual(transport.requests[1]["timeout"], 9.0) + self.assertAlmostEqual(transport.requests[2]["timeout"], 7.0) + + def test_export_backoff_exhausts_remaining_timeout(self): + shutdown_event = Mock(spec=threading.Event) + shutdown_event.is_set.return_value = False + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=503, reason="Service Unavailable"), + _TestHTTPResult(status_code=503, reason="Service Unavailable"), + ) + # timeout=1.5: retry=0 backoff=1.0 fits -> wait(1.0) -> time=1.0 + # retry=1 backoff=2.0 > 0.5 remaining -> give up + client = self._client( + transport, timeout=1.5, jitter=0.0, shutdown_event=shutdown_event + ) + + with _mock_clock(shutdown_event): + result = client.export(b"payload") + + self.assertFalse(result.success) + self.assertEqual(result.status_code, 503) + self.assertEqual(len(transport.requests), 2) + shutdown_event.wait.assert_called_once_with(1.0) + + def test_export_exhausts_max_retries(self): + shutdown_event = Mock(spec=threading.Event) + shutdown_event.is_set.return_value = False + transport = _TestHTTPTransport( + *[_TestHTTPResult(status_code=503, reason="Service Unavailable")] + * 6 + ) + client = self._client( + transport, + timeout=1000.0, + jitter=0.0, + shutdown_event=shutdown_event, + ) + + with _mock_clock(shutdown_event): + result = client.export(b"payload") + + self.assertFalse(result.success) + self.assertEqual(len(transport.requests), 6) + self.assertEqual(shutdown_event.wait.call_count, 5) + self.assertEqual( + [call.args[0] for call in shutdown_event.wait.call_args_list], + [1.0, 2.0, 4.0, 8.0, 16.0], + ) + + def test_export_connection_error_gets_reduced_timeout(self): + transport = _TestHTTPTransport( + _TestHTTPResult(status_code=200, reason="OK"), + ) + + with _mock_clock() as advance: + + def _slow_connection_error() -> _TestHTTPResult: + advance(2.0) + return _TestHTTPResult( + error=RuntimeError("stale connection"), + connection_error=True, + ) + + transport.results.insert(0, _slow_connection_error) + client = self._client(transport, timeout=5.0) + result = client.export(b"payload") + + # _submit: deadline=0+5=5.0, after first request time=2.0, remaining=3.0 + self.assertTrue(result.success) + self.assertEqual(len(transport.requests), 2) + self.assertAlmostEqual(transport.requests[1]["timeout"], 3.0) diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py index 9d0e6799e35..ed507ae2027 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py @@ -3,7 +3,6 @@ from __future__ import annotations - import unittest from unittest.mock import MagicMock, patch @@ -18,16 +17,47 @@ _TEST_URL = "http://example.test/v1/traces" + class TestUrllib3HTTPResult(unittest.TestCase): def test_is_connection_error(self): cases: list[tuple[Urllib3HTTPResult, bool]] = [ (Urllib3HTTPResult(status_code=200, reason="OK"), False), - (Urllib3HTTPResult(error=urllib3.exceptions.ProtocolError("error")), True), - (Urllib3HTTPResult(error=urllib3.exceptions.NewConnectionError(None, "error")), True), - (Urllib3HTTPResult(error=urllib3.exceptions.ConnectTimeoutError(None, "error")), True), - (Urllib3HTTPResult(error=urllib3.exceptions.MaxRetryError(None, "http://x")), True), - (Urllib3HTTPResult(error=urllib3.exceptions.HTTPError("error")), False), - (Urllib3HTTPResult(error=urllib3.exceptions.ReadTimeoutError(None, "http://x", "timeout")), False), + ( + Urllib3HTTPResult( + error=urllib3.exceptions.ProtocolError("error") + ), + True, + ), + ( + Urllib3HTTPResult( + error=urllib3.exceptions.NewConnectionError(None, "error") + ), + True, + ), + ( + Urllib3HTTPResult( + error=urllib3.exceptions.ConnectTimeoutError(None, "error") + ), + True, + ), + ( + Urllib3HTTPResult( + error=urllib3.exceptions.MaxRetryError(None, "http://x") + ), + True, + ), + ( + Urllib3HTTPResult(error=urllib3.exceptions.HTTPError("error")), + False, + ), + ( + Urllib3HTTPResult( + error=urllib3.exceptions.ReadTimeoutError( + None, "http://x", "timeout" + ) + ), + False, + ), (Urllib3HTTPResult(error=RuntimeError("error")), False), (Urllib3HTTPResult(error=ValueError("error")), False), ] @@ -36,7 +66,12 @@ def test_is_connection_error(self): ) if name_resolution_error is not None: cases.append( - (Urllib3HTTPResult(error=name_resolution_error("host", None, "error")), True) + ( + Urllib3HTTPResult( + error=name_resolution_error("host", None, "error") + ), + True, + ) ) for result, expected in cases: with self.subTest(error_type=type(result.error).__name__): @@ -71,7 +106,10 @@ def test_request_result_is_not_a_connection_error(self): @pook.on def test_request_forwards_headers(self): - headers = {"content-type": "application/x-protobuf", "x-custom": "value"} + headers = { + "content-type": "application/x-protobuf", + "x-custom": "value", + } pook.post(_TEST_URL, headers=headers).reply(200) transport = Urllib3HTTPTransport() result = transport.request("POST", _TEST_URL, headers=headers) @@ -94,7 +132,9 @@ def test_request_catches_exception(self): for error, expected_is_connection_error in cases: with self.subTest(error_type=type(error).__name__): transport = Urllib3HTTPTransport() - with patch.object(transport._pool, "request", side_effect=error): + with patch.object( + transport._pool, "request", side_effect=error + ): result = transport.request("POST", _TEST_URL) self.assertIsNone(result.status_code) self.assertIsNone(result.reason) @@ -112,7 +152,9 @@ def test_request_passes_timeout(self): with self.subTest(timeout=timeout): transport = Urllib3HTTPTransport() with patch.object(transport._pool, "request") as mock_request: - mock_request.return_value = MagicMock(status=200, reason="OK") + mock_request.return_value = MagicMock( + status=200, reason="OK" + ) transport.request("POST", _TEST_URL, timeout=timeout) timeout_kwarg = mock_request.call_args.kwargs["timeout"] if timeout is not None: From 2e03c703b6d8e158aba74cc03be52126e788d1e5 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:18:55 -0400 Subject: [PATCH 04/13] update README.rst --- .../README.rst | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/exporter/opentelemetry-exporter-http-transport/README.rst b/exporter/opentelemetry-exporter-http-transport/README.rst index 31c60b56bb8..67dfec0a04e 100644 --- a/exporter/opentelemetry-exporter-http-transport/README.rst +++ b/exporter/opentelemetry-exporter-http-transport/README.rst @@ -6,14 +6,26 @@ OpenTelemetry Exporters HTTP Transport .. |pypi| image:: https://badge.fury.io/py/opentelemetry-exporter-http-transport.svg :target: https://pypi.org/project/opentelemetry-exporter-http-transport/ -TODO: Add description +This package provides shared HTTP transport abstractions and an OTLP HTTP +client used by OpenTelemetry exporters. + +The package has **no required dependencies**. The ``requests`` and ``urllib3`` +transports are available as optional extras. Installation ------------ -:: +Core package (no HTTP backend included):: + + pip install opentelemetry-exporter-http-transport + +With the ``requests`` backend:: + + pip install opentelemetry-exporter-http-transport[requests] + +With the ``urllib3`` backend:: - pip install opentelemetry-exporter-http-transport + pip install opentelemetry-exporter-http-transport[urllib3] References @@ -21,3 +33,5 @@ References * `OpenTelemetry `_ * `OpenTelemetry Protocol Specification `_ +* `requests `_ +* `urllib3 `_ From 749ec37217deac4d78231e34c1bd5744bed9f03c Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:20:17 -0400 Subject: [PATCH 05/13] update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 16a3c351501..e53bbbf1899 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#5095](https://github.com/open-telemetry/opentelemetry-python/pull/5095)) - Add `registry` keyword argument to `PrometheusMetricReader` to allow passing a custom Prometheus registry ([#5055](https://github.com/open-telemetry/opentelemetry-python/pull/5055)) +- `opentelemetry-exporter-http-transport`: add 'opentelemetry-exporter-http-transport' package for HTTP exporters + ([#5194](https://github.com/open-telemetry/opentelemetry-python/pull/5194)) ## Version 1.41.0/0.62b0 (2026-04-09) From d19c35c5ad8cae20f472d6668293ad24351db3e1 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:21:18 -0400 Subject: [PATCH 06/13] update github workflows --- .github/workflows/lint.yml | 19 +++ .github/workflows/test.yml | 280 +++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index f3fe9675be9..4b19e745044 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -195,6 +195,25 @@ jobs: - name: Run tests run: tox -e lint-opentelemetry-opencensus-shim + lint-opentelemetry-exporter-http-transport: + name: opentelemetry-exporter-http-transport + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14 + uses: actions/setup-python@v5 + with: + python-version: "3.14" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e lint-opentelemetry-exporter-http-transport + lint-opentelemetry-exporter-opencensus: name: opentelemetry-exporter-opencensus runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b481fbfa706..a1b6b752895 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1414,6 +1414,139 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-opencensus-shim -- -ra + py310-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py310-test-opentelemetry-exporter-http-transport -- -ra + + py311-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.11 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py311-test-opentelemetry-exporter-http-transport -- -ra + + py312-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.12 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py312-test-opentelemetry-exporter-http-transport -- -ra + + py313-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.13 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.13 + uses: actions/setup-python@v5 + with: + python-version: "3.13" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py313-test-opentelemetry-exporter-http-transport -- -ra + + py314-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.14 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14 + uses: actions/setup-python@v5 + with: + python-version: "3.14" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314-test-opentelemetry-exporter-http-transport -- -ra + + py314t-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport 3.14t Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14t + uses: actions/setup-python@v5 + with: + python-version: "3.14t" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra + + pypy3-test-opentelemetry-exporter-http-transport_ubuntu-latest: + name: opentelemetry-exporter-http-transport pypy-3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python pypy-3.10 + uses: actions/setup-python@v5 + with: + python-version: "pypy-3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e pypy3-test-opentelemetry-exporter-http-transport -- -ra + py310-test-opentelemetry-exporter-opencensus_ubuntu-latest: name: opentelemetry-exporter-opencensus 3.10 Ubuntu runs-on: ubuntu-latest @@ -4667,6 +4800,153 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-opencensus-shim -- -ra + py310-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.10 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py310-test-opentelemetry-exporter-http-transport -- -ra + + py311-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.11 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py311-test-opentelemetry-exporter-http-transport -- -ra + + py312-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.12 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py312-test-opentelemetry-exporter-http-transport -- -ra + + py313-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.13 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.13 + uses: actions/setup-python@v5 + with: + python-version: "3.13" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py313-test-opentelemetry-exporter-http-transport -- -ra + + py314-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.14 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14 + uses: actions/setup-python@v5 + with: + python-version: "3.14" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314-test-opentelemetry-exporter-http-transport -- -ra + + py314t-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport 3.14t Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14t + uses: actions/setup-python@v5 + with: + python-version: "3.14t" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra + + pypy3-test-opentelemetry-exporter-http-transport_windows-latest: + name: opentelemetry-exporter-http-transport pypy-3.10 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python pypy-3.10 + uses: actions/setup-python@v5 + with: + python-version: "pypy-3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e pypy3-test-opentelemetry-exporter-http-transport -- -ra + py310-test-opentelemetry-exporter-opencensus_windows-latest: name: opentelemetry-exporter-opencensus 3.10 Windows runs-on: windows-latest From 06ef03bc4a118a16e5384fbafabba6d847d0c2f4 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:22:35 -0400 Subject: [PATCH 07/13] update eachdist.ini --- eachdist.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/eachdist.ini b/eachdist.ini index 09e62be3b22..67fe4ec8706 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -32,6 +32,7 @@ version=0.63b0.dev packages= opentelemetry-opentracing-shim opentelemetry-opencensus-shim + opentelemetry-exporter-http-transport opentelemetry-exporter-opencensus opentelemetry-exporter-prometheus opentelemetry-exporter-otlp-json-common From f8f444754592c655bf30d010082e5c44b7dcd80f Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:31:54 -0400 Subject: [PATCH 08/13] update test-requirements.txt --- .../test-requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt index e70cbbd8b08..2d29f0f982f 100644 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt @@ -10,7 +10,7 @@ tomli==2.0.1 typing_extensions==4.12.0 wrapt==1.16.0 zipp==3.19.2 -pook -requests -urllib3 +pook==2.1.6 +requests==2.32.3 +urllib3==2.2.2 -e exporter/opentelemetry-exporter-http-transport[requests,urllib3] From 63821ebd9dac3a585d45f1ebd2110f51339404d8 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:37:05 -0400 Subject: [PATCH 09/13] remove pypy from tests --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index b7797341374..c3d30a03a9c 100644 --- a/tox.ini +++ b/tox.ini @@ -45,7 +45,7 @@ envlist = lint-opentelemetry-opencensus-shim py3{10,11,12,13,14,14t}-test-opentelemetry-exporter-http-transport - pypy3-test-opentelemetry-exporter-http-transport + ; exporter-http-transport intentionally excluded from pypy3 lint-opentelemetry-exporter-http-transport py3{10,11,12,13,14}-test-opentelemetry-exporter-opencensus From 4be0dc27ef74d195f886d07b541c7cfc0fcbbbcc Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sun, 10 May 2026 22:40:19 -0400 Subject: [PATCH 10/13] run generate workflows --- .github/workflows/test.yml | 40 -------------------------------------- 1 file changed, 40 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1b6b752895..78c7d779ec0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1528,25 +1528,6 @@ jobs: - name: Run tests run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra - pypy3-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport pypy-3.10 Ubuntu - runs-on: ubuntu-latest - timeout-minutes: 30 - steps: - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python pypy-3.10 - uses: actions/setup-python@v5 - with: - python-version: "pypy-3.10" - - - name: Install tox - run: pip install tox-uv - - - name: Run tests - run: tox -e pypy3-test-opentelemetry-exporter-http-transport -- -ra - py310-test-opentelemetry-exporter-opencensus_ubuntu-latest: name: opentelemetry-exporter-opencensus 3.10 Ubuntu runs-on: ubuntu-latest @@ -4926,27 +4907,6 @@ jobs: - name: Run tests run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra - pypy3-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport pypy-3.10 Windows - runs-on: windows-latest - timeout-minutes: 30 - steps: - - name: Configure git to support long filenames - run: git config --system core.longpaths true - - name: Checkout repo @ SHA - ${{ github.sha }} - uses: actions/checkout@v4 - - - name: Set up Python pypy-3.10 - uses: actions/setup-python@v5 - with: - python-version: "pypy-3.10" - - - name: Install tox - run: pip install tox-uv - - - name: Run tests - run: tox -e pypy3-test-opentelemetry-exporter-http-transport -- -ra - py310-test-opentelemetry-exporter-opencensus_windows-latest: name: opentelemetry-exporter-opencensus 3.10 Windows runs-on: windows-latest From d3d9469ff2018142eb34f40a9d8e3ec9e396ff24 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Mon, 11 May 2026 22:20:39 -0400 Subject: [PATCH 11/13] add test requirements latest/oldest --- .github/workflows/test.yml | 312 ++++++++++++++++-- .../pyproject.toml | 4 +- .../test-requirements.in | 15 + .../test-requirements.latest.txt | 82 +++++ .../test-requirements.oldest.txt | 82 +++++ .../test-requirements.txt | 16 - tox.ini | 5 +- uv.lock | 4 +- 8 files changed, 462 insertions(+), 58 deletions(-) create mode 100644 exporter/opentelemetry-exporter-http-transport/test-requirements.in create mode 100644 exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt create mode 100644 exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt delete mode 100644 exporter/opentelemetry-exporter-http-transport/test-requirements.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 78c7d779ec0..e8369130112 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1414,8 +1414,8 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-opencensus-shim -- -ra - py310-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.10 Ubuntu + py310-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.10 Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1431,10 +1431,29 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py310-test-opentelemetry-exporter-http-transport-oldest -- -ra - py311-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.11 Ubuntu + py310-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.10 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py310-test-opentelemetry-exporter-http-transport-latest -- -ra + + py311-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.11 Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1450,10 +1469,29 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py311-test-opentelemetry-exporter-http-transport-oldest -- -ra - py312-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.12 Ubuntu + py311-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.11 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py311-test-opentelemetry-exporter-http-transport-latest -- -ra + + py312-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.12 Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1469,10 +1507,48 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py312-test-opentelemetry-exporter-http-transport-oldest -- -ra + + py312-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.12 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py312-test-opentelemetry-exporter-http-transport-latest -- -ra + + py313-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.13 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.13 + uses: actions/setup-python@v5 + with: + python-version: "3.13" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py313-test-opentelemetry-exporter-http-transport-oldest -- -ra - py313-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.13 Ubuntu + py313-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.13 Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1488,10 +1564,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py313-test-opentelemetry-exporter-http-transport-latest -- -ra - py314-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.14 Ubuntu + py314-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.14 Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1507,10 +1583,29 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py314-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py314-test-opentelemetry-exporter-http-transport-oldest -- -ra - py314t-test-opentelemetry-exporter-http-transport_ubuntu-latest: - name: opentelemetry-exporter-http-transport 3.14t Ubuntu + py314-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.14 Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14 + uses: actions/setup-python@v5 + with: + python-version: "3.14" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314-test-opentelemetry-exporter-http-transport-latest -- -ra + + py314t-test-opentelemetry-exporter-http-transport-oldest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-oldest 3.14t Ubuntu runs-on: ubuntu-latest timeout-minutes: 30 steps: @@ -1526,7 +1621,26 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py314t-test-opentelemetry-exporter-http-transport-oldest -- -ra + + py314t-test-opentelemetry-exporter-http-transport-latest_ubuntu-latest: + name: opentelemetry-exporter-http-transport-latest 3.14t Ubuntu + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14t + uses: actions/setup-python@v5 + with: + python-version: "3.14t" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314t-test-opentelemetry-exporter-http-transport-latest -- -ra py310-test-opentelemetry-exporter-opencensus_ubuntu-latest: name: opentelemetry-exporter-opencensus 3.10 Ubuntu @@ -4781,8 +4895,29 @@ jobs: - name: Run tests run: tox -e py314-test-opentelemetry-opencensus-shim -- -ra - py310-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.10 Windows + py310-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.10 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.10 + uses: actions/setup-python@v5 + with: + python-version: "3.10" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py310-test-opentelemetry-exporter-http-transport-oldest -- -ra + + py310-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.10 Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4800,10 +4935,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py310-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py310-test-opentelemetry-exporter-http-transport-latest -- -ra - py311-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.11 Windows + py311-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.11 Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4821,10 +4956,31 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py311-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py311-test-opentelemetry-exporter-http-transport-oldest -- -ra - py312-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.12 Windows + py311-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.11 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: "3.11" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py311-test-opentelemetry-exporter-http-transport-latest -- -ra + + py312-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.12 Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4842,10 +4998,52 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py312-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py312-test-opentelemetry-exporter-http-transport-oldest -- -ra + + py312-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.12 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.12 + uses: actions/setup-python@v5 + with: + python-version: "3.12" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py312-test-opentelemetry-exporter-http-transport-latest -- -ra + + py313-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.13 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.13 + uses: actions/setup-python@v5 + with: + python-version: "3.13" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py313-test-opentelemetry-exporter-http-transport-oldest -- -ra - py313-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.13 Windows + py313-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.13 Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4863,10 +5061,10 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py313-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py313-test-opentelemetry-exporter-http-transport-latest -- -ra - py314-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.14 Windows + py314-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.14 Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4884,10 +5082,52 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py314-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py314-test-opentelemetry-exporter-http-transport-oldest -- -ra + + py314-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.14 Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14 + uses: actions/setup-python@v5 + with: + python-version: "3.14" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314-test-opentelemetry-exporter-http-transport-latest -- -ra + + py314t-test-opentelemetry-exporter-http-transport-oldest_windows-latest: + name: opentelemetry-exporter-http-transport-oldest 3.14t Windows + runs-on: windows-latest + timeout-minutes: 30 + steps: + - name: Configure git to support long filenames + run: git config --system core.longpaths true + - name: Checkout repo @ SHA - ${{ github.sha }} + uses: actions/checkout@v4 + + - name: Set up Python 3.14t + uses: actions/setup-python@v5 + with: + python-version: "3.14t" + + - name: Install tox + run: pip install tox-uv + + - name: Run tests + run: tox -e py314t-test-opentelemetry-exporter-http-transport-oldest -- -ra - py314t-test-opentelemetry-exporter-http-transport_windows-latest: - name: opentelemetry-exporter-http-transport 3.14t Windows + py314t-test-opentelemetry-exporter-http-transport-latest_windows-latest: + name: opentelemetry-exporter-http-transport-latest 3.14t Windows runs-on: windows-latest timeout-minutes: 30 steps: @@ -4905,7 +5145,7 @@ jobs: run: pip install tox-uv - name: Run tests - run: tox -e py314t-test-opentelemetry-exporter-http-transport -- -ra + run: tox -e py314t-test-opentelemetry-exporter-http-transport-latest -- -ra py310-test-opentelemetry-exporter-opencensus_windows-latest: name: opentelemetry-exporter-opencensus 3.10 Windows diff --git a/exporter/opentelemetry-exporter-http-transport/pyproject.toml b/exporter/opentelemetry-exporter-http-transport/pyproject.toml index 39991aa33a7..e2ecb426cbb 100644 --- a/exporter/opentelemetry-exporter-http-transport/pyproject.toml +++ b/exporter/opentelemetry-exporter-http-transport/pyproject.toml @@ -29,10 +29,10 @@ dependencies = [] [project.optional-dependencies] urllib3 = [ - "urllib3 >= 1.11" + "urllib3 >= 1.26" ] requests = [ - "requests ~= 2.7" + "requests ~= 2.25" ] [project.urls] diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.in b/exporter/opentelemetry-exporter-http-transport/test-requirements.in new file mode 100644 index 00000000000..f8961990389 --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.in @@ -0,0 +1,15 @@ +attrs==26.1.0 +furl==2.1.4 +iniconfig==2.3.0 +jsonschema==4.26.0 +jsonschema-specifications==2025.9.1 +orderedmultidict==1.0.2 +packaging==26.2 +pluggy==1.6.0 +pook==2.1.6 +pytest==7.4.4 +referencing==0.37.0 +rpds-py==0.30.0 +six==1.17.0 +xmltodict==1.0.4 +-e exporter/opentelemetry-exporter-http-transport[urllib3,requests] diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt new file mode 100644 index 00000000000..694d82bb34e --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt @@ -0,0 +1,82 @@ +# This file was autogenerated by uv via the following command: +# uv pip compile --python 3.10 --universal --resolution highest exporter/opentelemetry-exporter-http-transport/test-requirements.in -o exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt +-e exporter/opentelemetry-exporter-http-transport + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +attrs==26.1.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # referencing +certifi==2026.4.22 + # via requests +charset-normalizer==3.4.7 + # via requests +colorama==0.4.6 ; sys_platform == 'win32' + # via pytest +exceptiongroup==1.3.1 ; python_full_version < '3.11' + # via pytest +furl==2.1.4 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook +idna==3.14 + # via requests +iniconfig==2.3.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +jsonschema==4.26.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook +jsonschema-specifications==2025.9.1 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema +orderedmultidict==1.0.2 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # furl +packaging==26.2 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +pluggy==1.6.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +pook==2.1.6 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +pytest==7.4.4 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +referencing==0.37.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # jsonschema-specifications +requests==2.34.0 + # via opentelemetry-exporter-http-transport +rpds-py==0.30.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # referencing +six==1.17.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # furl + # orderedmultidict +tomli==2.4.1 ; python_full_version < '3.11' + # via pytest +typing-extensions==4.15.0 ; python_full_version < '3.13' + # via + # exceptiongroup + # referencing +urllib3==2.7.0 + # via + # opentelemetry-exporter-http-transport + # requests +xmltodict==1.0.4 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt new file mode 100644 index 00000000000..bd8804a7cba --- /dev/null +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt @@ -0,0 +1,82 @@ +# This file was autogenerated by uv via the following command: +# uv pip compile --python 3.10 --universal --resolution lowest-direct exporter/opentelemetry-exporter-http-transport/test-requirements.in -o exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt +-e exporter/opentelemetry-exporter-http-transport + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +attrs==26.1.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # referencing +certifi==2026.4.22 + # via requests +chardet==3.0.4 + # via requests +colorama==0.4.6 ; sys_platform == 'win32' + # via pytest +exceptiongroup==1.3.1 ; python_full_version < '3.11' + # via pytest +furl==2.1.4 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook +idna==2.10 + # via requests +iniconfig==2.3.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +jsonschema==4.26.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook +jsonschema-specifications==2025.9.1 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema +orderedmultidict==1.0.2 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # furl +packaging==26.2 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +pluggy==1.6.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pytest +pook==2.1.6 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +pytest==7.4.4 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +referencing==0.37.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # jsonschema-specifications +requests==2.25.0 + # via opentelemetry-exporter-http-transport +rpds-py==0.30.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # jsonschema + # referencing +six==1.17.0 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # furl + # orderedmultidict +tomli==2.4.1 ; python_full_version < '3.11' + # via pytest +typing-extensions==4.15.0 ; python_full_version < '3.13' + # via + # exceptiongroup + # referencing +urllib3==1.26.20 + # via + # opentelemetry-exporter-http-transport + # requests +xmltodict==1.0.4 + # via + # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in + # pook diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.txt deleted file mode 100644 index 2d29f0f982f..00000000000 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.txt +++ /dev/null @@ -1,16 +0,0 @@ -asgiref==3.7.2 -importlib-metadata==6.11.0 -iniconfig==2.0.0 -packaging==24.0 -pluggy==1.6.0 -protobuf==6.31.1 -py-cpuinfo==9.0.0 -pytest==7.4.4 -tomli==2.0.1 -typing_extensions==4.12.0 -wrapt==1.16.0 -zipp==3.19.2 -pook==2.1.6 -requests==2.32.3 -urllib3==2.2.2 --e exporter/opentelemetry-exporter-http-transport[requests,urllib3] diff --git a/tox.ini b/tox.ini index c3d30a03a9c..8d13a4baf94 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,7 @@ envlist = ; opencensus-shim intentionally excluded from pypy3 (grpcio install fails) lint-opentelemetry-opencensus-shim - py3{10,11,12,13,14,14t}-test-opentelemetry-exporter-http-transport + py3{10,11,12,13,14,14t}-test-opentelemetry-exporter-http-transport-{oldest,latest} ; exporter-http-transport intentionally excluded from pypy3 lint-opentelemetry-exporter-http-transport @@ -140,7 +140,8 @@ deps = opentelemetry-protojson-gen-oldest: -r {toxinidir}/opentelemetry-proto-json/test-requirements.oldest.txt opentelemetry-protojson-gen-latest: -r {toxinidir}/opentelemetry-proto-json/test-requirements.latest.txt - opentelemetry-exporter-http-transport: -r {toxinidir}/exporter/opentelemetry-exporter-http-transport/test-requirements.txt + opentelemetry-exporter-http-transport-oldest: -r {toxinidir}/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt + opentelemetry-exporter-http-transport-latest: -r {toxinidir}/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt exporter-opencensus: -r {toxinidir}/exporter/opentelemetry-exporter-opencensus/test-requirements.txt diff --git a/uv.lock b/uv.lock index ec20b7b2f59..a9d6b140e62 100644 --- a/uv.lock +++ b/uv.lock @@ -871,8 +871,8 @@ urllib3 = [ [package.metadata] requires-dist = [ - { name = "requests", marker = "extra == 'requests'", specifier = "~=2.7" }, - { name = "urllib3", marker = "extra == 'urllib3'", specifier = ">=1.11" }, + { name = "requests", marker = "extra == 'requests'", specifier = "~=2.25" }, + { name = "urllib3", marker = "extra == 'urllib3'", specifier = ">=1.26" }, ] provides-extras = ["requests", "urllib3"] From d6abfb4f9aba8ee3d6d2018613cdd7b1ed152322 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sat, 16 May 2026 16:18:46 -0400 Subject: [PATCH 12/13] update tests to use mocket --- .../test-requirements.in | 11 +--- .../test-requirements.latest.txt | 57 +++++-------------- .../test-requirements.oldest.txt | 57 +++++-------------- .../tests/test_requests_transport.py | 38 +++++++------ .../tests/test_urllib3_transport.py | 36 ++++++------ 5 files changed, 66 insertions(+), 133 deletions(-) diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.in b/exporter/opentelemetry-exporter-http-transport/test-requirements.in index f8961990389..e8b1ac224dd 100644 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.in +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.in @@ -1,15 +1,6 @@ -attrs==26.1.0 -furl==2.1.4 iniconfig==2.3.0 -jsonschema==4.26.0 -jsonschema-specifications==2025.9.1 -orderedmultidict==1.0.2 +mocket==3.14.1 packaging==26.2 pluggy==1.6.0 -pook==2.1.6 pytest==7.4.4 -referencing==0.37.0 -rpds-py==0.30.0 -six==1.17.0 -xmltodict==1.0.4 -e exporter/opentelemetry-exporter-http-transport[urllib3,requests] diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt index 694d82bb34e..b1ec00aea69 100644 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt @@ -2,41 +2,26 @@ # uv pip compile --python 3.10 --universal --resolution highest exporter/opentelemetry-exporter-http-transport/test-requirements.in -o exporter/opentelemetry-exporter-http-transport/test-requirements.latest.txt -e exporter/opentelemetry-exporter-http-transport # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in -attrs==26.1.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # referencing certifi==2026.4.22 # via requests charset-normalizer==3.4.7 # via requests colorama==0.4.6 ; sys_platform == 'win32' # via pytest +decorator==5.2.1 + # via mocket exceptiongroup==1.3.1 ; python_full_version < '3.11' # via pytest -furl==2.1.4 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook +h11==0.16.0 + # via mocket idna==3.14 # via requests iniconfig==2.3.0 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in # pytest -jsonschema==4.26.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook -jsonschema-specifications==2025.9.1 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema -orderedmultidict==1.0.2 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # furl +mocket==3.14.1 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in packaging==26.2 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in @@ -45,38 +30,22 @@ pluggy==1.6.0 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in # pytest -pook==2.1.6 - # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +puremagic==1.30 ; python_full_version < '3.12' + # via mocket +puremagic==2.2.0 ; python_full_version >= '3.12' + # via mocket pytest==7.4.4 # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in -referencing==0.37.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # jsonschema-specifications requests==2.34.0 # via opentelemetry-exporter-http-transport -rpds-py==0.30.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # referencing -six==1.17.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # furl - # orderedmultidict tomli==2.4.1 ; python_full_version < '3.11' # via pytest -typing-extensions==4.15.0 ; python_full_version < '3.13' +typing-extensions==4.15.0 # via # exceptiongroup - # referencing + # mocket urllib3==2.7.0 # via + # mocket # opentelemetry-exporter-http-transport # requests -xmltodict==1.0.4 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook diff --git a/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt b/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt index bd8804a7cba..c9b33dc117a 100644 --- a/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt +++ b/exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt @@ -2,41 +2,26 @@ # uv pip compile --python 3.10 --universal --resolution lowest-direct exporter/opentelemetry-exporter-http-transport/test-requirements.in -o exporter/opentelemetry-exporter-http-transport/test-requirements.oldest.txt -e exporter/opentelemetry-exporter-http-transport # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in -attrs==26.1.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # referencing certifi==2026.4.22 # via requests chardet==3.0.4 # via requests colorama==0.4.6 ; sys_platform == 'win32' # via pytest +decorator==5.2.1 + # via mocket exceptiongroup==1.3.1 ; python_full_version < '3.11' # via pytest -furl==2.1.4 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook +h11==0.16.0 + # via mocket idna==2.10 # via requests iniconfig==2.3.0 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in # pytest -jsonschema==4.26.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook -jsonschema-specifications==2025.9.1 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema -orderedmultidict==1.0.2 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # furl +mocket==3.14.1 + # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in packaging==26.2 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in @@ -45,38 +30,22 @@ pluggy==1.6.0 # via # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in # pytest -pook==2.1.6 - # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in +puremagic==1.30 ; python_full_version < '3.12' + # via mocket +puremagic==2.2.0 ; python_full_version >= '3.12' + # via mocket pytest==7.4.4 # via -r exporter/opentelemetry-exporter-http-transport/test-requirements.in -referencing==0.37.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # jsonschema-specifications requests==2.25.0 # via opentelemetry-exporter-http-transport -rpds-py==0.30.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # jsonschema - # referencing -six==1.17.0 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # furl - # orderedmultidict tomli==2.4.1 ; python_full_version < '3.11' # via pytest -typing-extensions==4.15.0 ; python_full_version < '3.13' +typing-extensions==4.15.0 # via # exceptiongroup - # referencing + # mocket urllib3==1.26.20 # via + # mocket # opentelemetry-exporter-http-transport # requests -xmltodict==1.0.4 - # via - # -r exporter/opentelemetry-exporter-http-transport/test-requirements.in - # pook diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py index 8ec7fc57431..f8c49311680 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py @@ -6,9 +6,10 @@ import unittest from unittest.mock import MagicMock, patch -import pook import requests import requests.exceptions +from mocket import Mocket, Mocketizer, mocketize +from mocket.mocks.mockhttp import Entry from opentelemetry.exporter.http.transport._requests import ( RequestsHTTPResult, @@ -78,7 +79,6 @@ def test_is_connection_error(self): # pylint: disable=protected-access,no-self-use class TestRequestsHTTPTransport(unittest.TestCase): - @pook.on def test_request_returns_status_code_and_reason(self): cases = [ (200, "OK"), @@ -87,40 +87,42 @@ def test_request_returns_status_code_and_reason(self): ] for status_code, reason in cases: with self.subTest(status_code=status_code): - pook.post(_TEST_URL).reply(status_code) - transport = RequestsHTTPTransport() - result = transport.request("POST", _TEST_URL) - self.assertEqual(result.status_code, status_code) - self.assertEqual(result.reason, reason) - self.assertIsNone(result.error) - pook.reset() - - @pook.on + with Mocketizer(): + Entry.single_register(Entry.POST, _TEST_URL, status=status_code) + transport = RequestsHTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertEqual(result.status_code, status_code) + self.assertEqual(result.reason, reason) + self.assertIsNone(result.error) + + @mocketize def test_request_result_is_not_a_connection_error(self): - pook.post(_TEST_URL).reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = RequestsHTTPTransport() result = transport.request("POST", _TEST_URL) self.assertFalse(result.is_connection_error()) - @pook.on + @mocketize def test_request_forwards_headers(self): headers = { "content-type": "application/x-protobuf", "x-custom": "value", } - pook.post(_TEST_URL, headers=headers).reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = RequestsHTTPTransport() result = transport.request("POST", _TEST_URL, headers=headers) self.assertEqual(result.status_code, 200) - self.assertTrue(pook.isdone()) + req = Mocket.last_request() + for key, value in headers.items(): + self.assertEqual(req.headers[key], value) - @pook.on + @mocketize def test_request_forwards_data(self): - pook.post(_TEST_URL, body=b"payload").reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = RequestsHTTPTransport() result = transport.request("POST", _TEST_URL, data=b"payload") self.assertEqual(result.status_code, 200) - self.assertTrue(pook.isdone()) + self.assertEqual(Mocket.last_request().body, "payload") def test_request_catches_exception(self): cases = [ diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py index ed507ae2027..6cbb50ecafd 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py @@ -6,9 +6,10 @@ import unittest from unittest.mock import MagicMock, patch -import pook import urllib3 import urllib3.exceptions +from mocket import Mocket, Mocketizer, mocketize +from mocket.mocks.mockhttp import Entry from opentelemetry.exporter.http.transport._urllib3 import ( Urllib3HTTPResult, @@ -80,7 +81,6 @@ def test_is_connection_error(self): # pylint: disable=protected-access,no-self-use class TestUrllib3HTTPTransport(unittest.TestCase): - @pook.on def test_request_returns_status_code_and_reason(self): cases = [ (200, "OK"), @@ -89,40 +89,42 @@ def test_request_returns_status_code_and_reason(self): ] for status_code, reason in cases: with self.subTest(status_code=status_code): - pook.post(_TEST_URL).reply(status_code) - transport = Urllib3HTTPTransport() - result = transport.request("POST", _TEST_URL) - self.assertEqual(result.status_code, status_code) - self.assertEqual(result.reason, reason) - self.assertIsNone(result.error) - pook.reset() + with Mocketizer(): + Entry.single_register(Entry.POST, _TEST_URL, status=status_code) + transport = Urllib3HTTPTransport() + result = transport.request("POST", _TEST_URL) + self.assertEqual(result.status_code, status_code) + self.assertEqual(result.reason, reason) + self.assertIsNone(result.error) - @pook.on + @mocketize def test_request_result_is_not_a_connection_error(self): - pook.post(_TEST_URL).reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = Urllib3HTTPTransport() result = transport.request("POST", _TEST_URL) self.assertFalse(result.is_connection_error()) - @pook.on + @mocketize def test_request_forwards_headers(self): headers = { "content-type": "application/x-protobuf", "x-custom": "value", } - pook.post(_TEST_URL, headers=headers).reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = Urllib3HTTPTransport() result = transport.request("POST", _TEST_URL, headers=headers) self.assertEqual(result.status_code, 200) - self.assertTrue(pook.isdone()) + req = Mocket.last_request() + for key, value in headers.items(): + self.assertEqual(req.headers[key], value) - @pook.on + @mocketize def test_request_forwards_data(self): - pook.post(_TEST_URL, body=b"payload").reply(200) + Entry.single_register(Entry.POST, _TEST_URL, status=200) transport = Urllib3HTTPTransport() result = transport.request("POST", _TEST_URL, data=b"payload") self.assertEqual(result.status_code, 200) - self.assertTrue(pook.isdone()) + self.assertEqual(Mocket.last_request().body, "payload") def test_request_catches_exception(self): cases = [ From 6be55c69dd479e9792fb09c5425b94216077d4b3 Mon Sep 17 00:00:00 2001 From: Lukas Hering Date: Sat, 16 May 2026 16:25:03 -0400 Subject: [PATCH 13/13] fix lint errors --- dev-requirements.txt | 1 + .../opentelemetry/exporter/http/transport/_otlp_client.py | 1 + .../src/opentelemetry/exporter/http/transport/_requests.py | 3 +++ .../src/opentelemetry/exporter/http/transport/_urllib3.py | 3 +++ .../tests/test_otlp_client.py | 4 ++++ .../tests/test_requests_transport.py | 5 ++++- .../tests/test_urllib3_transport.py | 5 ++++- 7 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 9b9727d3402..b472ce3588f 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,5 +1,6 @@ pylint==3.3.4 httpretty==1.1.4 +mocket==3.14.1 pyright==1.1.405 sphinx==7.1.2 sphinx-rtd-theme==2.0.0rc4 diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py index a11b2f88293..8d1110a8ed5 100644 --- a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_otlp_client.py @@ -14,6 +14,7 @@ from io import BytesIO from typing import Final, Literal +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._base import ( BaseHTTPResult, BaseHTTPTransport, diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py index f673de316b8..fbab43d85b5 100644 --- a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_requests.py @@ -8,6 +8,7 @@ from dataclasses import dataclass from typing import TYPE_CHECKING +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._base import ( BaseHTTPResult, BaseHTTPTransport, @@ -84,8 +85,10 @@ def request( ) # pylint: disable-next=broad-exception-caught except Exception as error: + # pylint: disable-next=unexpected-keyword-arg return RequestsHTTPResult(error=error) + # pylint: disable-next=unexpected-keyword-arg return RequestsHTTPResult( status_code=response.status_code, reason=response.reason, diff --git a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py index a7292124b03..1e537056d8f 100644 --- a/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py +++ b/exporter/opentelemetry-exporter-http-transport/src/opentelemetry/exporter/http/transport/_urllib3.py @@ -5,6 +5,7 @@ import warnings from dataclasses import dataclass +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._base import ( BaseHTTPResult, BaseHTTPTransport, @@ -98,8 +99,10 @@ def request( ) # pylint: disable-next=broad-exception-caught except Exception as error: + # pylint: disable-next=unexpected-keyword-arg return Urllib3HTTPResult(error=error) + # pylint: disable-next=unexpected-keyword-arg return Urllib3HTTPResult( status_code=response.status, reason=response.reason, diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py index 7e9b6cc2c60..21b14dd3663 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_otlp_client.py @@ -10,10 +10,14 @@ from dataclasses import dataclass from unittest.mock import Mock, patch +# pylint: disable=unexpected-keyword-arg +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._base import ( BaseHTTPResult, BaseHTTPTransport, ) + +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._otlp_client import ( Compression, OTLPHTTPClient, diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py index f8c49311680..0233daf93ab 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_requests_transport.py @@ -11,6 +11,7 @@ from mocket import Mocket, Mocketizer, mocketize from mocket.mocks.mockhttp import Entry +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._requests import ( RequestsHTTPResult, RequestsHTTPTransport, @@ -88,7 +89,9 @@ def test_request_returns_status_code_and_reason(self): for status_code, reason in cases: with self.subTest(status_code=status_code): with Mocketizer(): - Entry.single_register(Entry.POST, _TEST_URL, status=status_code) + Entry.single_register( + Entry.POST, _TEST_URL, status=status_code + ) transport = RequestsHTTPTransport() result = transport.request("POST", _TEST_URL) self.assertEqual(result.status_code, status_code) diff --git a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py index 6cbb50ecafd..9b4400b2249 100644 --- a/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py +++ b/exporter/opentelemetry-exporter-http-transport/tests/test_urllib3_transport.py @@ -11,6 +11,7 @@ from mocket import Mocket, Mocketizer, mocketize from mocket.mocks.mockhttp import Entry +# pylint: disable-next=import-error from opentelemetry.exporter.http.transport._urllib3 import ( Urllib3HTTPResult, Urllib3HTTPTransport, @@ -90,7 +91,9 @@ def test_request_returns_status_code_and_reason(self): for status_code, reason in cases: with self.subTest(status_code=status_code): with Mocketizer(): - Entry.single_register(Entry.POST, _TEST_URL, status=status_code) + Entry.single_register( + Entry.POST, _TEST_URL, status=status_code + ) transport = Urllib3HTTPTransport() result = transport.request("POST", _TEST_URL) self.assertEqual(result.status_code, status_code)