NH-86697 More Lambda pre-install with deps instead of nodeps

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

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
+# 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

lambda/requirements.txt

@@ -1,11 +1,40 @@
-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
+# Exclude default opentelemetry-distro
+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-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-botocore==0.52b1
+opentelemetry-instrumentation-logging==0.52b1
+opentelemetry-sdk-extension-aws == 2.1.0

solarwinds_apm/version.py

@@ -1 +1 @@
-__version__ = "4.0.0"
+__version__ = "4.1.0.0"