From 58e4da3b46fb1683e66454feea2c500b5b5eb941 Mon Sep 17 00:00:00 2001 From: Oleg A Date: Sat, 15 Jan 2022 02:52:36 +0300 Subject: [PATCH 1/6] fix: correct _UrlFilterT --- .../opentelemetry/instrumentation/aiohttp_client/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py index 0c5a695bda..b5b3c4b66d 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py @@ -91,7 +91,7 @@ def response_hook(span: Span, params: typing.Union[ import aiohttp import wrapt - +import yarl from opentelemetry import context as context_api from opentelemetry import trace from opentelemetry.instrumentation.aiohttp_client.package import _instruments @@ -108,7 +108,7 @@ def response_hook(span: Span, params: typing.Union[ from opentelemetry.trace.status import Status, StatusCode from opentelemetry.util.http import remove_url_credentials -_UrlFilterT = typing.Optional[typing.Callable[[str], str]] +_UrlFilterT = typing.Optional[typing.Callable[[yarl.URL], str]] _RequestHookT = typing.Optional[ typing.Callable[[Span, aiohttp.TraceRequestStartParams], None] ] From 9d2bfc794fa0db3055d4d9b969c57998f33b25da Mon Sep 17 00:00:00 2001 From: Oleg A Date: Sat, 15 Jan 2022 03:02:55 +0300 Subject: [PATCH 2/6] docs: CHANGELOG.md update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dfa240b90..9521c7dc77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-instrumentation-asgi` ASGI: Conditionally create SERVER spans ([#843](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/843)) +- `opentelemetry-instrumentation-aiohttp-client` aiohttp: Correct url filter input type + ([#843](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/864)) + ## [1.8.0-0.27b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.8.0-0.27b0) - 2021-12-17 From 69e5ccfbac71478b4ed95aa82557b25d82a9ad92 Mon Sep 17 00:00:00 2001 From: Oleg A Date: Tue, 1 Feb 2022 18:49:56 +0300 Subject: [PATCH 3/6] style: apply isort --- .../src/opentelemetry/instrumentation/aiohttp_client/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py index b5b3c4b66d..2b6e11ceac 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py @@ -92,6 +92,7 @@ def response_hook(span: Span, params: typing.Union[ import aiohttp import wrapt import yarl + from opentelemetry import context as context_api from opentelemetry import trace from opentelemetry.instrumentation.aiohttp_client.package import _instruments From e482ba54fc119a16e001cccc0753554c92549c3e Mon Sep 17 00:00:00 2001 From: Oleg A Date: Tue, 1 Feb 2022 23:13:06 +0300 Subject: [PATCH 4/6] fix: add yarl to docs requirements --- docs-requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs-requirements.txt b/docs-requirements.txt index f56f5613ac..147df324d2 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -37,3 +37,4 @@ sqlalchemy>=1.0 tornado>=5.1.1 ddtrace>=0.34.0 httpx~=0.18.0 +yarl==1.7.2 From 00a125d79f764efaaae6a103a3d853e0d3c931e8 Mon Sep 17 00:00:00 2001 From: Oleg A Date: Tue, 1 Feb 2022 23:41:52 +0300 Subject: [PATCH 5/6] Revert "fix: add yarl to docs requirements" This reverts commit e482ba54fc119a16e001cccc0753554c92549c3e. --- docs-requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/docs-requirements.txt b/docs-requirements.txt index 147df324d2..f56f5613ac 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -37,4 +37,3 @@ sqlalchemy>=1.0 tornado>=5.1.1 ddtrace>=0.34.0 httpx~=0.18.0 -yarl==1.7.2 From f817af6e3275d6cd4028903feaaa917fc68fc40b Mon Sep 17 00:00:00 2001 From: Oleg A Date: Tue, 1 Feb 2022 23:42:29 +0300 Subject: [PATCH 6/6] fix: add yarl to nitpick exceptions --- docs/nitpick-exceptions.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/nitpick-exceptions.ini b/docs/nitpick-exceptions.ini index 8c27227f82..c498446918 100644 --- a/docs/nitpick-exceptions.ini +++ b/docs/nitpick-exceptions.ini @@ -25,6 +25,7 @@ class_references= httpx.AsyncBaseTransport httpx.SyncByteStream httpx.AsyncByteStream + yarl.URL anys= ; API