From b284186cf0f3eb0743764bc25da971ee673f3947 Mon Sep 17 00:00:00 2001
From: Raphael Philipe Mendes da Silva <rapphil@gmail.com>
Date: Thu, 22 Aug 2024 08:54:19 -0700
Subject: [PATCH] Install all transitive dependencies for Python
 instrumentation (#1483)

* Install all transitive dependencies for Python instrumentation

Signed-off-by: Raphael Silva <rapphil@gmail.com>

* Fix conflit with botocore instrumentation

Signed-off-by: Raphael Silva <rapphil@gmail.com>

---------

Signed-off-by: Raphael Silva <rapphil@gmail.com>
---
 .../src/otel/otel_sdk/nodeps-requirements.txt | 33 ++-----------------
 python/src/otel/otel_sdk/requirements.txt     | 32 +++++++++++++++++-
 2 files changed, 34 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..998a2525d9 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 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 ea70aa2fc9..a0c781ad93 100644
--- a/python/src/otel/otel_sdk/requirements.txt
+++ b/python/src/otel/otel_sdk/requirements.txt
@@ -2,5 +2,35 @@ 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-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