From 2fcea3a792adf170f6cb4d21f7d1efef6c914a6c Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 10:33:27 -0700 Subject: [PATCH 1/6] Testrelease 4.1.0.0 --- solarwinds_apm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solarwinds_apm/version.py b/solarwinds_apm/version.py index ce1305bf4..1f1450e6b 100644 --- a/solarwinds_apm/version.py +++ b/solarwinds_apm/version.py @@ -1 +1 @@ -__version__ = "4.0.0" +__version__ = "4.1.0.0" From 43044ba746bb5bd0b2d15bdbd3f0108af81f0e3f Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 11:58:13 -0700 Subject: [PATCH 2/6] More lambda deps install with their deps --- lambda/check_lambda_modules.sh | 2 -- lambda/requirements-nodeps.txt | 33 +++------------------- lambda/requirements.txt | 51 +++++++++++++++++++++++++++------- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/lambda/check_lambda_modules.sh b/lambda/check_lambda_modules.sh index d6a67d297..0ca6907eb 100755 --- a/lambda/check_lambda_modules.sh +++ b/lambda/check_lambda_modules.sh @@ -39,9 +39,7 @@ fi # These packages also follow PEP 420 better expected_otel_files_pep420="./python/opentelemetry/exporter/otlp/proto/common/version/__init__.py -./python/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py ./python/opentelemetry/exporter/otlp/proto/http/version/__init__.py -./python/opentelemetry/exporter/otlp/version/__init__.py ./python/opentelemetry/sdk/version/__init__.py" found_otel_files_pep420=$(find ./python/opentelemetry/exporter ./python/opentelemetry/sdk -regextype sed -regex ".*/version/__init__.py" | sort -k1) if [[ ! "$found_otel_files_pep420" =~ $expected_otel_files_pep420 ]]; then diff --git a/lambda/requirements-nodeps.txt b/lambda/requirements-nodeps.txt index 63cea6200..e500df3be 100644 --- a/lambda/requirements-nodeps.txt +++ b/lambda/requirements-nodeps.txt @@ -1,29 +1,4 @@ -opentelemetry-instrumentation-aiohttp-client==0.52b1 -opentelemetry-util-http==0.52b1 -asgiref~=3.8 -opentelemetry-instrumentation-asgi==0.52b1 -opentelemetry-instrumentation-asyncpg==0.52b1 -opentelemetry-instrumentation-boto==0.52b1 -opentelemetry-instrumentation-botocore==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-logging==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 \ No newline at end of file +# 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 diff --git a/lambda/requirements.txt b/lambda/requirements.txt index b1621b091..c96836a28 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -1,11 +1,42 @@ -opentelemetry-exporter-otlp==1.31.1 +opentelemetry-sdk==1.31.1 opentelemetry-exporter-otlp-proto-http==1.31.1 -opentelemetry-instrumentation-aws-lambda==0.52b1 -opentelemetry-sdk-extension-aws==2.1.0 -packaging -jaraco.text -platformdirs -setuptools -charset_normalizer==3.4.1 -grpcio==1.70.0 -wrapt==1.17.2 +opentelemetry-distro==0.52b1 +opentelemetry-instrumentation==0.52b1 +opentelemetry-semantic-conventions==0.52b1 +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-grpc==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 + +# Additional APM dependencies +opentelemetry-instrumentation-logging==0.52b1 +opentelemetry-sdk-extension-aws == 2.1.0 +opentelemetry-resource-detector-azure == 0.1.5 +psutil >= 5 From 34d076c3df498c9b8d6622ab89deb2cf194e0c9d Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 12:09:15 -0700 Subject: [PATCH 3/6] Add system-metrics, botocore pre-installs --- lambda/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lambda/requirements.txt b/lambda/requirements.txt index c96836a28..ce5cb36be 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -36,7 +36,9 @@ opentelemetry-instrumentation-tornado==0.52b1 opentelemetry-instrumentation-wsgi==0.52b1 # Additional APM dependencies +opentelemetry-instrumentation-botocore==0.52b1 opentelemetry-instrumentation-logging==0.52b1 +opentelemetry-instrumentation-system-metrics==0.52b1 opentelemetry-sdk-extension-aws == 2.1.0 opentelemetry-resource-detector-azure == 0.1.5 psutil >= 5 From 5bdffa4745a81ba3671f657dfa80cacd23ef0d3d Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 12:19:13 -0700 Subject: [PATCH 4/6] Rm default distro --- lambda/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lambda/requirements.txt b/lambda/requirements.txt index ce5cb36be..be1545b70 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -1,6 +1,6 @@ opentelemetry-sdk==1.31.1 opentelemetry-exporter-otlp-proto-http==1.31.1 -opentelemetry-distro==0.52b1 +# Exclude default opentelemetry-distro opentelemetry-instrumentation==0.52b1 opentelemetry-semantic-conventions==0.52b1 opentelemetry-propagator-aws-xray==1.0.2 From 904abb430ecd472a30167b1a69cd9078678d4e0b Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 14:28:17 -0700 Subject: [PATCH 5/6] Rm non-lambda deps --- lambda/requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lambda/requirements.txt b/lambda/requirements.txt index be1545b70..0c834a299 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -38,7 +38,4 @@ opentelemetry-instrumentation-wsgi==0.52b1 # Additional APM dependencies opentelemetry-instrumentation-botocore==0.52b1 opentelemetry-instrumentation-logging==0.52b1 -opentelemetry-instrumentation-system-metrics==0.52b1 -opentelemetry-sdk-extension-aws == 2.1.0 -opentelemetry-resource-detector-azure == 0.1.5 -psutil >= 5 +opentelemetry-sdk-extension-aws == 2.1.0 \ No newline at end of file From bb5d26421f91c75a7cb2d43a9ffc4babec6a9033 Mon Sep 17 00:00:00 2001 From: tammy-baylis-swi Date: Wed, 30 Apr 2025 14:48:59 -0700 Subject: [PATCH 6/6] Re-remove grpc instrumentor --- lambda/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/lambda/requirements.txt b/lambda/requirements.txt index 0c834a299..82e23c303 100644 --- a/lambda/requirements.txt +++ b/lambda/requirements.txt @@ -19,7 +19,6 @@ opentelemetry-instrumentation-elasticsearch==0.52b1 opentelemetry-instrumentation-fastapi==0.52b1 opentelemetry-instrumentation-falcon==0.52b1 opentelemetry-instrumentation-flask==0.52b1 -opentelemetry-instrumentation-grpc==0.52b1 opentelemetry-instrumentation-jinja2==0.52b1 opentelemetry-instrumentation-mysql==0.52b1 opentelemetry-instrumentation-psycopg2==0.52b1