Skip to content

Commit e30dec2

Browse files
authored
Lambda Layer Update - OTel Python 1.7.1 & 0.26b1 (#177)
1 parent 85e2be9 commit e30dec2

File tree

15 files changed

+98
-573
lines changed

15 files changed

+98
-573
lines changed

.github/workflows/pr-python.yml

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
env:
1111
AWS_REGION: us-east-1
12-
CORE_REPO_SHA: e65baa4680cd9dafc026ca5ed760e6d2c2232c96
12+
CORE_REPO_SHA: 281c97bf8f9e31392859e006e13c9c8eac8967c3
1313

1414
jobs:
1515
PR-Python:
@@ -20,20 +20,18 @@ jobs:
2020
python: [3.8]
2121

2222
steps:
23-
- uses: actions/checkout@v2
24-
23+
- name: Checkout this repo
24+
uses: actions/checkout@v2
2525
- name: Setup Python
2626
uses: actions/setup-python@v2
2727
with:
2828
python-version: ${{ matrix.python }}
29-
30-
- name: Tox
29+
- name: Install tox testing package
3130
working-directory: python/src
3231
run: |
3332
pip install tox
3433
tox
35-
36-
- name: build layer
34+
- name: Build layer
3735
working-directory: python/src
3836
run: ./run.sh -b
3937

python/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenTelemetry Lambda Python
22

3-
Layers for running Python applications on AWS Lambda with OpenTelemetry.
3+
Scripts and files used to build AWS Lambda Layers for running OpenTelemetry on AWS Lambda for Python.
44

55
### Sample App
66

python/src/function/lambda_function.py

-29
This file was deleted.

python/src/function/requirements.txt

-1
This file was deleted.

python/src/otel/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ WORKDIR /workspace
99
RUN mkdir -p /build && \
1010
python3 -m pip install -r otel_sdk/requirements.txt -t /build/python && \
1111
python3 -m pip install -r otel_sdk/requirements-nodeps.txt -t /build/tmp --no-deps && \
12+
# We need to use a `/build/tmp/` folder otherwise the instrumentation packages
13+
# do not get fully downloaded to the `opentelemetry/instrumentation/` path.
1214
cp -r /build/tmp/* /build/python/ && \
1315
rm -rf /build/tmp && \
14-
cp -r otel_sdk/* /build/python && \
15-
mv /build/python/otel-instrument /build/otel-instrument && \
16+
mv otel_sdk/otel_wrapper.py /build/python && \
17+
mv otel_sdk/otel-instrument /build && \
1618
chmod 755 /build/otel-instrument && \
1719
rm -rf /build/python/boto* && \
1820
rm -rf /build/python/urllib3* && \

python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/__init__.py

-234
This file was deleted.

python/src/otel/otel_sdk/opentelemetry/instrumentation/aws_lambda/version.py

-15
This file was deleted.

0 commit comments

Comments
 (0)