Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: no need to install tortoiseorm instrumentation if pydantic is found #2409

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

bootstrap: no need to install tortoiseorm instrumentation if pydantic is found #2409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2919848
bootstrap: handle packages that requires more than one library for in…
xrmx May 27, 2024
f4e4f54
script: handle lists on target instrumentations in generate_instrumen…
xrmx May 27, 2024
da04459
Move instruments group to tool.opentelemetry-bootstrap
xrmx Jun 5, 2024
fc66e45
tortoiseorm: use a list for instrumented packages
xrmx Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aio-pika/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe this is breaking instrumentation.dependencies.get_dist_dependency_conflicts

Copy link
Contributor Author

@xrmx xrmx Jun 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it' breaking it. Given that AFAICS [tool.*] metadata is not available in installed package I guess we can use the _package module inside each instrumentation and maybe make [tool.opentelemetry-bootstrap] dynamic to avoid duplicating the data.

instrumentation.dependencies.get_dist_dependency_conflicts would then be updated to look at the _package module instead of the distribution requirements.

instruments = [
"aio_pika >= 7.2.0, < 10.0.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aiohttp-client/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"aiohttp ~= 3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aiohttp-server/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"aiohttp ~= 3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aiopg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"aiopg >= 0.13.0, < 2.0.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-asgi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"asgiref ~= 3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-asyncio/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-asyncpg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"asyncpg >= 0.12.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-aws-lambda/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-boto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"boto~=2.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-boto3sqs/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"boto3 ~= 1.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-botocore/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"opentelemetry-propagator-aws-xray == 1.0.1",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"botocore ~= 1.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-cassandra/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"cassandra-driver ~= 3.25",
"scylla-driver ~= 3.25",
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-celery/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"celery >= 4.0, < 6.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-confluent-kafka/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"confluent-kafka >= 1.8.2, <= 2.3.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-dbapi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.urls]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-django/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
asgi = [
"opentelemetry-instrumentation-asgi == 0.47b0.dev",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-elasticsearch/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"elasticsearch >= 6.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-falcon/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
"packaging >= 20.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"falcon >= 1.4.1, < 3.1.2",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-fastapi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"fastapi ~= 0.58",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-flask/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies = [
"importlib-metadata >= 4.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"flask >= 1.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-grpc/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"grpcio ~= 1.27",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-httpx/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"httpx >= 0.18.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-jinja2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"jinja2 >= 2.7, < 4.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-kafka-python/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"kafka-python >= 2.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-logging/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
"opentelemetry-instrumentation == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-mysql/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"mysql-connector-python ~= 8.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-mysqlclient/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"mysqlclient < 3",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pika/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"pika >= 0.12.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-psycopg/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"psycopg >= 3.1.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-psycopg2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"psycopg2 >= 2.7.3.1",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymemcache/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"pymemcache >= 1.3.5, < 5",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymongo/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"pymongo >= 3.1, < 5.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pymysql/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"PyMySQL < 2",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-pyramid/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"pyramid >= 1.7",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-redis/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"wrapt >= 1.12.1",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"redis >= 2.6",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-remoulade/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-semantic-conventions == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"remoulade >= 0.50",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-requests/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"requests ~= 2.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-sklearn/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencies = [
"opentelemetry-instrumentation == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"scikit-learn ~= 0.24.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-sqlalchemy/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"wrapt >= 1.11.2",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"sqlalchemy",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-sqlite3/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"opentelemetry-instrumentation-dbapi == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.entry-points.opentelemetry_instrumentor]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-starlette/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies = [
"opentelemetry-util-http == 0.47b0.dev",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"starlette ~= 0.13.0",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-system-metrics/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"psutil ~= 5.9",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = [
"psutil >= 5",
]
Expand Down
2 changes: 1 addition & 1 deletion instrumentation/opentelemetry-instrumentation-threading/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies = [
"wrapt >= 1.0.0, < 2.0.0",
]

[project.optional-dependencies]
[tool.opentelemetry-bootstrap]
instruments = []

[project.entry-points.opentelemetry_instrumentor]
Expand Down
Loading