Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lambda Layer Update: OTel Python 1.12.0 & 0.33b0 #242

Merged
merged 5 commits into from
Aug 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/pr-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@ on:

env:
AWS_REGION: us-east-1
# Copied this CORE_REPO_SHA from
# https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/.github/workflows/test.yml#L9
CORE_REPO_SHA: ece57231cde5bb5656775a62f027cab0b1c76fce
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this still necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this env variable would be necessary to test against the specific commit other than main and is in a format the tests to follow the format of upstream


jobs:
PR-Python:
runs-on: ubuntu-latest

strategy:
matrix:
python: [3.8, 3.9]
python: ['3.8', '3.9']
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need to do this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The usage of quotes is recommended by setup-python in gh actions. It would cause error when suppose a version 3.10 has to be used.


steps:
- name: Checkout this repo
Expand Down
2 changes: 1 addition & 1 deletion python/sample-apps/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Resources:
Description: Opentelemetry Python layer
ContentUri: ./otel
CompatibleRuntimes:
- python3.9
- python3.8
- python3.9
Metadata:
BuildMethod: makefile
6 changes: 6 additions & 0 deletions python/src/otel/otel_sdk/otel-instrument
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ if [ -z ${OTEL_TRACES_EXPORTER} ]; then
export OTEL_TRACES_EXPORTER=otlp_proto_http;
fi

# - Set the metrics exporter

if [ -z ${OTEL_METRICS_EXPORTER} ]; then
export OTEL_METRICS_EXPORTER=none;
fi

# - Set the service name

if [ -z ${OTEL_SERVICE_NAME} ]; then
Expand Down
56 changes: 28 additions & 28 deletions python/src/otel/otel_sdk/requirements-nodeps.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
opentelemetry-instrumentation-aiohttp-client==0.30b1
opentelemetry-util-http==0.30b1
opentelemetry-instrumentation-aiohttp-client==0.33b0
opentelemetry-util-http==0.33b0
asgiref~=3.0
opentelemetry-instrumentation-asgi==0.30b1
opentelemetry-instrumentation-asyncpg==0.30b1
opentelemetry-instrumentation-boto==0.30b1
opentelemetry-instrumentation-botocore==0.30b1
opentelemetry-instrumentation-celery==0.30b1
opentelemetry-instrumentation-dbapi==0.30b1
opentelemetry-instrumentation-django==0.30b1
opentelemetry-instrumentation-elasticsearch==0.30b1
opentelemetry-instrumentation-fastapi==0.30b1
opentelemetry-instrumentation-falcon==0.30b1
opentelemetry-instrumentation-flask==0.30b1
opentelemetry-instrumentation-grpc==0.30b1
opentelemetry-instrumentation-jinja2==0.30b1
opentelemetry-instrumentation-mysql==0.30b1
opentelemetry-instrumentation-psycopg2==0.30b1
opentelemetry-instrumentation-pymemcache==0.30b1
opentelemetry-instrumentation-pymongo==0.30b1
opentelemetry-instrumentation-pymysql==0.30b1
opentelemetry-instrumentation-pyramid==0.30b1
opentelemetry-instrumentation-redis==0.30b1
opentelemetry-instrumentation-requests==0.30b1
opentelemetry-instrumentation-sqlalchemy==0.30b1
opentelemetry-instrumentation-sqlite3==0.30b1
opentelemetry-instrumentation-starlette==0.30b1
opentelemetry-instrumentation-tornado==0.30b1
opentelemetry-instrumentation-wsgi==0.30b1
opentelemetry-instrumentation-asgi==0.33b0
opentelemetry-instrumentation-asyncpg==0.33b0
opentelemetry-instrumentation-boto==0.33b0
opentelemetry-instrumentation-botocore==0.33b0
opentelemetry-instrumentation-celery==0.33b0
opentelemetry-instrumentation-dbapi==0.33b0
opentelemetry-instrumentation-django==0.33b0
opentelemetry-instrumentation-elasticsearch==0.33b0
opentelemetry-instrumentation-fastapi==0.33b0
opentelemetry-instrumentation-falcon==0.33b0
opentelemetry-instrumentation-flask==0.33b0
opentelemetry-instrumentation-grpc==0.33b0
opentelemetry-instrumentation-jinja2==0.33b0
opentelemetry-instrumentation-mysql==0.33b0
opentelemetry-instrumentation-psycopg2==0.33b0
opentelemetry-instrumentation-pymemcache==0.33b0
opentelemetry-instrumentation-pymongo==0.33b0
opentelemetry-instrumentation-pymysql==0.33b0
opentelemetry-instrumentation-pyramid==0.33b0
opentelemetry-instrumentation-redis==0.33b0
opentelemetry-instrumentation-requests==0.33b0
opentelemetry-instrumentation-sqlalchemy==0.33b0
opentelemetry-instrumentation-sqlite3==0.33b0
opentelemetry-instrumentation-starlette==0.33b0
opentelemetry-instrumentation-tornado==0.33b0
opentelemetry-instrumentation-wsgi==0.33b0
8 changes: 4 additions & 4 deletions python/src/otel/otel_sdk/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
opentelemetry-exporter-otlp-proto-http==1.11.1
opentelemetry-distro==0.30b1
opentelemetry-instrumentation-aws-lambda==0.30b1
protobuf==3.20.0
opentelemetry-exporter-otlp-proto-http==1.12.0
opentelemetry-distro==0.33b0
opentelemetry-instrumentation-aws-lambda==0.33b0
protobuf==3.20.1
2 changes: 1 addition & 1 deletion python/src/template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Resources:
Description: Opentelemetry Python layer
ContentUri: ./otel
CompatibleRuntimes:
- python3.9
- python3.8
- python3.9
Metadata:
BuildMethod: makefile
api:
Expand Down