Lambda Layer Update - OTel Python 1.7.1 & 0.26b1

open-telemetry · Nov 16, 2021 · 107b9a6 · 107b9a6
1 parent 85e2be9
commit 107b9a6
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 567 deletions.
diff --git a/.github/workflows/pr-python.yml b/.github/workflows/pr-python.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   AWS_REGION: us-east-1
-  CORE_REPO_SHA: e65baa4680cd9dafc026ca5ed760e6d2c2232c96
+  CORE_REPO_SHA: 281c97bf8f9e31392859e006e13c9c8eac8967c3
 
 jobs:
   PR-Python:

diff --git a/python/README.md b/python/README.md
@@ -1,6 +1,6 @@
 # OpenTelemetry Lambda Python
 
-Layers for running Python applications on AWS Lambda with OpenTelemetry.
+Scripts and files used to build AWS Lambda Layers for running OpenTelemetry on AWS Lambda for Python.
 
 ### Sample App 
 

diff --git a/python/src/function/lambda_function.py b/python/src/function/lambda_function.py
diff --git a/python/src/function/requirements.txt b/python/src/function/requirements.txt
diff --git a/python/src/otel/Dockerfile b/python/src/otel/Dockerfile
@@ -9,10 +9,12 @@ WORKDIR /workspace
 RUN mkdir -p /build && \
   python3 -m pip install -r otel_sdk/requirements.txt -t /build/python && \
   python3 -m pip install -r otel_sdk/requirements-nodeps.txt -t /build/tmp --no-deps && \
+  # We need to use a `/build/tmp/` folder otherwise the instrumentation packages
+  # do not get fully downloaded to the `opentelemetry/instrumentation/` path.
   cp -r /build/tmp/* /build/python/ && \
   rm -rf /build/tmp && \
-  cp -r otel_sdk/* /build/python && \
-  mv /build/python/otel-instrument /build/otel-instrument && \
+  cp -r otel_sdk/otel_wrapper.py /build/python && \
+  cp -r otel_sdk/otel-instrument /build && \
   chmod 755 /build/otel-instrument && \
   rm -rf /build/python/boto* && \
   rm -rf /build/python/urllib3* && \

diff --git a/python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/__init__.py b/python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/__init__.py
diff --git a/python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/version.py b/python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/version.py
diff --git a/python/src/otel/otel_sdk/requirements-nodeps.txt b/python/src/otel/otel_sdk/requirements-nodeps.txt
@@ -1,29 +1,30 @@
-opentelemetry-instrumentation-aiohttp-client==0.25b2
-opentelemetry-util-http==0.25b2
+opentelemetry-instrumentation-aiohttp-client==0.26b1
+opentelemetry-util-http==0.26b1
 asgiref~=3.0
-opentelemetry-instrumentation-asgi==0.25b2
-opentelemetry-instrumentation-asyncpg==0.25b2
-opentelemetry-instrumentation-boto==0.25b2
-opentelemetry-instrumentation-botocore==0.25b2
-opentelemetry-instrumentation-celery==0.25b2
-opentelemetry-instrumentation-dbapi==0.25b2
-opentelemetry-instrumentation-django==0.25b2
-opentelemetry-instrumentation-elasticsearch==0.25b2
-opentelemetry-instrumentation-fastapi==0.25b2
-opentelemetry-instrumentation-falcon==0.25b2
-opentelemetry-instrumentation-flask==0.25b2
-opentelemetry-instrumentation-grpc==0.25b2
-opentelemetry-instrumentation-jinja2==0.25b2
-opentelemetry-instrumentation-mysql==0.25b2
-opentelemetry-instrumentation-psycopg2==0.25b2
-opentelemetry-instrumentation-pymemcache==0.25b2
-opentelemetry-instrumentation-pymongo==0.25b2
-opentelemetry-instrumentation-pymysql==0.25b2
-opentelemetry-instrumentation-pyramid==0.25b2
-opentelemetry-instrumentation-redis==0.25b2
-opentelemetry-instrumentation-requests==0.25b2
-opentelemetry-instrumentation-sqlalchemy==0.25b2
-opentelemetry-instrumentation-sqlite3==0.25b2
-opentelemetry-instrumentation-starlette==0.25b2
-opentelemetry-instrumentation-tornado==0.25b2
-opentelemetry-instrumentation-wsgi==0.25b2
+opentelemetry-instrumentation-asgi==0.26b1
+opentelemetry-instrumentation-aws-lambda==0.26b1
+opentelemetry-instrumentation-asyncpg==0.26b1
+opentelemetry-instrumentation-boto==0.26b1
+opentelemetry-instrumentation-botocore==0.26b1
+opentelemetry-instrumentation-celery==0.26b1
+opentelemetry-instrumentation-dbapi==0.26b1
+opentelemetry-instrumentation-django==0.26b1
+opentelemetry-instrumentation-elasticsearch==0.26b1
+opentelemetry-instrumentation-fastapi==0.26b1
+opentelemetry-instrumentation-falcon==0.26b1
+opentelemetry-instrumentation-flask==0.26b1
+opentelemetry-instrumentation-grpc==0.26b1
+opentelemetry-instrumentation-jinja2==0.26b1
+opentelemetry-instrumentation-mysql==0.26b1
+opentelemetry-instrumentation-psycopg2==0.26b1
+opentelemetry-instrumentation-pymemcache==0.26b1
+opentelemetry-instrumentation-pymongo==0.26b1
+opentelemetry-instrumentation-pymysql==0.26b1
+opentelemetry-instrumentation-pyramid==0.26b1
+opentelemetry-instrumentation-redis==0.26b1
+opentelemetry-instrumentation-requests==0.26b1
+opentelemetry-instrumentation-sqlalchemy==0.26b1
+opentelemetry-instrumentation-sqlite3==0.26b1
+opentelemetry-instrumentation-starlette==0.26b1
+opentelemetry-instrumentation-tornado==0.26b1
+opentelemetry-instrumentation-wsgi==0.26b1
diff --git a/python/src/otel/otel_sdk/requirements.txt b/python/src/otel/otel_sdk/requirements.txt
@@ -1,4 +1,4 @@
-opentelemetry-exporter-otlp==1.6.2
-opentelemetry-distro==0.25b2
+opentelemetry-exporter-otlp==1.7.1
+opentelemetry-distro==0.26b1
 opentelemetry-propagator-aws-xray==1.0.1
-opentelemetry-instrumentation==0.25b2
+opentelemetry-instrumentation==0.26b1