From c100b21fa40727709bb31cf4e2b67b737a09ea2c Mon Sep 17 00:00:00 2001 From: "Ryan, Siu Long Wa" Date: Fri, 2 Jul 2021 05:01:25 +0800 Subject: [PATCH] Require aiopg to be less than 1.3.0 (#560) --- CHANGELOG.md | 2 ++ docs-requirements.txt | 2 +- .../src/opentelemetry/instrumentation/aiopg/package.py | 2 +- .../src/opentelemetry/instrumentation/bootstrap_gen.py | 2 +- tox.ini | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa3f9704d..3713fc933 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/538)) - Changed the psycopg2-binary to psycopg2 as dependency in production ([#543](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/543)) +- Require aiopg to be less than 1.3.0 + ([#560](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/560)) ### Added - `opentelemetry-instrumentation-httpx` Add `httpx` instrumentation diff --git a/docs-requirements.txt b/docs-requirements.txt index 748cfdbaa..0a90a9b79 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -20,7 +20,7 @@ django>=2.2 # Required by instrumentation and exporter packages aiohttp~=3.0 -aiopg>=0.13.0 +aiopg>=0.13.0,<1.3.0 asyncpg>=0.12.0 boto~=2.0 botocore~=1.0 diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py index 312f5d172..660a8577c 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py +++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/package.py @@ -13,4 +13,4 @@ # limitations under the License. -_instruments = ("aiopg >= 0.13.0",) +_instruments = ("aiopg >= 0.13.0, < 1.3.0",) diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index 5d6694acd..b49f40905 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -21,7 +21,7 @@ libraries = { "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.23.dev0", }, "aiopg": { - "library": "aiopg >= 0.13.0", + "library": "aiopg >= 0.13.0, < 1.3.0", "instrumentation": "opentelemetry-instrumentation-aiopg==0.23.dev0", }, "asgiref": { diff --git a/tox.ini b/tox.ini index 06504e4b1..08e2f54c0 100644 --- a/tox.ini +++ b/tox.ini @@ -404,7 +404,7 @@ deps = pymongo ~= 3.1 PyMySQL ~= 0.10.1 psycopg2 ~= 2.8.4 - aiopg >= 0.13.0 + aiopg >= 0.13.0, < 1.3.0 sqlalchemy ~= 1.3.16 redis ~= 3.3.11 celery[pytest] >= 4.0, < 6.0