Skip to content

Commit 4cd0321

Browse files
NathanielRNNathanielRN
authored
Lambda Layer Update - OTel Python 1.6.2 and 0.25b2 (aws-observability#167)
* Update Lambda Layer with OTel Python 1.6.2 and 0.25b2 * Just remove the OTEL_TRACES_EXPORTER because its a default
1 parent d58ef1e commit 4cd0321

File tree

10 files changed

+68
-68
lines changed

10 files changed

+68
-68
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: 10208c1be1e720925a80a66f711b8afbe67537f4
12+
CORE_REPO_SHA: e65baa4680cd9dafc026ca5ed760e6d2c2232c96
1313

1414
jobs:
1515
PR-Python:

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ def lambda_handler(event, context):
5555
from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
5656
from opentelemetry.instrumentation.utils import unwrap
5757
from opentelemetry.propagate import get_global_textmap
58-
from opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format import (
58+
from opentelemetry.propagators.aws.aws_xray_propagator import (
5959
TRACE_HEADER_KEY,
60-
AwsXRayFormat,
60+
AwsXRayPropagator,
6161
)
6262
from opentelemetry.semconv.trace import SpanAttributes
6363
from opentelemetry.trace import (
@@ -169,7 +169,7 @@ def _determine_parent_context(lambda_event: Any) -> Context:
169169
xray_env_var = os.environ.get("_X_AMZN_TRACE_ID")
170170

171171
if xray_env_var:
172-
parent_context = AwsXRayFormat().extract(
172+
parent_context = AwsXRayPropagator().extract(
173173
{TRACE_HEADER_KEY: xray_env_var}
174174
)
175175

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.16.dev0"
15+
__version__ = "0.25b2"

‎python/src/otel/otel_sdk/opentelemetry/resource/__init__.py

-19
This file was deleted.

‎python/src/otel/otel_sdk/otel-instrument

+20-1
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,29 @@ fi
9696
#
9797
# TODO: waiting on OTel Python support for configuring Resource Detectors from
9898
# an environment variable. Replace the bottom code with the following when
99-
# this is possible.
99+
# this is possible. We will have to download `opentelemetry-sdk-extension-aws`
100+
# when that happens to get the resource detector.
100101
#
101102
# export OTEL_RESOURCE_DETECTORS="aws_lambda";
102103
#
104+
# In the meantime, if doing manual instrumentation, (which means we CANNOT use
105+
# this script) we could do the following:
106+
#
107+
# import opentelemetry.trace as trace
108+
# from opentelemetry.sdk.trace import TracerProvider
109+
# from opentelemetry.sdk.extension.aws.resource._lambda import (
110+
# AwsLambdaResourceDetector,
111+
# )
112+
# from opentelemetry.sdk.resources import get_aggregated_resources
113+
# trace.set_tracer_provider(
114+
# TracerProvider(
115+
# resource=get_aggregated_resources(
116+
# [
117+
# AwsLambdaResourceDetector(),
118+
# ]
119+
# ),
120+
# )
121+
# )
103122

104123
export OTEL_RESOURCE_ATTRIBUTES="cloud.region=$AWS_REGION,cloud.provider=aws,faas.name=$AWS_LAMBDA_FUNCTION_NAME,faas.version=$AWS_LAMBDA_FUNCTION_VERSION,$OTEL_RESOURCE_ATTRIBUTES";
105124

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

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
opentelemetry-exporter-otlp==1.5.0
2-
opentelemetry-distro==0.24b0
3-
opentelemetry-sdk-extension-aws==1.0.1
4-
opentelemetry-instrumentation==0.24b0
1+
opentelemetry-exporter-otlp==1.6.2
2+
opentelemetry-distro==0.25b2
3+
opentelemetry-propagator-aws-xray==1.0.1
4+
opentelemetry-instrumentation==0.25b2

‎python/src/otel/setup.cfg

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414
#
1515
[metadata]
16-
name = opentelemetry-instrumentation-aws_lambda
16+
name = opentelemetry-instrumentation-aws-lambda
1717
description = OpenTelemetry AWS Lambda instrumentation
1818
long_description = file: README.rst
1919
long_description_content_type = text/x-rst
@@ -38,13 +38,13 @@ package_dir=
3838
=otel_sdk
3939
packages=find_namespace:
4040
install_requires =
41-
opentelemetry-distro == 0.24b0
42-
opentelemetry-exporter-otlp == 1.5.0
43-
opentelemetry-sdk-extension-aws == 1.0.1
41+
opentelemetry-distro == 0.25b2
42+
opentelemetry-exporter-otlp == 1.6.2
43+
opentelemetry-propagator-aws-xray == 1.0.1
4444

4545
[options.extras_require]
4646
test =
47-
opentelemetry-test == 0.24b0
47+
opentelemetry-test == 0.25b2
4848

4949
[options.packages.find]
5050
where = otel_sdk

‎python/src/otel/tests/test_otel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
from opentelemetry.instrumentation.aws_lambda import AwsLambdaInstrumentor
2323
from opentelemetry.propagate import get_global_textmap
24-
from opentelemetry.sdk.extension.aws.trace.propagation.aws_xray_format import (
24+
from opentelemetry.propagators.aws.aws_xray_propagator import (
2525
TRACE_ID_FIRST_PART_LENGTH,
2626
TRACE_ID_VERSION,
2727
)

‎python/src/tox.ini

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[tox]
22
envlist =
3-
; opentelemetry-instrumentation-aws_lambda
4-
py3{8,9}-test-instrumentation-aws_lambda
3+
; opentelemetry-instrumentation-aws-lambda
4+
py3{8,9}-test-instrumentation-aws-lambda
55

66
minversion = 3.8
77

@@ -15,17 +15,17 @@ passenv = TOXENV
1515
setenv =
1616
OTEL_PYTHON_TRACER_PROVIDER=sdk_tracer_provider
1717
; override CORE_REPO_SHA via env variable when testing other branches/commits than main
18-
; i.e: CORE_REPO_SHA=dde62cebffe519c35875af6d06fae053b3be65ec tox -e <env to test>
18+
; i.e: CORE_REPO_SHA=<YOUR_COMMIT_SHA> tox -e test-instrumentation-aws-lambda
1919
CORE_REPO_SHA={env:CORE_REPO_SHA:main}
2020
CORE_REPO="git+https://github.com/open-telemetry/opentelemetry-python.git@{env:CORE_REPO_SHA}"
2121

2222
changedir =
23-
test-instrumentation-aws_lambda: {toxinidir}/otel/tests
23+
test-instrumentation-aws-lambda: {toxinidir}/otel/tests
2424

2525
commands_pre =
2626
test: pip install "opentelemetry-test[test] @ {env:CORE_REPO}#egg=opentelemetry-test&subdirectory=tests/util"
2727

28-
aws_lambda: pip install {toxinidir}/otel[test]
28+
aws-lambda: pip install {toxinidir}/otel[test]
2929

3030
deps =
3131
test: pytest

0 commit comments

Comments
 (0)