Lambda Layer Update - OTel Python 1.7.1 & 0.26b1 (#177)

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

Hide file tree

Showing 15 changed files with 98 additions and 573 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:
@@ -20,20 +20,18 @@ jobs:
         python: [3.8]
 
     steps:
-      - uses: actions/checkout@v2
-
+      - name: Checkout this repo
+        uses: actions/checkout@v2
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
-
-      - name: Tox
+      - name: Install tox testing package
         working-directory: python/src
         run: |
           pip install tox
           tox
-
-      - name: build layer
+      - name: Build layer
         working-directory: python/src
         run: ./run.sh -b
 
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 && \
+  mv otel_sdk/otel_wrapper.py /build/python && \
+  mv 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