From 61d4c000364a2fcd37bfa6e1d6079e68138075a6 Mon Sep 17 00:00:00 2001 From: etserend Date: Tue, 17 Nov 2026 10:05:19 -0600 Subject: [PATCH] fix(deps): require OpenTelemetry >=1.45.1 (SAO-20688) Raise opentelemetry-api/sdk/exporter-otlp-proto-http to ^1.45.1 and the optional HTTP instrumentation extras to 0.66b2 in the root package, and the api/sdk floors in splunk-ao-a2a. Refresh every locked OpenTelemetry package to 1.45.2. OpenTelemetry 1.45 moved OTLP HTTP delivery behind BaseHTTPTransport and removed OTLPSpanExporter._export. DiagnosticOTLPSpanExporter now wraps the exporter transport to capture 2xx acknowledgements for rejection detection. Fixes VULN-129942, VULN-130743. Co-Authored-By: Claude --- AGENTS.md | 2 +- CHANGELOG.md | 5 + poetry.lock | 254 ++++++++++++++++---------- pyproject.toml | 14 +- splunk-ao-a2a/pyproject.toml | 4 +- src/splunk_ao/exporter/diagnostics.py | 61 ++++++- tests/test_exporter_diagnostics.py | 6 +- 7 files changed, 224 insertions(+), 122 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 1e959d33..c1b42de0 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -91,7 +91,7 @@ not the main API documentation contract. | Area | Stack and responsibility | |---|---| -| `src/splunk_ao/` | Python 3.11–3.14, Pydantic v2, OpenTelemetry 1.38, `galileo-core` 4.x; public SDK | +| `src/splunk_ao/` | Python 3.11–3.14, Pydantic v2, OpenTelemetry 1.45, `galileo-core` 4.x; public SDK | | `tests/` | pytest 9, xdist, respx, socket blocking, timeout and coverage plugins | | `splunk-ao-a2a/` | Independently released native-OTel A2A instrumentation; uv/Hatch | | `splunk-ao-adk/` | Independently released Google ADK handler integration; uv/Hatch | diff --git a/CHANGELOG.md b/CHANGELOG.md index be6ab03b..cf598f8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Export acknowledgement diagnostics now capture OTLP responses through the OpenTelemetry 1.45 HTTP transport instead of the removed private `_export` hook; behavior is unchanged. Transport errors now surface as a failed export result instead of an exception, matching the standard exporter. + ### Security +- Require OpenTelemetry API, SDK, and OTLP HTTP exporter `>=1.45.1` (and move the optional HTTP instrumentation extras to the matching `0.66b2` release) to pick up the TLS-verification and `tracestate` parsing fixes (SAO-20688). - Raised minimum `aiohttp` (3.14.4), `mcp` (1.30.0), and `filelock` (4.2.1) and refreshed the lock file for `pillow` 13.0.0, `oauthlib` 4.0.1, `pyasn1` 0.6.5, and `langgraph` 1.2.22 to pick up published vulnerability fixes (SAO-20688). ## [0.8.0] diff --git a/poetry.lock b/poetry.lock index 7f892509..b3e4d667 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1755,9 +1755,10 @@ all = ["mypy (>=1.11.2)", "pytest (>=8.3.2)", "ruff (>=0.6.2)"] name = "importlib-metadata" version = "8.7.0" description = "Read metadata from Python packages" -optional = false +optional = true python-versions = ">=3.9" groups = ["main"] +markers = "python_version <= \"3.13\" and (extra == \"crewai\" or extra == \"all\")" files = [ {file = "importlib_metadata-8.7.0-py3-none-any.whl", hash = "sha256:e5dd1551894c77868a30651cef00984d50e1002d06942a7101d34870c5f02afd"}, {file = "importlib_metadata-8.7.0.tar.gz", hash = "sha256:d13b81ad223b890aa16c5471f2ac3056cf76c5f10f82d6f9292f0b415f389000"}, @@ -3106,296 +3107,346 @@ et-xmlfile = "*" [[package]] name = "opentelemetry-api" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Python API" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_api-1.38.0-py3-none-any.whl", hash = "sha256:2891b0197f47124454ab9f0cf58f3be33faca394457ac3e09daba13ff50aa582"}, - {file = "opentelemetry_api-1.38.0.tar.gz", hash = "sha256:f4c193b5e8acb0912b06ac5b16321908dd0843d75049c091487322284a3eea12"}, + {file = "opentelemetry_api-1.45.2-py3-none-any.whl", hash = "sha256:2cbd737377e710ee740d261c94e93fa0f08e6d037c18f17513cc0a2d94479a34"}, + {file = "opentelemetry_api-1.45.2.tar.gz", hash = "sha256:d7b0008e21e5fd61cbe7a7f34ca3b6905a78ab677d9bc395e299359c75cda6b4"}, ] [package.dependencies] -importlib-metadata = ">=6.0,<8.8.0" typing-extensions = ">=4.5.0" +[[package]] +name = "opentelemetry-exporter-http-transport" +version = "0.66b2" +description = "OpenTelemetry Exporters HTTP transport" +optional = false +python-versions = ">=3.10" +groups = ["main"] +files = [ + {file = "opentelemetry_exporter_http_transport-0.66b2-py3-none-any.whl", hash = "sha256:fd5f5b490c099acda1cd7b909d5e8981436bf18cc8c6098d302d114c271720e9"}, + {file = "opentelemetry_exporter_http_transport-0.66b2.tar.gz", hash = "sha256:66d6ed810a515432c8891da9a834464332fd70badeca45bdeeae81b4280c903b"}, +] + +[package.dependencies] +opentelemetry-api = ">=1.15,<2.0" +requests = {version = ">=2.25,<3.0", optional = true, markers = "extra == \"requests\""} + +[package.extras] +requests = ["requests (>=2.25,<3.0)"] +urllib3 = ["urllib3 (>=1.26)"] + +[[package]] +name = "opentelemetry-exporter-otlp-common" +version = "0.66b2" +description = "OpenTelemetry OTLP HTTP export utilities" +optional = false +python-versions = ">=3.10" +groups = ["main"] +files = [ + {file = "opentelemetry_exporter_otlp_common-0.66b2-py3-none-any.whl", hash = "sha256:ace86efb75489f925f1ef809856ae5f0c7db534e4afdc624530222228b1236a5"}, + {file = "opentelemetry_exporter_otlp_common-0.66b2.tar.gz", hash = "sha256:06f5a9b88638e310efa1f1d206cdf6b75393e112aba4e174a963416192bd1028"}, +] + +[package.dependencies] +opentelemetry-sdk = ">=1.45.2,<1.46.0" + +[package.extras] +http = ["opentelemetry-exporter-http-transport (==0.66b2)"] + [[package]] name = "opentelemetry-exporter-otlp-proto-common" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Protobuf encoding" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_exporter_otlp_proto_common-1.38.0-py3-none-any.whl", hash = "sha256:03cb76ab213300fe4f4c62b7d8f17d97fcfd21b89f0b5ce38ea156327ddda74a"}, - {file = "opentelemetry_exporter_otlp_proto_common-1.38.0.tar.gz", hash = "sha256:e333278afab4695aa8114eeb7bf4e44e65c6607d54968271a249c180b2cb605c"}, + {file = "opentelemetry_exporter_otlp_proto_common-1.45.2-py3-none-any.whl", hash = "sha256:af483b24217028892f017096731b794b196b785025d2e6808874720fd0b05a80"}, + {file = "opentelemetry_exporter_otlp_proto_common-1.45.2.tar.gz", hash = "sha256:f1f2806f3f28ce7938033823e50934fcd91595a39de38e69a28a51e19f40fc6d"}, ] [package.dependencies] -opentelemetry-proto = "1.38.0" +opentelemetry-proto = "1.45.2" [[package]] name = "opentelemetry-exporter-otlp-proto-grpc" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Collector Protobuf over gRPC Exporter" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "python_version <= \"3.13\" and (extra == \"crewai\" or extra == \"all\")" files = [ - {file = "opentelemetry_exporter_otlp_proto_grpc-1.38.0-py3-none-any.whl", hash = "sha256:7c49fd9b4bd0dbe9ba13d91f764c2d20b0025649a6e4ac35792fb8d84d764bc7"}, - {file = "opentelemetry_exporter_otlp_proto_grpc-1.38.0.tar.gz", hash = "sha256:2473935e9eac71f401de6101d37d6f3f0f1831db92b953c7dcc912536158ebd6"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.45.2-py3-none-any.whl", hash = "sha256:8a48d60835e90536846bd82de487bfbd81bccb5a1b3d0fb82edeea17db07395c"}, + {file = "opentelemetry_exporter_otlp_proto_grpc-1.45.2.tar.gz", hash = "sha256:9e4a6490ca7711479fec7c519425bc09808abbc9a2a1775528edecf200d19a5a"}, ] [package.dependencies] googleapis-common-protos = ">=1.57,<2.0" grpcio = [ {version = ">=1.63.2,<2.0.0", markers = "python_version < \"3.13\""}, - {version = ">=1.66.2,<2.0.0", markers = "python_version >= \"3.13\""}, + {version = ">=1.66.2,<2.0.0", markers = "python_version == \"3.13\""}, ] opentelemetry-api = ">=1.15,<2.0" -opentelemetry-exporter-otlp-proto-common = "1.38.0" -opentelemetry-proto = "1.38.0" -opentelemetry-sdk = ">=1.38.0,<1.39.0" +opentelemetry-exporter-otlp-common = "0.66b2" +opentelemetry-exporter-otlp-proto-common = "1.45.2" +opentelemetry-proto = "1.45.2" +opentelemetry-sdk = ">=1.45.2,<1.46.0" typing-extensions = ">=4.6.0" +[package.extras] +gcp-auth = ["opentelemetry-exporter-credential-provider-gcp (>=0.59b0)"] + [[package]] name = "opentelemetry-exporter-otlp-proto-http" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Collector Protobuf over HTTP Exporter" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_exporter_otlp_proto_http-1.38.0-py3-none-any.whl", hash = "sha256:84b937305edfc563f08ec69b9cb2298be8188371217e867c1854d77198d0825b"}, - {file = "opentelemetry_exporter_otlp_proto_http-1.38.0.tar.gz", hash = "sha256:f16bd44baf15cbe07633c5112ffc68229d0edbeac7b37610be0b2def4e21e90b"}, + {file = "opentelemetry_exporter_otlp_proto_http-1.45.2-py3-none-any.whl", hash = "sha256:6e4d025138829d0ee57946930c2ccad6491ad4d92a958e9c7eea69278fe60cfc"}, + {file = "opentelemetry_exporter_otlp_proto_http-1.45.2.tar.gz", hash = "sha256:5984a3fb46bc4628e4e2b85d4a6e72637e03962aae6cf372791137768a4ad939"}, ] [package.dependencies] googleapis-common-protos = ">=1.52,<2.0" opentelemetry-api = ">=1.15,<2.0" -opentelemetry-exporter-otlp-proto-common = "1.38.0" -opentelemetry-proto = "1.38.0" -opentelemetry-sdk = ">=1.38.0,<1.39.0" +opentelemetry-exporter-http-transport = {version = "0.66b2", extras = ["requests"]} +opentelemetry-exporter-otlp-common = "0.66b2" +opentelemetry-exporter-otlp-proto-common = "1.45.2" +opentelemetry-proto = "1.45.2" +opentelemetry-sdk = ">=1.45.2,<1.46.0" requests = ">=2.7,<3.0" typing-extensions = ">=4.5.0" +[package.extras] +gcp-auth = ["opentelemetry-exporter-credential-provider-gcp (>=0.59b0)"] +requests = ["opentelemetry-exporter-http-transport[requests] (==0.66b2)", "requests (>=2.7,<3.0)"] + [[package]] name = "opentelemetry-instrumentation" -version = "0.59b0" +version = "0.66b2" description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation-0.59b0-py3-none-any.whl", hash = "sha256:44082cc8fe56b0186e87ee8f7c17c327c4c2ce93bdbe86496e600985d74368ee"}, - {file = "opentelemetry_instrumentation-0.59b0.tar.gz", hash = "sha256:6010f0faaacdaf7c4dff8aac84e226d23437b331dcda7e70367f6d73a7db1adc"}, + {file = "opentelemetry_instrumentation-0.66b2-py3-none-any.whl", hash = "sha256:fa9ccfdab147a14af8107d19ef0a7b5015675273c5adced7a1fc38f28b42ec4c"}, + {file = "opentelemetry_instrumentation-0.66b2.tar.gz", hash = "sha256:02b094150e53b76f5906d75e628dbb3833bbc6e62fa109b5c7ba0c081865e923"}, ] [package.dependencies] opentelemetry-api = ">=1.4,<2.0" -opentelemetry-semantic-conventions = "0.59b0" +opentelemetry-semantic-conventions = "0.66b2" packaging = ">=18.0" -wrapt = ">=1.0.0,<2.0.0" +wrapt = ">=1.0.0,<3.0.0" [[package]] name = "opentelemetry-instrumentation-aiohttp-client" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry aiohttp client instrumentation" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_aiohttp_client-0.59b0-py3-none-any.whl", hash = "sha256:8e7f234d2b6b385d5b1757ba7f13baa71c45ec020e1a08ba7f7649da7958470a"}, - {file = "opentelemetry_instrumentation_aiohttp_client-0.59b0.tar.gz", hash = "sha256:665ee520f2fb5f44d6d600918eb7bbd2c29b355e0d0deda49991db857adee51f"}, + {file = "opentelemetry_instrumentation_aiohttp_client-0.66b2-py3-none-any.whl", hash = "sha256:33c51743ca225c2405b81b40ac744697804aef44b530f64d1f524c9a9cd3dca2"}, + {file = "opentelemetry_instrumentation_aiohttp_client-0.66b2.tar.gz", hash = "sha256:9b1b3ec682b7b1df3d3c8f7ad1745703be847391bb722c9bd39b661902c667a4"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" -wrapt = ">=1.0.0,<2.0.0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" +wrapt = ">=1.0.0,<3.0.0" [package.extras] instruments = ["aiohttp (>=3.0,<4.0)"] [[package]] name = "opentelemetry-instrumentation-asgi" -version = "0.59b0" +version = "0.66b2" description = "ASGI instrumentation for OpenTelemetry" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_asgi-0.59b0-py3-none-any.whl", hash = "sha256:ba9703e09d2c33c52fa798171f344c8123488fcd45017887981df088452d3c53"}, - {file = "opentelemetry_instrumentation_asgi-0.59b0.tar.gz", hash = "sha256:2509d6fe9fd829399ce3536e3a00426c7e3aa359fc1ed9ceee1628b56da40e7a"}, + {file = "opentelemetry_instrumentation_asgi-0.66b2-py3-none-any.whl", hash = "sha256:9c5ec36e6b898f18e6b07b5077c2a3bafa9abf69de98e729797b9efa465f8aa3"}, + {file = "opentelemetry_instrumentation_asgi-0.66b2.tar.gz", hash = "sha256:da8a2df4589976ad483feaec150a78ec7d1947754e420b838a4942361e465bfb"}, ] [package.dependencies] asgiref = ">=3.0,<4.0" opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" [package.extras] instruments = ["asgiref (>=3.0,<4.0)"] [[package]] name = "opentelemetry-instrumentation-fastapi" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry FastAPI Instrumentation" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_fastapi-0.59b0-py3-none-any.whl", hash = "sha256:0d8d00ff7d25cca40a4b2356d1d40a8f001e0668f60c102f5aa6bb721d660c4f"}, - {file = "opentelemetry_instrumentation_fastapi-0.59b0.tar.gz", hash = "sha256:e8fe620cfcca96a7d634003df1bc36a42369dedcdd6893e13fb5903aeeb89b2b"}, + {file = "opentelemetry_instrumentation_fastapi-0.66b2-py3-none-any.whl", hash = "sha256:401eb9fe58cc86015ac0a6682dcaf1b4bcea32c428969853d02171d6650d1774"}, + {file = "opentelemetry_instrumentation_fastapi-0.66b2.tar.gz", hash = "sha256:bd226e0196990999eef77380a64527a26f35b621e681c3cad860984ecc3c23f5"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-instrumentation-asgi = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-instrumentation-asgi = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" [package.extras] instruments = ["fastapi (>=0.92,<1.0)"] [[package]] name = "opentelemetry-instrumentation-httpx" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry HTTPX Instrumentation" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_httpx-0.59b0-py3-none-any.whl", hash = "sha256:7dc9f66aef4ca3904d877f459a70c78eafd06131dc64d713b9b1b5a7d0a48f05"}, - {file = "opentelemetry_instrumentation_httpx-0.59b0.tar.gz", hash = "sha256:a1cb9b89d9f05a82701cc9ab9cfa3db54fd76932489449778b350bc1b9f0e872"}, + {file = "opentelemetry_instrumentation_httpx-0.66b2-py3-none-any.whl", hash = "sha256:93e2b6ab1a505d76ec3d98abcf7e8527d4712167d6c3b5ebbb9c68d9309d9ba5"}, + {file = "opentelemetry_instrumentation_httpx-0.66b2.tar.gz", hash = "sha256:b4c81e4a6dc7b8d7cb2d3088eb8848f6db6bd4abdc443ac9586ec176f1460187"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" -wrapt = ">=1.0.0,<2.0.0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" +wrapt = ">=1.0.0,<3.0.0" [package.extras] -instruments = ["httpx (>=0.18.0)"] +instruments-any = ["httpx (>=0.18.0)", "httpx2 (>=2.0.0)"] [[package]] name = "opentelemetry-instrumentation-requests" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry requests instrumentation" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_requests-0.59b0-py3-none-any.whl", hash = "sha256:d43121532877e31a46c48649279cec2504ee1e0ceb3c87b80fe5ccd7eafc14c1"}, - {file = "opentelemetry_instrumentation_requests-0.59b0.tar.gz", hash = "sha256:9af2ffe3317f03074d7f865919139e89170b6763a0251b68c25e8e64e04b3400"}, + {file = "opentelemetry_instrumentation_requests-0.66b2-py3-none-any.whl", hash = "sha256:b0ba903a0bd7ebb234c8b32d3d957efc4061ba8571916558dc3f3dcdabb5e5e1"}, + {file = "opentelemetry_instrumentation_requests-0.66b2.tar.gz", hash = "sha256:bcfbdc3ff3ec8524044908788f0e7f3c25e219053b496fd9926d75f8d7c7bc96"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" [package.extras] instruments = ["requests (>=2.0,<3.0)"] [[package]] name = "opentelemetry-instrumentation-starlette" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry Starlette Instrumentation" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_instrumentation_starlette-0.59b0-py3-none-any.whl", hash = "sha256:a833b97d297e4b2aaf58041612663dbabb8380e3993c76a4e32b3e351470f321"}, - {file = "opentelemetry_instrumentation_starlette-0.59b0.tar.gz", hash = "sha256:3f033fd92d6a8e4122ebcb3d83afc5c64d6be7930e9094876eb02b8afbd08ba5"}, + {file = "opentelemetry_instrumentation_starlette-0.66b2-py3-none-any.whl", hash = "sha256:5b509ae05877dca45a8e8ba08c464401197acd622f7931d4cad02666cc039d4a"}, + {file = "opentelemetry_instrumentation_starlette-0.66b2.tar.gz", hash = "sha256:c5b4eb86d7a472eeab1956798ed87659546cda4a8588298a44992f783410dca6"}, ] [package.dependencies] opentelemetry-api = ">=1.12,<2.0" -opentelemetry-instrumentation = "0.59b0" -opentelemetry-instrumentation-asgi = "0.59b0" -opentelemetry-semantic-conventions = "0.59b0" -opentelemetry-util-http = "0.59b0" +opentelemetry-instrumentation = "0.66b2" +opentelemetry-instrumentation-asgi = "0.66b2" +opentelemetry-semantic-conventions = "0.66b2" +opentelemetry-util-http = "0.66b2" [package.extras] instruments = ["starlette (>=0.13)"] [[package]] name = "opentelemetry-proto" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Python Proto" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_proto-1.38.0-py3-none-any.whl", hash = "sha256:b6ebe54d3217c42e45462e2a1ae28c3e2bf2ec5a5645236a490f55f45f1a0a18"}, - {file = "opentelemetry_proto-1.38.0.tar.gz", hash = "sha256:88b161e89d9d372ce723da289b7da74c3a8354a8e5359992be813942969ed468"}, + {file = "opentelemetry_proto-1.45.2-py3-none-any.whl", hash = "sha256:03a7ca1b43f89fd5b965d5975902bb2515c0c86e2428b456836e9a6149c6235a"}, + {file = "opentelemetry_proto-1.45.2.tar.gz", hash = "sha256:bd8d23cf770605b0af9b7be2071d26a464fea289d35429abfd2a66226114ad64"}, ] [package.dependencies] -protobuf = ">=5.0,<7.0" +protobuf = ">=5.0,<8.0" [[package]] name = "opentelemetry-sdk" -version = "1.38.0" +version = "1.45.2" description = "OpenTelemetry Python SDK" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_sdk-1.38.0-py3-none-any.whl", hash = "sha256:1c66af6564ecc1553d72d811a01df063ff097cdc82ce188da9951f93b8d10f6b"}, - {file = "opentelemetry_sdk-1.38.0.tar.gz", hash = "sha256:93df5d4d871ed09cb4272305be4d996236eedb232253e3ab864c8620f051cebe"}, + {file = "opentelemetry_sdk-1.45.2-py3-none-any.whl", hash = "sha256:ff974ea70ee4f1d51e2ec152db37c2b626c7bf82bb3f7d86114fd8704e7199c6"}, + {file = "opentelemetry_sdk-1.45.2.tar.gz", hash = "sha256:7eec4de13dd21ff3a1670dcb0e02079e692736f94d733dfdce5af461d884248d"}, ] [package.dependencies] -opentelemetry-api = "1.38.0" -opentelemetry-semantic-conventions = "0.59b0" +opentelemetry-api = "1.45.2" +opentelemetry-semantic-conventions = "0.66b2" typing-extensions = ">=4.5.0" +[package.extras] +file-configuration = ["opentelemetry-configuration (==0.66b2)"] + [[package]] name = "opentelemetry-semantic-conventions" -version = "0.59b0" +version = "0.66b2" description = "OpenTelemetry Semantic Conventions" optional = false -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] files = [ - {file = "opentelemetry_semantic_conventions-0.59b0-py3-none-any.whl", hash = "sha256:35d3b8833ef97d614136e253c1da9342b4c3c083bbaf29ce31d572a1c3825eed"}, - {file = "opentelemetry_semantic_conventions-0.59b0.tar.gz", hash = "sha256:7a6db3f30d70202d5bf9fa4b69bc866ca6a30437287de6c510fb594878aed6b0"}, + {file = "opentelemetry_semantic_conventions-0.66b2-py3-none-any.whl", hash = "sha256:4cbe61e5f9275d57ab31708446e7938ef4291ebbe6a7fca6f7a629c5acae87d8"}, + {file = "opentelemetry_semantic_conventions-0.66b2.tar.gz", hash = "sha256:7da5f1a5dc4383eb66711d4d3d3e71824d9403ac1559fea021cc103c1a4c4976"}, ] [package.dependencies] -opentelemetry-api = "1.38.0" +opentelemetry-api = "1.45.2" typing-extensions = ">=4.5.0" [[package]] name = "opentelemetry-util-http" -version = "0.59b0" +version = "0.66b2" description = "Web util for OpenTelemetry" optional = true -python-versions = ">=3.9" +python-versions = ">=3.10" groups = ["main"] markers = "extra == \"distributed-tracing\" or extra == \"all\"" files = [ - {file = "opentelemetry_util_http-0.59b0-py3-none-any.whl", hash = "sha256:6d036a07563bce87bf521839c0671b507a02a0d39d7ea61b88efa14c6e25355d"}, - {file = "opentelemetry_util_http-0.59b0.tar.gz", hash = "sha256:ae66ee91be31938d832f3b4bc4eb8a911f6eddd38969c4a871b1230db2a0a560"}, + {file = "opentelemetry_util_http-0.66b2-py3-none-any.whl", hash = "sha256:c4bb5d6744e60353bcaa3e325bc529a1515346b51cb4d9c8e5b730579337e06d"}, + {file = "opentelemetry_util_http-0.66b2.tar.gz", hash = "sha256:7ba066ea609202e474679ddf1d0f753a1e6619bd206b36afaecba4bbb86e25d0"}, ] [[package]] @@ -6650,9 +6701,10 @@ tests = ["build", "coverage", "mypy", "ruff", "wheel"] name = "zipp" version = "3.23.0" description = "Backport of pathlib-compatible object wrapper for zip files" -optional = false +optional = true python-versions = ">=3.9" groups = ["main"] +markers = "python_version <= \"3.13\" and (extra == \"crewai\" or extra == \"all\")" files = [ {file = "zipp-3.23.0-py3-none-any.whl", hash = "sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e"}, {file = "zipp-3.23.0.tar.gz", hash = "sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166"}, @@ -6791,4 +6843,4 @@ openai = ["cryptography", "mcp", "openai", "openai-agents", "packaging"] [metadata] lock-version = "2.1" python-versions = "^3.11,<3.15" -content-hash = "4fd88842290d6e4a6bdb801395e5f813d9ec9ae4839474b74945316b3346f65e" +content-hash = "59381e8dbd6cb173949e532cb73dfcd49118100ec2cd1d5bab3ae4e494a6e4ad" diff --git a/pyproject.toml b/pyproject.toml index 223b5a34..739a8bb0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,8 +30,8 @@ langchain = ["langchain-core", "langchain", "langsmith (>=0.8.0)"] openai = ["openai (>=2.8.0,<3.0.0)", "packaging (>=24.2,<25.0)", "openai-agents (>=0.4.0,<1.0.0)", "cryptography (>=50.0.0)", "mcp (>=1.30.0,<2)"] crewai = ["crewai (>=0.152.0,<2.0.0); python_version < '3.14'", "litellm (>=1.83.14,<2.0.0); python_version < '3.14'", "uv (>=0.13.4); python_version < '3.14'", "aiohttp (>=3.14.4,<4); python_version < '3.14'", "cryptography (>=50.0.0)", "mcp (>=1.30.0,<2)", "pdfminer-six (>=20251107)"] middleware = ["starlette"] -distributed-tracing = ["aiohttp (>=3.14.4,<4)", "opentelemetry-instrumentation-fastapi (==0.59b0)", "opentelemetry-instrumentation-starlette (==0.59b0)", "opentelemetry-instrumentation-requests (==0.59b0)", "opentelemetry-instrumentation-httpx (==0.59b0)", "opentelemetry-instrumentation-aiohttp-client (==0.59b0)"] -all = ["langchain-core", "langchain", "langsmith (>=0.8.0)", "openai (>=2.8.0,<3.0.0)", "packaging (>=24.2,<25.0)", "openai-agents (>=0.4.0,<1.0.0)", "crewai (>=0.152.0,<2.0.0); python_version < '3.14'", "starlette", "litellm (>=1.83.14,<2.0.0); python_version < '3.14'", "uv (>=0.13.4); python_version < '3.14'", "aiohttp (>=3.14.4,<4)", "cryptography (>=50.0.0)", "mcp (>=1.30.0,<2)", "pdfminer-six (>=20251107)", "opentelemetry-instrumentation-fastapi (==0.59b0)", "opentelemetry-instrumentation-starlette (==0.59b0)", "opentelemetry-instrumentation-requests (==0.59b0)", "opentelemetry-instrumentation-httpx (==0.59b0)", "opentelemetry-instrumentation-aiohttp-client (==0.59b0)"] +distributed-tracing = ["aiohttp (>=3.14.4,<4)", "opentelemetry-instrumentation-fastapi (==0.66b2)", "opentelemetry-instrumentation-starlette (==0.66b2)", "opentelemetry-instrumentation-requests (==0.66b2)", "opentelemetry-instrumentation-httpx (==0.66b2)", "opentelemetry-instrumentation-aiohttp-client (==0.66b2)"] +all = ["langchain-core", "langchain", "langsmith (>=0.8.0)", "openai (>=2.8.0,<3.0.0)", "packaging (>=24.2,<25.0)", "openai-agents (>=0.4.0,<1.0.0)", "crewai (>=0.152.0,<2.0.0); python_version < '3.14'", "starlette", "litellm (>=1.83.14,<2.0.0); python_version < '3.14'", "uv (>=0.13.4); python_version < '3.14'", "aiohttp (>=3.14.4,<4)", "cryptography (>=50.0.0)", "mcp (>=1.30.0,<2)", "pdfminer-six (>=20251107)", "opentelemetry-instrumentation-fastapi (==0.66b2)", "opentelemetry-instrumentation-starlette (==0.66b2)", "opentelemetry-instrumentation-requests (==0.66b2)", "opentelemetry-instrumentation-httpx (==0.66b2)", "opentelemetry-instrumentation-aiohttp-client (==0.66b2)"] @@ -59,11 +59,11 @@ typing-extensions = { version = ">=4.5.0" } opentelemetry-sdk = "^1.38.0" opentelemetry-api = "^1.38.0" opentelemetry-exporter-otlp-proto-http = "^1.38.0" -opentelemetry-instrumentation-fastapi = { version = "0.59b0", optional = true } -opentelemetry-instrumentation-starlette = { version = "0.59b0", optional = true } -opentelemetry-instrumentation-requests = { version = "0.59b0", optional = true } -opentelemetry-instrumentation-httpx = { version = "0.59b0", optional = true } -opentelemetry-instrumentation-aiohttp-client = { version = "0.59b0", optional = true } +opentelemetry-instrumentation-fastapi = { version = "0.66b2", optional = true } +opentelemetry-instrumentation-starlette = { version = "0.66b2", optional = true } +opentelemetry-instrumentation-requests = { version = "0.66b2", optional = true } +opentelemetry-instrumentation-httpx = { version = "0.66b2", optional = true } +opentelemetry-instrumentation-aiohttp-client = { version = "0.66b2", optional = true } filelock = ">=4.2.1" idna = ">=3.15,<4" python-dotenv = ">=1.2.2" diff --git a/splunk-ao-a2a/pyproject.toml b/splunk-ao-a2a/pyproject.toml index be8f381f..b06ccf77 100644 --- a/splunk-ao-a2a/pyproject.toml +++ b/splunk-ao-a2a/pyproject.toml @@ -17,8 +17,8 @@ classifiers = [ dependencies = [ "splunk-ao>=0.1.0,<1.0.0", "a2a-sdk>=0.3.0,<1.0.0", - "opentelemetry-api>=1.38.0", - "opentelemetry-sdk>=1.38.0", + "opentelemetry-api>=1.45.1", + "opentelemetry-sdk>=1.45.1", ] [project.urls] diff --git a/src/splunk_ao/exporter/diagnostics.py b/src/splunk_ao/exporter/diagnostics.py index 459a2ead..eadfeab3 100644 --- a/src/splunk_ao/exporter/diagnostics.py +++ b/src/splunk_ao/exporter/diagnostics.py @@ -13,11 +13,11 @@ from urllib.parse import urlsplit from google.protobuf.message import DecodeError +from opentelemetry.exporter.http.transport._base import BaseHTTPResult, BaseHTTPTransport from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter from opentelemetry.proto.collector.trace.v1.trace_service_pb2 import ExportTraceServiceResponse from opentelemetry.sdk.trace import ReadableSpan from opentelemetry.sdk.trace.export import SpanExportResult -from requests import Response from splunk_ao.deployment import DeploymentMode @@ -164,6 +164,7 @@ def __init__(self, *args: Any, deployment: DeploymentMode, **kwargs: Any) -> Non configured_endpoint = str(kwargs.get("endpoint", "")) super().__init__(*args, **kwargs) self._attempt_local = threading.local() + self._install_response_capture() self._health_tracker = _ExportHealthTracker(deployment, getattr(self, "_endpoint", configured_endpoint)) @property @@ -193,10 +194,52 @@ def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult: finally: self._attempt_local.response = None - def _export(self, serialized_data: bytes, timeout_sec: float | None = None) -> Response: - response = super()._export(serialized_data, timeout_sec) - self._attempt_local.response = _snapshot_response(response) if 200 <= response.status_code < 300 else None - return response + def _install_response_capture(self) -> None: + """Wrap the exporter transport so successful acknowledgements can be inspected. + + OpenTelemetry 1.45 moved HTTP delivery behind ``BaseHTTPTransport``. Without the wrapper the health tracker + stays at its unknown state; export itself is unaffected. + """ + client = getattr(self, "_client", None) + transport = getattr(client, "_transport", None) + if client is None or not isinstance(transport, BaseHTTPTransport): + _logger.debug("OTLP transport not available; acknowledgement diagnostics are disabled.") + return + client._transport = _ResponseCapturingTransport(transport, self._attempt_local) + + +class _ResponseCapturingTransport(BaseHTTPTransport): + """Delegating transport that snapshots HTTP 2xx responses for the current export attempt.""" + + def __init__(self, inner: BaseHTTPTransport, attempt_local: threading.local) -> None: + self._inner = inner + self._attempt_local = attempt_local + + def request( + self, + method: str, + url: str, + *, + headers: dict[str, str] | None = None, + timeout: float | None = None, + data: bytes | None = None, + ) -> BaseHTTPResult: + result = self._inner.request(method, url, headers=headers, timeout=timeout, data=data) + status_code = result.status_code + snapshot = None + if status_code is not None and 200 <= status_code < 300: + try: + snapshot = _snapshot_response(result) + except Exception: # diagnostics must never break delivery + snapshot = None + self._attempt_local.response = snapshot + return result + + def close(self) -> None: + self._inner.close() + + def is_connection_error(self, exception: Exception | None) -> bool: + return self._inner.is_connection_error(exception) def get_export_health(owner: object) -> ExportHealth: @@ -205,10 +248,12 @@ def get_export_health(owner: object) -> ExportHealth: return health if isinstance(health, ExportHealth) else UNKNOWN_EXPORT_HEALTH -def _snapshot_response(response: Response) -> _ResponseSnapshot: - content_type = response.headers.get("Content-Type", "").partition(";")[0].strip().lower() +def _snapshot_response(response: BaseHTTPResult) -> _ResponseSnapshot: + content_type = response.headers().get("Content-Type", "").partition(";")[0].strip().lower() return _ResponseSnapshot( - status_code=response.status_code, content_type=content_type, body=bytes(response.content[:_MAX_RESPONSE_BYTES]) + status_code=response.status_code or 0, + content_type=content_type, + body=bytes(response.content()[:_MAX_RESPONSE_BYTES]), ) diff --git a/tests/test_exporter_diagnostics.py b/tests/test_exporter_diagnostics.py index ef8e64da..d9f4cc1f 100644 --- a/tests/test_exporter_diagnostics.py +++ b/tests/test_exporter_diagnostics.py @@ -35,7 +35,7 @@ def __init__(self, *responses: Response | Exception) -> None: self.responses = list(responses) self.post_calls = 0 - def post(self, **_: Any) -> Response: + def request(self, **_: Any) -> Response: outcome = self.responses[min(self.post_calls, len(self.responses) - 1)] self.post_calls += 1 if isinstance(outcome, Exception): @@ -169,8 +169,8 @@ def test_transport_exception_is_unchanged_and_clears_response_snapshot() -> None exporter = diagnostic_exporter(FakeSession(Timeout("standard exporter failure"))) exporter._attempt_local.response = object() - with pytest.raises(Timeout, match="standard exporter failure"): - exporter.export(()) + # OpenTelemetry 1.45 transports return errors as a failed result instead of raising. + assert exporter.export(()) == SpanExportResult.FAILURE assert exporter.export_health.healthy is None assert exporter._attempt_local.response is None