diff --git a/CHANGELOG.md b/CHANGELOG.md index b92f0c62c7..97b251dfe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-instrumentation-httpx` Ensure httpx.get or httpx.request like methods are instrumented ([#2538](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2538)) +- `opentelemetry-instrumentation` On bootstrap don't install tortoise orm instrumentation if pydantic is found + ([#2409](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/2409)) ## Version 1.25.0/0.46b0 (2024-05-31) diff --git a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml index d1e9c3c985..6a7ba77f2b 100644 --- a/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml +++ b/instrumentation/opentelemetry-instrumentation-tortoiseorm/pyproject.toml @@ -31,8 +31,7 @@ dependencies = [ [tool.opentelemetry-bootstrap] instruments = [ - "tortoise-orm >= 0.17.0", - "pydantic >= 1.10.2" + ["tortoise-orm >= 0.17.0", "pydantic >= 1.10.2"], ] [project.entry-points.opentelemetry_instrumentor] diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index ea8fa48046..e26d540967 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -173,11 +173,7 @@ "instrumentation": "opentelemetry-instrumentation-tornado==0.47b0.dev", }, { - "library": "tortoise-orm >= 0.17.0", - "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.47b0.dev", - }, - { - "library": "pydantic >= 1.10.2", + "library": ["tortoise-orm >= 0.17.0", "pydantic >= 1.10.2"], "instrumentation": "opentelemetry-instrumentation-tortoiseorm==0.47b0.dev", }, {