diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a3ae3f322..360b02014c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#814](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/814)) - `opentelemetry-instrumentation-falcon` Falcon: Conditionally create SERVER spans ([#867](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/867)) +- `opentelemetry-instrumentation-pymongo` now supports `pymongo v4` + ([#876](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/876)) ### Fixed diff --git a/instrumentation/README.md b/instrumentation/README.md index f88f4b51e3..00d6082d8a 100644 --- a/instrumentation/README.md +++ b/instrumentation/README.md @@ -24,7 +24,7 @@ | [opentelemetry-instrumentation-pika](./opentelemetry-instrumentation-pika) | pika >= 0.12.0 | | [opentelemetry-instrumentation-psycopg2](./opentelemetry-instrumentation-psycopg2) | psycopg2 >= 2.7.3.1 | | [opentelemetry-instrumentation-pymemcache](./opentelemetry-instrumentation-pymemcache) | pymemcache ~= 1.3 | -| [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo ~= 3.1 | +| [opentelemetry-instrumentation-pymongo](./opentelemetry-instrumentation-pymongo) | pymongo >= 3.1, < 5.0 | | [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 | | [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 | | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 | diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/package.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/package.py index 4c118dd4d5..5051e7cb05 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/package.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/package.py @@ -13,4 +13,4 @@ # limitations under the License. -_instruments = ("pymongo ~= 3.1",) +_instruments = ("pymongo >= 3.1, < 5.0",) diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index fc6af46d97..a685e3592c 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -97,7 +97,7 @@ "instrumentation": "opentelemetry-instrumentation-pymemcache==0.28b0", }, "pymongo": { - "library": "pymongo ~= 3.1", + "library": "pymongo ~= 3.1, < 5.0", "instrumentation": "opentelemetry-instrumentation-pymongo==0.28b0", }, "PyMySQL": { diff --git a/tox.ini b/tox.ini index c319a50e38..1399c41ebc 100644 --- a/tox.ini +++ b/tox.ini @@ -474,7 +474,7 @@ deps = asyncpg==0.20.1 docker-compose >= 1.25.2 mysql-connector-python ~= 8.0 - pymongo ~= 3.1 + pymongo >= 3.1, < 5.0 PyMySQL ~= 0.10.1 psycopg2 ~= 2.8.4 aiopg >= 0.13.0, < 1.3.0