diff --git a/python/src/otel/otel_sdk/nodeps-requirements.txt b/python/src/otel/otel_sdk/nodeps-requirements.txt index 10be6891e0..fb4de05d42 100644 --- a/python/src/otel/otel_sdk/nodeps-requirements.txt +++ b/python/src/otel/otel_sdk/nodeps-requirements.txt @@ -1,30 +1,31 @@ -opentelemetry-instrumentation-aiohttp-client==0.46b0 -opentelemetry-util-http==0.46b0 +opentelemetry-instrumentation-aiohttp-client==0.47b0 +opentelemetry-util-http==0.47b0 asgiref~=3.8 -opentelemetry-instrumentation-asgi==0.46b0 -opentelemetry-instrumentation-asyncpg==0.46b0 -opentelemetry-instrumentation-boto==0.46b0 -opentelemetry-instrumentation-boto3sqs==0.46b0 -opentelemetry-instrumentation-botocore==0.46b0 -opentelemetry-instrumentation-celery==0.46b0 -opentelemetry-instrumentation-dbapi==0.46b0 -opentelemetry-instrumentation-django==0.46b0 -opentelemetry-instrumentation-elasticsearch==0.46b0 -opentelemetry-instrumentation-fastapi==0.46b0 -opentelemetry-instrumentation-falcon==0.46b0 -opentelemetry-instrumentation-flask==0.46b0 -opentelemetry-instrumentation-grpc==0.46b0 -opentelemetry-instrumentation-jinja2==0.46b0 -opentelemetry-instrumentation-mysql==0.46b0 -opentelemetry-instrumentation-psycopg2==0.46b0 -opentelemetry-instrumentation-pymemcache==0.46b0 -opentelemetry-instrumentation-pymongo==0.46b0 -opentelemetry-instrumentation-pymysql==0.46b0 -opentelemetry-instrumentation-pyramid==0.46b0 -opentelemetry-instrumentation-redis==0.46b0 -opentelemetry-instrumentation-requests==0.46b0 -opentelemetry-instrumentation-sqlalchemy==0.46b0 -opentelemetry-instrumentation-sqlite3==0.46b0 -opentelemetry-instrumentation-starlette==0.46b0 -opentelemetry-instrumentation-tornado==0.46b0 -opentelemetry-instrumentation-wsgi==0.46b0 +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 +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 69c6ed3dbf..ea70aa2fc9 100644 --- a/python/src/otel/otel_sdk/requirements.txt +++ b/python/src/otel/otel_sdk/requirements.txt @@ -1,4 +1,6 @@ -opentelemetry-sdk==1.25.0 -opentelemetry-exporter-otlp-proto-http==1.25.0 -opentelemetry-distro==0.46b0 -opentelemetry-instrumentation-aws-lambda==0.46b0 +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-propagator-aws-xray==1.0.2 diff --git a/python/src/otel/tests/nodeps-requirements.txt b/python/src/otel/tests/nodeps-requirements.txt new file mode 100644 index 0000000000..cee247dbad --- /dev/null +++ b/python/src/otel/tests/nodeps-requirements.txt @@ -0,0 +1 @@ +opentelemetry-instrumentation-aws-lambda==0.47b0 diff --git a/python/src/otel/tests/requirements.txt b/python/src/otel/tests/requirements.txt index 3bca3e0e4f..cd19a2dd52 100644 --- a/python/src/otel/tests/requirements.txt +++ b/python/src/otel/tests/requirements.txt @@ -1,3 +1,5 @@ # Dependencies used in tests only -opentelemetry-test-utils==0.46b0 -opentelemetry-instrumentation-aws-lambda==0.46b0 +opentelemetry-test-utils==0.47b0 +opentelemetry-instrumentation == 0.47b0 +opentelemetry-semantic-conventions == 0.47b0 +opentelemetry-propagator-aws-xray == 1.0.2 diff --git a/python/src/otel/tests/test_otel.py b/python/src/otel/tests/test_otel.py index 2ef0b5d277..9b8b553de7 100644 --- a/python/src/otel/tests/test_otel.py +++ b/python/src/otel/tests/test_otel.py @@ -21,10 +21,10 @@ import os import subprocess import sys -from importlib import import_module +from importlib import import_module, reload from shutil import which from unittest import mock - +from opentelemetry import propagate from opentelemetry.environment_variables import OTEL_PROPAGATORS from opentelemetry.instrumentation.aws_lambda import ( _HANDLER, @@ -209,10 +209,14 @@ def test_active_tracing(self): **os.environ, # Using Active tracing _X_AMZN_TRACE_ID: MOCK_XRAY_TRACE_CONTEXT_SAMPLED, + OTEL_PROPAGATORS: "xray-lambda" }, ) test_env_patch.start() + # try to load propagators based on the OTEL_PROPAGATORS env var + reload(propagate) + mock_execute_lambda() spans = self.memory_exporter.get_finished_spans() @@ -266,6 +270,9 @@ def test_parent_context_from_lambda_event(self): ) test_env_patch.start() + # try to load propagators based on the OTEL_PROPAGATORS env var + reload(propagate) + mock_execute_lambda( { "headers": { diff --git a/python/src/tox.ini b/python/src/tox.ini index bcf5f6080b..b900e768a5 100644 --- a/python/src/tox.ini +++ b/python/src/tox.ini @@ -19,10 +19,11 @@ changedir = test-instrumentation-aws-lambda: {toxinidir}/otel/tests commands_pre = - test: pip install -r requirements.txt + pip install -r requirements.txt + pip install --no-deps -r nodeps-requirements.txt deps = - test: pytest + pytest commands = - test: pytest {posargs} + pytest {posargs}