From 3c054a4d33cbd3d8aa1714ffb9e82a6683eb7af3 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Wed, 21 Aug 2024 20:24:26 +0000 Subject: [PATCH 1/2] Install all transitive dependencies for Python instrumentation Signed-off-by: Raphael Silva --- .../src/otel/otel_sdk/nodeps-requirements.txt | 33 ++----------------- python/src/otel/otel_sdk/requirements.txt | 33 ++++++++++++++++++- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/python/src/otel/otel_sdk/nodeps-requirements.txt b/python/src/otel/otel_sdk/nodeps-requirements.txt index fb4de05d42..62ee9ffe3c 100644 --- a/python/src/otel/otel_sdk/nodeps-requirements.txt +++ b/python/src/otel/otel_sdk/nodeps-requirements.txt @@ -1,31 +1,4 @@ -opentelemetry-instrumentation-aiohttp-client==0.47b0 -opentelemetry-util-http==0.47b0 -asgiref~=3.8 -opentelemetry-instrumentation-asgi==0.47b0 -opentelemetry-instrumentation-asyncpg==0.47b0 -opentelemetry-instrumentation-boto==0.47b0 -opentelemetry-instrumentation-boto3sqs==0.47b0 -opentelemetry-instrumentation-botocore==0.47b0 -opentelemetry-instrumentation-celery==0.47b0 -opentelemetry-instrumentation-dbapi==0.47b0 -opentelemetry-instrumentation-django==0.47b0 -opentelemetry-instrumentation-elasticsearch==0.47b0 -opentelemetry-instrumentation-fastapi==0.47b0 -opentelemetry-instrumentation-falcon==0.47b0 -opentelemetry-instrumentation-flask==0.47b0 -opentelemetry-instrumentation-grpc==0.47b0 -opentelemetry-instrumentation-jinja2==0.47b0 -opentelemetry-instrumentation-mysql==0.47b0 -opentelemetry-instrumentation-psycopg2==0.47b0 -opentelemetry-instrumentation-pymemcache==0.47b0 -opentelemetry-instrumentation-pymongo==0.47b0 -opentelemetry-instrumentation-pymysql==0.47b0 -opentelemetry-instrumentation-pyramid==0.47b0 -opentelemetry-instrumentation-redis==0.47b0 -opentelemetry-instrumentation-requests==0.47b0 -opentelemetry-instrumentation-sqlalchemy==0.47b0 -opentelemetry-instrumentation-sqlite3==0.47b0 -opentelemetry-instrumentation-starlette==0.47b0 -opentelemetry-instrumentation-tornado==0.47b0 -opentelemetry-instrumentation-wsgi==0.47b0 +# TODO: move this dependency to requirements.txt when this dependency gets updated to 0.48b0 +# This has to be done because 0.47b0 is pinning a specific version of opentelemetry-propagator-aws-xray +# causing dependency resolution conflicts. opentelemetry-instrumentation-aws-lambda==0.47b0 diff --git a/python/src/otel/otel_sdk/requirements.txt b/python/src/otel/otel_sdk/requirements.txt index ea70aa2fc9..7a8d18ed2a 100644 --- a/python/src/otel/otel_sdk/requirements.txt +++ b/python/src/otel/otel_sdk/requirements.txt @@ -2,5 +2,36 @@ opentelemetry-sdk==1.26.0 opentelemetry-exporter-otlp-proto-http==1.26.0 opentelemetry-distro==0.47b0 opentelemetry-instrumentation==0.47b0 -opentelemetry-semantic-conventions == 0.47b0 +opentelemetry-semantic-conventions==0.47b0 opentelemetry-propagator-aws-xray==1.0.2 + +# Instrumentation dependencies +opentelemetry-instrumentation-aiohttp-client==0.47b0 +opentelemetry-util-http==0.47b0 +opentelemetry-instrumentation-asgi==0.47b0 +opentelemetry-instrumentation-asyncpg==0.47b0 +opentelemetry-instrumentation-boto==0.47b0 +opentelemetry-instrumentation-boto3sqs==0.47b0 +opentelemetry-instrumentation-botocore==0.47b0 +opentelemetry-instrumentation-celery==0.47b0 +opentelemetry-instrumentation-dbapi==0.47b0 +opentelemetry-instrumentation-django==0.47b0 +opentelemetry-instrumentation-elasticsearch==0.47b0 +opentelemetry-instrumentation-fastapi==0.47b0 +opentelemetry-instrumentation-falcon==0.47b0 +opentelemetry-instrumentation-flask==0.47b0 +opentelemetry-instrumentation-grpc==0.47b0 +opentelemetry-instrumentation-jinja2==0.47b0 +opentelemetry-instrumentation-mysql==0.47b0 +opentelemetry-instrumentation-psycopg2==0.47b0 +opentelemetry-instrumentation-pymemcache==0.47b0 +opentelemetry-instrumentation-pymongo==0.47b0 +opentelemetry-instrumentation-pymysql==0.47b0 +opentelemetry-instrumentation-pyramid==0.47b0 +opentelemetry-instrumentation-redis==0.47b0 +opentelemetry-instrumentation-requests==0.47b0 +opentelemetry-instrumentation-sqlalchemy==0.47b0 +opentelemetry-instrumentation-sqlite3==0.47b0 +opentelemetry-instrumentation-starlette==0.47b0 +opentelemetry-instrumentation-tornado==0.47b0 +opentelemetry-instrumentation-wsgi==0.47b0 From b88ff13a6c1422e9ebd86a34d205c6c134a02a22 Mon Sep 17 00:00:00 2001 From: Raphael Silva Date: Wed, 21 Aug 2024 20:34:08 +0000 Subject: [PATCH 2/2] Fix conflit with botocore instrumentation Signed-off-by: Raphael Silva --- python/src/otel/otel_sdk/nodeps-requirements.txt | 6 +++--- python/src/otel/otel_sdk/requirements.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/src/otel/otel_sdk/nodeps-requirements.txt b/python/src/otel/otel_sdk/nodeps-requirements.txt index 62ee9ffe3c..998a2525d9 100644 --- a/python/src/otel/otel_sdk/nodeps-requirements.txt +++ b/python/src/otel/otel_sdk/nodeps-requirements.txt @@ -1,4 +1,4 @@ -# TODO: move this dependency to requirements.txt when this dependency gets updated to 0.48b0 -# This has to be done because 0.47b0 is pinning a specific version of opentelemetry-propagator-aws-xray -# causing dependency resolution conflicts. +# TODO: move these dependencies to requirements.txt when they stopped relying on a pinned version of +# opentelemetry-propagator-aws-xray opentelemetry-instrumentation-aws-lambda==0.47b0 +opentelemetry-instrumentation-botocore==0.47b0 diff --git a/python/src/otel/otel_sdk/requirements.txt b/python/src/otel/otel_sdk/requirements.txt index 7a8d18ed2a..a0c781ad93 100644 --- a/python/src/otel/otel_sdk/requirements.txt +++ b/python/src/otel/otel_sdk/requirements.txt @@ -12,7 +12,6 @@ opentelemetry-instrumentation-asgi==0.47b0 opentelemetry-instrumentation-asyncpg==0.47b0 opentelemetry-instrumentation-boto==0.47b0 opentelemetry-instrumentation-boto3sqs==0.47b0 -opentelemetry-instrumentation-botocore==0.47b0 opentelemetry-instrumentation-celery==0.47b0 opentelemetry-instrumentation-dbapi==0.47b0 opentelemetry-instrumentation-django==0.47b0