diff --git a/dev-requirements.txt b/dev-requirements.txt index 456f017eb..c0be8cc4e 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,6 @@ -opentelemetry-test-utils==0.52b1 -opentelemetry-instrumentation-flask==0.52b1 -opentelemetry-instrumentation-requests==0.52b1 +opentelemetry-test-utils==0.54b1 +opentelemetry-instrumentation-flask==0.54b1 +opentelemetry-instrumentation-requests==0.54b1 pytest pytest-cov pytest-mock diff --git a/image/requirements.txt b/image/requirements.txt index dcbb0e9d6..d9f71cbb0 100644 --- a/image/requirements.txt +++ b/image/requirements.txt @@ -1,7 +1,7 @@ # Install most APM Python deps -opentelemetry-api==1.31.1 -opentelemetry-sdk==1.31.1 -opentelemetry-instrumentation==0.52b1 +opentelemetry-api==1.33.1 +opentelemetry-sdk==1.33.1 +opentelemetry-instrumentation==0.54b1 # We add a cap to urllib3 version else Python 3.8 support is dropped. # TODO: Update autoinstrumentation image builds to support all supported Python versions @@ -9,61 +9,61 @@ opentelemetry-instrumentation==0.52b1 urllib3 < 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.31.1 -opentelemetry-exporter-prometheus==0.52b1 +opentelemetry-exporter-otlp-proto-http==1.33.1 +opentelemetry-exporter-prometheus==0.54b1 -opentelemetry-propagator-b3==1.31.1 -opentelemetry-propagator-jaeger==1.31.1 +opentelemetry-propagator-b3==1.33.1 +opentelemetry-propagator-jaeger==1.33.1 opentelemetry-propagator-aws-xray==1.0.2 -opentelemetry-propagator-ot-trace==0.52b1 +opentelemetry-propagator-ot-trace==0.54b1 # Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation -opentelemetry-instrumentation-aio-pika==0.52b1 -opentelemetry-instrumentation-aiohttp-client==0.52b1 -opentelemetry-instrumentation-aiohttp-server==0.52b1 -opentelemetry-instrumentation-aiokafka==0.52b1 -opentelemetry-instrumentation-aiopg==0.52b1 -opentelemetry-instrumentation-asgi==0.52b1 -opentelemetry-instrumentation-asyncio==0.52b1 -opentelemetry-instrumentation-asyncpg==0.52b1 -opentelemetry-instrumentation-aws-lambda==0.52b1 -opentelemetry-instrumentation-boto==0.52b1 -opentelemetry-instrumentation-boto3sqs==0.52b1 -opentelemetry-instrumentation-botocore==0.52b1 -opentelemetry-instrumentation-cassandra==0.52b1 -opentelemetry-instrumentation-celery==0.52b1 -opentelemetry-instrumentation-click==0.52b1 -opentelemetry-instrumentation-confluent-kafka==0.52b1 -opentelemetry-instrumentation-dbapi==0.52b1 -opentelemetry-instrumentation-django==0.52b1 -opentelemetry-instrumentation-elasticsearch==0.52b1 -opentelemetry-instrumentation-falcon==0.52b1 -opentelemetry-instrumentation-fastapi==0.52b1 -opentelemetry-instrumentation-flask==0.52b1 -opentelemetry-instrumentation-grpc==0.52b1 -opentelemetry-instrumentation-httpx==0.52b1 -opentelemetry-instrumentation-jinja2==0.52b1 -opentelemetry-instrumentation-kafka-python==0.52b1 -opentelemetry-instrumentation-logging==0.52b1 -opentelemetry-instrumentation-mysql==0.52b1 -opentelemetry-instrumentation-mysqlclient==0.52b1 -opentelemetry-instrumentation-pika==0.52b1 -opentelemetry-instrumentation-psycopg==0.52b1 -opentelemetry-instrumentation-psycopg2==0.52b1 -opentelemetry-instrumentation-pymemcache==0.52b1 -opentelemetry-instrumentation-pymongo==0.52b1 -opentelemetry-instrumentation-pymysql==0.52b1 -opentelemetry-instrumentation-pyramid==0.52b1 -opentelemetry-instrumentation-redis==0.52b1 -opentelemetry-instrumentation-remoulade==0.52b1 -opentelemetry-instrumentation-requests==0.52b1 -opentelemetry-instrumentation-sqlalchemy==0.52b1 -opentelemetry-instrumentation-sqlite3==0.52b1 -opentelemetry-instrumentation-starlette==0.52b1 -opentelemetry-instrumentation-threading==0.52b1 -opentelemetry-instrumentation-tornado==0.52b1 -opentelemetry-instrumentation-tortoiseorm==0.52b1 -opentelemetry-instrumentation-urllib==0.52b1 -opentelemetry-instrumentation-urllib3==0.52b1 -opentelemetry-instrumentation-wsgi==0.52b1 \ No newline at end of file +opentelemetry-instrumentation-aio-pika==0.54b1 +opentelemetry-instrumentation-aiohttp-client==0.54b1 +opentelemetry-instrumentation-aiohttp-server==0.54b1 +opentelemetry-instrumentation-aiokafka==0.54b1 +opentelemetry-instrumentation-aiopg==0.54b1 +opentelemetry-instrumentation-asgi==0.54b1 +opentelemetry-instrumentation-asyncio==0.54b1 +opentelemetry-instrumentation-asyncpg==0.54b1 +opentelemetry-instrumentation-aws-lambda==0.54b1 +opentelemetry-instrumentation-boto==0.54b1 +opentelemetry-instrumentation-boto3sqs==0.54b1 +opentelemetry-instrumentation-botocore==0.54b1 +opentelemetry-instrumentation-cassandra==0.54b1 +opentelemetry-instrumentation-celery==0.54b1 +opentelemetry-instrumentation-click==0.54b1 +opentelemetry-instrumentation-confluent-kafka==0.54b1 +opentelemetry-instrumentation-dbapi==0.54b1 +opentelemetry-instrumentation-django==0.54b1 +opentelemetry-instrumentation-elasticsearch==0.54b1 +opentelemetry-instrumentation-falcon==0.54b1 +opentelemetry-instrumentation-fastapi==0.54b1 +opentelemetry-instrumentation-flask==0.54b1 +opentelemetry-instrumentation-grpc==0.54b1 +opentelemetry-instrumentation-httpx==0.54b1 +opentelemetry-instrumentation-jinja2==0.54b1 +opentelemetry-instrumentation-kafka-python==0.54b1 +opentelemetry-instrumentation-logging==0.54b1 +opentelemetry-instrumentation-mysql==0.54b1 +opentelemetry-instrumentation-mysqlclient==0.54b1 +opentelemetry-instrumentation-pika==0.54b1 +opentelemetry-instrumentation-psycopg==0.54b1 +opentelemetry-instrumentation-psycopg2==0.54b1 +opentelemetry-instrumentation-pymemcache==0.54b1 +opentelemetry-instrumentation-pymongo==0.54b1 +opentelemetry-instrumentation-pymysql==0.54b1 +opentelemetry-instrumentation-pyramid==0.54b1 +opentelemetry-instrumentation-redis==0.54b1 +opentelemetry-instrumentation-remoulade==0.54b1 +opentelemetry-instrumentation-requests==0.54b1 +opentelemetry-instrumentation-sqlalchemy==0.54b1 +opentelemetry-instrumentation-sqlite3==0.54b1 +opentelemetry-instrumentation-starlette==0.54b1 +opentelemetry-instrumentation-threading==0.54b1 +opentelemetry-instrumentation-tornado==0.54b1 +opentelemetry-instrumentation-tortoiseorm==0.54b1 +opentelemetry-instrumentation-urllib==0.54b1 +opentelemetry-instrumentation-urllib3==0.54b1 +opentelemetry-instrumentation-wsgi==0.54b1 \ No newline at end of file diff --git a/lambda/requirements-nodeps.txt b/lambda/requirements-nodeps.txt index e500df3be..19fb63655 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.52b1 -opentelemetry-instrumentation-botocore==0.52b1 \ No newline at end of file +opentelemetry-instrumentation-aws-lambda==0.54b1 +opentelemetry-instrumentation-botocore==0.54b1 \ No newline at end of file diff --git a/lambda/requirements.txt b/lambda/requirements.txt index 82e23c303..44be8577f 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -1,40 +1,40 @@ -opentelemetry-sdk==1.31.1 -opentelemetry-exporter-otlp-proto-http==1.31.1 +opentelemetry-sdk==1.33.1 +opentelemetry-exporter-otlp-proto-http==1.33.1 # Exclude default opentelemetry-distro -opentelemetry-instrumentation==0.52b1 -opentelemetry-semantic-conventions==0.52b1 +opentelemetry-instrumentation==0.54b1 +opentelemetry-semantic-conventions==0.54b1 opentelemetry-propagator-aws-xray==1.0.2 # Instrumentation dependencies -opentelemetry-instrumentation-aiohttp-client==0.52b1 -opentelemetry-util-http==0.52b1 -opentelemetry-instrumentation-asgi==0.52b1 -opentelemetry-instrumentation-asyncpg==0.52b1 -opentelemetry-instrumentation-boto==0.52b1 -opentelemetry-instrumentation-boto3sqs==0.52b1 -opentelemetry-instrumentation-celery==0.52b1 -opentelemetry-instrumentation-dbapi==0.52b1 -opentelemetry-instrumentation-django==0.52b1 -opentelemetry-instrumentation-elasticsearch==0.52b1 -opentelemetry-instrumentation-fastapi==0.52b1 -opentelemetry-instrumentation-falcon==0.52b1 -opentelemetry-instrumentation-flask==0.52b1 -opentelemetry-instrumentation-jinja2==0.52b1 -opentelemetry-instrumentation-mysql==0.52b1 -opentelemetry-instrumentation-psycopg2==0.52b1 -opentelemetry-instrumentation-pymemcache==0.52b1 -opentelemetry-instrumentation-pymongo==0.52b1 -opentelemetry-instrumentation-pymysql==0.52b1 -opentelemetry-instrumentation-pyramid==0.52b1 -opentelemetry-instrumentation-redis==0.52b1 -opentelemetry-instrumentation-requests==0.52b1 -opentelemetry-instrumentation-sqlalchemy==0.52b1 -opentelemetry-instrumentation-sqlite3==0.52b1 -opentelemetry-instrumentation-starlette==0.52b1 -opentelemetry-instrumentation-tornado==0.52b1 -opentelemetry-instrumentation-wsgi==0.52b1 +opentelemetry-instrumentation-aiohttp-client==0.54b1 +opentelemetry-util-http==0.54b1 +opentelemetry-instrumentation-asgi==0.54b1 +opentelemetry-instrumentation-asyncpg==0.54b1 +opentelemetry-instrumentation-boto==0.54b1 +opentelemetry-instrumentation-boto3sqs==0.54b1 +opentelemetry-instrumentation-celery==0.54b1 +opentelemetry-instrumentation-dbapi==0.54b1 +opentelemetry-instrumentation-django==0.54b1 +opentelemetry-instrumentation-elasticsearch==0.54b1 +opentelemetry-instrumentation-fastapi==0.54b1 +opentelemetry-instrumentation-falcon==0.54b1 +opentelemetry-instrumentation-flask==0.54b1 +opentelemetry-instrumentation-jinja2==0.54b1 +opentelemetry-instrumentation-mysql==0.54b1 +opentelemetry-instrumentation-psycopg2==0.54b1 +opentelemetry-instrumentation-pymemcache==0.54b1 +opentelemetry-instrumentation-pymongo==0.54b1 +opentelemetry-instrumentation-pymysql==0.54b1 +opentelemetry-instrumentation-pyramid==0.54b1 +opentelemetry-instrumentation-redis==0.54b1 +opentelemetry-instrumentation-requests==0.54b1 +opentelemetry-instrumentation-sqlalchemy==0.54b1 +opentelemetry-instrumentation-sqlite3==0.54b1 +opentelemetry-instrumentation-starlette==0.54b1 +opentelemetry-instrumentation-tornado==0.54b1 +opentelemetry-instrumentation-wsgi==0.54b1 # Additional APM dependencies -opentelemetry-instrumentation-botocore==0.52b1 -opentelemetry-instrumentation-logging==0.52b1 +opentelemetry-instrumentation-botocore==0.54b1 +opentelemetry-instrumentation-logging==0.54b1 opentelemetry-sdk-extension-aws == 2.1.0 \ No newline at end of file diff --git a/lambda/tests/requirements.txt b/lambda/tests/requirements.txt index ee6ed4871..64ea52a88 100644 --- a/lambda/tests/requirements.txt +++ b/lambda/tests/requirements.txt @@ -1,2 +1,2 @@ -opentelemetry-instrumentation-aws-lambda == 0.52b1 +opentelemetry-instrumentation-aws-lambda == 0.54b1 opentelemetry-propagator-aws-xray == 1.0.2 diff --git a/pyproject.toml b/pyproject.toml index 9e9084ca4..e82b45d7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,11 +41,11 @@ classifiers = [ ] requires-python = ">=3.8" dependencies = [ - 'opentelemetry-api == 1.31.1', - 'opentelemetry-sdk == 1.31.1', - 'opentelemetry-exporter-otlp == 1.31.1', - 'opentelemetry-instrumentation == 0.52b1', - 'opentelemetry-instrumentation-logging == 0.52b1', + 'opentelemetry-api == 1.33.1', + 'opentelemetry-sdk == 1.33.1', + 'opentelemetry-exporter-otlp == 1.33.1', + 'opentelemetry-instrumentation == 0.54b1', + 'opentelemetry-instrumentation-logging == 0.54b1', 'opentelemetry-sdk-extension-aws == 2.1.0', 'opentelemetry-resource-detector-azure == 0.1.5', ] diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index 1f1450e6b..2ec50b33e 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -1 +1 @@ -__version__ = "4.1.0.0" +__version__ = "4.1.0.1"