Skip to content

Commit 107b9a6

Browse files
NathanielRNNathanielRN
committed
Lambda Layer Update - OTel Python 1.7.1 & 0.26b1
1 parent 85e2be9 commit 107b9a6

File tree

15 files changed

+94
-567
lines changed

15 files changed

+94
-567
lines changed

‎.github/workflows/pr-python.yml

+1-1
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:

‎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+
cp -r otel_sdk/otel_wrapper.py /build/python && \
17+
cp -r 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.

‎python/src/otel/otel_sdk/requirements-nodeps.txt

+29-28
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
opentelemetry-instrumentation-aiohttp-client==0.25b2
2-
opentelemetry-util-http==0.25b2
1+
opentelemetry-instrumentation-aiohttp-client==0.26b1
2+
opentelemetry-util-http==0.26b1
33
asgiref~=3.0
4-
opentelemetry-instrumentation-asgi==0.25b2
5-
opentelemetry-instrumentation-asyncpg==0.25b2
6-
opentelemetry-instrumentation-boto==0.25b2
7-
opentelemetry-instrumentation-botocore==0.25b2
8-
opentelemetry-instrumentation-celery==0.25b2
9-
opentelemetry-instrumentation-dbapi==0.25b2
10-
opentelemetry-instrumentation-django==0.25b2
11-
opentelemetry-instrumentation-elasticsearch==0.25b2
12-
opentelemetry-instrumentation-fastapi==0.25b2
13-
opentelemetry-instrumentation-falcon==0.25b2
14-
opentelemetry-instrumentation-flask==0.25b2
15-
opentelemetry-instrumentation-grpc==0.25b2
16-
opentelemetry-instrumentation-jinja2==0.25b2
17-
opentelemetry-instrumentation-mysql==0.25b2
18-
opentelemetry-instrumentation-psycopg2==0.25b2
19-
opentelemetry-instrumentation-pymemcache==0.25b2
20-
opentelemetry-instrumentation-pymongo==0.25b2
21-
opentelemetry-instrumentation-pymysql==0.25b2
22-
opentelemetry-instrumentation-pyramid==0.25b2
23-
opentelemetry-instrumentation-redis==0.25b2
24-
opentelemetry-instrumentation-requests==0.25b2
25-
opentelemetry-instrumentation-sqlalchemy==0.25b2
26-
opentelemetry-instrumentation-sqlite3==0.25b2
27-
opentelemetry-instrumentation-starlette==0.25b2
28-
opentelemetry-instrumentation-tornado==0.25b2
29-
opentelemetry-instrumentation-wsgi==0.25b2
4+
opentelemetry-instrumentation-asgi==0.26b1
5+
opentelemetry-instrumentation-aws-lambda==0.26b1
6+
opentelemetry-instrumentation-asyncpg==0.26b1
7+
opentelemetry-instrumentation-boto==0.26b1
8+
opentelemetry-instrumentation-botocore==0.26b1
9+
opentelemetry-instrumentation-celery==0.26b1
10+
opentelemetry-instrumentation-dbapi==0.26b1
11+
opentelemetry-instrumentation-django==0.26b1
12+
opentelemetry-instrumentation-elasticsearch==0.26b1
13+
opentelemetry-instrumentation-fastapi==0.26b1
14+
opentelemetry-instrumentation-falcon==0.26b1
15+
opentelemetry-instrumentation-flask==0.26b1
16+
opentelemetry-instrumentation-grpc==0.26b1
17+
opentelemetry-instrumentation-jinja2==0.26b1
18+
opentelemetry-instrumentation-mysql==0.26b1
19+
opentelemetry-instrumentation-psycopg2==0.26b1
20+
opentelemetry-instrumentation-pymemcache==0.26b1
21+
opentelemetry-instrumentation-pymongo==0.26b1
22+
opentelemetry-instrumentation-pymysql==0.26b1
23+
opentelemetry-instrumentation-pyramid==0.26b1
24+
opentelemetry-instrumentation-redis==0.26b1
25+
opentelemetry-instrumentation-requests==0.26b1
26+
opentelemetry-instrumentation-sqlalchemy==0.26b1
27+
opentelemetry-instrumentation-sqlite3==0.26b1
28+
opentelemetry-instrumentation-starlette==0.26b1
29+
opentelemetry-instrumentation-tornado==0.26b1
30+
opentelemetry-instrumentation-wsgi==0.26b1

‎python/src/otel/otel_sdk/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-exporter-otlp==1.6.2
2-
opentelemetry-distro==0.25b2
1+
opentelemetry-exporter-otlp==1.7.1
2+
opentelemetry-distro==0.26b1
33
opentelemetry-propagator-aws-xray==1.0.1
4-
opentelemetry-instrumentation==0.25b2
4+
opentelemetry-instrumentation==0.26b1

0 commit comments

Comments
 (0)