diff --git a/dev-requirements.txt b/dev-requirements.txt index 3d69108d5..6940112c3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ -opentelemetry-test-utils==0.64b0 -opentelemetry-instrumentation-flask==0.64b0 -opentelemetry-instrumentation-requests==0.64b0 +opentelemetry-test-utils==0.65b0 +opentelemetry-instrumentation-flask==0.65b0 +opentelemetry-instrumentation-requests==0.65b0 pytest pytest-cov pytest-mock diff --git a/image/requirements.txt b/image/requirements.txt index 646bb41b0..332993931 100644 --- a/image/requirements.txt +++ b/image/requirements.txt @@ -1,66 +1,66 @@ # Install most APM Python deps -opentelemetry-api==1.43.0 -opentelemetry-sdk==1.43.0 -opentelemetry-instrumentation==0.64b0 +opentelemetry-api==1.44.0 +opentelemetry-sdk==1.44.0 +opentelemetry-instrumentation==0.65b0 urllib3 >= 2.7.0, < 3.0.0 requests >= 2.34.2, < 3.0 # We don't use the otlp_proto_grpc option since gRPC is not appropriate for # injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for. -opentelemetry-exporter-otlp-proto-http==1.43.0 -opentelemetry-exporter-prometheus==0.64b0 +opentelemetry-exporter-otlp-proto-http==1.44.0 +opentelemetry-exporter-prometheus==0.65b0 -opentelemetry-propagator-b3==1.43.0 -opentelemetry-propagator-jaeger==1.43.0 +opentelemetry-propagator-b3==1.44.0 +opentelemetry-propagator-jaeger==1.44.0 opentelemetry-propagator-aws-xray==1.0.2 -opentelemetry-propagator-ot-trace==0.64b0 +opentelemetry-propagator-ot-trace==0.65b0 # Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation -opentelemetry-instrumentation-aio-pika==0.64b0 -opentelemetry-instrumentation-aiohttp-client==0.64b0 -opentelemetry-instrumentation-aiohttp-server==0.64b0 -opentelemetry-instrumentation-aiokafka==0.64b0 -opentelemetry-instrumentation-aiopg==0.64b0 -opentelemetry-instrumentation-asgi==0.64b0 -opentelemetry-instrumentation-asyncio==0.64b0 -opentelemetry-instrumentation-asyncpg==0.64b0 -opentelemetry-instrumentation-aws-lambda==0.64b0 -opentelemetry-instrumentation-boto3sqs==0.64b0 -opentelemetry-instrumentation-botocore==0.64b0 -opentelemetry-instrumentation-cassandra==0.64b0 -opentelemetry-instrumentation-celery==0.64b0 -opentelemetry-instrumentation-click==0.64b0 -opentelemetry-instrumentation-confluent-kafka==0.64b0 -opentelemetry-instrumentation-dbapi==0.64b0 -opentelemetry-instrumentation-django==0.64b0 +opentelemetry-instrumentation-aio-pika==0.65b0 +opentelemetry-instrumentation-aiohttp-client==0.65b0 +opentelemetry-instrumentation-aiohttp-server==0.65b0 +opentelemetry-instrumentation-aiokafka==0.65b0 +opentelemetry-instrumentation-aiopg==0.65b0 +opentelemetry-instrumentation-asgi==0.65b0 +opentelemetry-instrumentation-asyncio==0.65b0 +opentelemetry-instrumentation-asyncpg==0.65b0 +opentelemetry-instrumentation-aws-lambda==0.65b0 +opentelemetry-instrumentation-boto3sqs==0.65b0 +opentelemetry-instrumentation-botocore==0.65b0 +opentelemetry-instrumentation-cassandra==0.65b0 +opentelemetry-instrumentation-celery==0.65b0 +opentelemetry-instrumentation-click==0.65b0 +opentelemetry-instrumentation-confluent-kafka==0.65b0 +opentelemetry-instrumentation-dbapi==0.65b0 +opentelemetry-instrumentation-django==0.65b0 opentelemetry-instrumentation-elasticsearch==0.64b0 -opentelemetry-instrumentation-falcon==0.64b0 -opentelemetry-instrumentation-fastapi==0.64b0 -opentelemetry-instrumentation-flask==0.64b0 -opentelemetry-instrumentation-grpc==0.64b0 -opentelemetry-instrumentation-httpx==0.64b0 -opentelemetry-instrumentation-jinja2==0.64b0 -opentelemetry-instrumentation-kafka-python==0.64b0 -opentelemetry-instrumentation-logging==0.64b0 -opentelemetry-instrumentation-mysql==0.64b0 -opentelemetry-instrumentation-mysqlclient==0.64b0 -opentelemetry-instrumentation-pika==0.64b0 -opentelemetry-instrumentation-psycopg==0.64b0 -opentelemetry-instrumentation-psycopg2==0.64b0 -opentelemetry-instrumentation-pymemcache==0.64b0 -opentelemetry-instrumentation-pymongo==0.64b0 -opentelemetry-instrumentation-pymysql==0.64b0 -opentelemetry-instrumentation-pyramid==0.64b0 -opentelemetry-instrumentation-redis==0.64b0 -opentelemetry-instrumentation-remoulade==0.64b0 -opentelemetry-instrumentation-requests==0.64b0 -opentelemetry-instrumentation-sqlalchemy==0.64b0 -opentelemetry-instrumentation-sqlite3==0.64b0 -opentelemetry-instrumentation-starlette==0.64b0 -opentelemetry-instrumentation-threading==0.64b0 -opentelemetry-instrumentation-tornado==0.64b0 -opentelemetry-instrumentation-tortoiseorm==0.64b0 -opentelemetry-instrumentation-urllib==0.64b0 -opentelemetry-instrumentation-urllib3==0.64b0 -opentelemetry-instrumentation-wsgi==0.64b0 +opentelemetry-instrumentation-falcon==0.65b0 +opentelemetry-instrumentation-fastapi==0.65b0 +opentelemetry-instrumentation-flask==0.65b0 +opentelemetry-instrumentation-grpc==0.65b0 +opentelemetry-instrumentation-httpx==0.65b0 +opentelemetry-instrumentation-jinja2==0.65b0 +opentelemetry-instrumentation-kafka-python==0.65b0 +opentelemetry-instrumentation-logging==0.65b0 +opentelemetry-instrumentation-mysql==0.65b0 +opentelemetry-instrumentation-mysqlclient==0.65b0 +opentelemetry-instrumentation-pika==0.65b0 +opentelemetry-instrumentation-psycopg==0.65b0 +opentelemetry-instrumentation-psycopg2==0.65b0 +opentelemetry-instrumentation-pymemcache==0.65b0 +opentelemetry-instrumentation-pymongo==0.65b0 +opentelemetry-instrumentation-pymysql==0.65b0 +opentelemetry-instrumentation-pyramid==0.65b0 +opentelemetry-instrumentation-redis==0.65b0 +opentelemetry-instrumentation-remoulade==0.65b0 +opentelemetry-instrumentation-requests==0.65b0 +opentelemetry-instrumentation-sqlalchemy==0.65b0 +opentelemetry-instrumentation-sqlite3==0.65b0 +opentelemetry-instrumentation-starlette==0.65b0 +opentelemetry-instrumentation-threading==0.65b0 +opentelemetry-instrumentation-tornado==0.65b0 +opentelemetry-instrumentation-tortoiseorm==0.65b0 +opentelemetry-instrumentation-urllib==0.65b0 +opentelemetry-instrumentation-urllib3==0.65b0 +opentelemetry-instrumentation-wsgi==0.65b0 diff --git a/lambda/requirements-nodeps.txt b/lambda/requirements-nodeps.txt index 2ff6d0ad2..06e7d8f80 100644 --- a/lambda/requirements-nodeps.txt +++ b/lambda/requirements-nodeps.txt @@ -1,4 +1,4 @@ # 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.64b0 -opentelemetry-instrumentation-botocore==0.64b0 \ No newline at end of file +opentelemetry-instrumentation-aws-lambda==0.65b0 +opentelemetry-instrumentation-botocore==0.65b0 \ No newline at end of file diff --git a/lambda/requirements.txt b/lambda/requirements.txt index 772940083..6b79baa65 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -1,39 +1,39 @@ -opentelemetry-sdk==1.43.0 -opentelemetry-exporter-otlp-proto-http==1.43.0 +opentelemetry-sdk==1.44.0 +opentelemetry-exporter-otlp-proto-http==1.44.0 # Exclude default opentelemetry-distro -opentelemetry-instrumentation==0.64b0 -opentelemetry-semantic-conventions==0.64b0 +opentelemetry-instrumentation==0.65b0 +opentelemetry-semantic-conventions==0.65b0 opentelemetry-propagator-aws-xray==1.0.2 # Instrumentation dependencies -opentelemetry-instrumentation-aiohttp-client==0.64b0 -opentelemetry-util-http==0.64b0 -opentelemetry-instrumentation-asgi==0.64b0 -opentelemetry-instrumentation-asyncpg==0.64b0 -opentelemetry-instrumentation-boto3sqs==0.64b0 -opentelemetry-instrumentation-celery==0.64b0 -opentelemetry-instrumentation-dbapi==0.64b0 -opentelemetry-instrumentation-django==0.64b0 +opentelemetry-instrumentation-aiohttp-client==0.65b0 +opentelemetry-util-http==0.65b0 +opentelemetry-instrumentation-asgi==0.65b0 +opentelemetry-instrumentation-asyncpg==0.65b0 +opentelemetry-instrumentation-boto3sqs==0.65b0 +opentelemetry-instrumentation-celery==0.65b0 +opentelemetry-instrumentation-dbapi==0.65b0 +opentelemetry-instrumentation-django==0.65b0 opentelemetry-instrumentation-elasticsearch==0.64b0 -opentelemetry-instrumentation-fastapi==0.64b0 -opentelemetry-instrumentation-falcon==0.64b0 -opentelemetry-instrumentation-flask==0.64b0 -opentelemetry-instrumentation-jinja2==0.64b0 -opentelemetry-instrumentation-mysql==0.64b0 -opentelemetry-instrumentation-psycopg2==0.64b0 -opentelemetry-instrumentation-pymemcache==0.64b0 -opentelemetry-instrumentation-pymongo==0.64b0 -opentelemetry-instrumentation-pymysql==0.64b0 -opentelemetry-instrumentation-pyramid==0.64b0 -opentelemetry-instrumentation-redis==0.64b0 -opentelemetry-instrumentation-requests==0.64b0 -opentelemetry-instrumentation-sqlalchemy==0.64b0 -opentelemetry-instrumentation-sqlite3==0.64b0 -opentelemetry-instrumentation-starlette==0.64b0 -opentelemetry-instrumentation-tornado==0.64b0 -opentelemetry-instrumentation-wsgi==0.64b0 +opentelemetry-instrumentation-fastapi==0.65b0 +opentelemetry-instrumentation-falcon==0.65b0 +opentelemetry-instrumentation-flask==0.65b0 +opentelemetry-instrumentation-jinja2==0.65b0 +opentelemetry-instrumentation-mysql==0.65b0 +opentelemetry-instrumentation-psycopg2==0.65b0 +opentelemetry-instrumentation-pymemcache==0.65b0 +opentelemetry-instrumentation-pymongo==0.65b0 +opentelemetry-instrumentation-pymysql==0.65b0 +opentelemetry-instrumentation-pyramid==0.65b0 +opentelemetry-instrumentation-redis==0.65b0 +opentelemetry-instrumentation-requests==0.65b0 +opentelemetry-instrumentation-sqlalchemy==0.65b0 +opentelemetry-instrumentation-sqlite3==0.65b0 +opentelemetry-instrumentation-starlette==0.65b0 +opentelemetry-instrumentation-tornado==0.65b0 +opentelemetry-instrumentation-wsgi==0.65b0 # Additional APM dependencies -opentelemetry-instrumentation-botocore==0.64b0 -opentelemetry-instrumentation-logging==0.64b0 +opentelemetry-instrumentation-botocore==0.65b0 +opentelemetry-instrumentation-logging==0.65b0 opentelemetry-sdk-extension-aws == 2.1.0 \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index cc8730dad..0b40c22f4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,14 +36,14 @@ classifiers = [ ] requires-python = ">=3.10" dependencies = [ - 'opentelemetry-api == 1.43.0', - 'opentelemetry-sdk == 1.43.0', - 'opentelemetry-exporter-otlp == 1.43.0', - 'opentelemetry-instrumentation == 0.64b0', - 'opentelemetry-instrumentation-logging == 0.64b0', + 'opentelemetry-api == 1.44.0', + 'opentelemetry-sdk == 1.44.0', + 'opentelemetry-exporter-otlp == 1.44.0', + 'opentelemetry-instrumentation == 0.65b0', + 'opentelemetry-instrumentation-logging == 0.65b0', 'opentelemetry-sdk-extension-aws == 2.1.0', 'opentelemetry-resource-detector-azure == 0.1.5', - 'opentelemetry-resource-detector-containerid == 0.64b0', + 'opentelemetry-resource-detector-containerid == 0.65b0', ] [project.urls] diff --git a/solarwinds_apm/propagator.py b/solarwinds_apm/propagator.py index 21692ded5..a5699f126 100644 --- a/solarwinds_apm/propagator.py +++ b/solarwinds_apm/propagator.py @@ -11,6 +11,7 @@ import typing from opentelemetry import trace +from opentelemetry.context import set_value from opentelemetry.context.context import Context from opentelemetry.propagators import textmap from opentelemetry.trace.propagation.tracecontext import ( @@ -66,7 +67,7 @@ def extract( signature_header[0], ) - context.update({INTL_SWO_X_OPTIONS_KEY: xtraceoptions}) + context = set_value(INTL_SWO_X_OPTIONS_KEY, xtraceoptions, context) return context def inject(