Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Fix Invalid type NoneType for attribute X error | AWS-Lambda instrumentation #1785

Merged
merged 12 commits into from
Jun 16, 2023
Merged

Fix Invalid type NoneType for attribute X error | AWS-Lambda instrumentation #1785

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9808873
Add None checking to the aws-lambda logic
imanshafiei540 May 5, 2023
eea010b
Update changelog.
imanshafiei540 May 5, 2023
4e781f8
Merge branch 'main' into feature
srikanthccv May 6, 2023
e421d45
Change .get() check to 'key' in dict check.
imanshafiei540 May 9, 2023
fd3b9f9
Fix consistency issues.
imanshafiei540 May 9, 2023
d5989f5
Merge branch 'main' into feature
shalevr May 17, 2023
1f65e7d
Update changelog.
imanshafiei540 May 17, 2023
47921eb
Merge branch 'open-telemetry:main' into feature
imanshafiei540 May 23, 2023
2be327c
Merge branch 'main' into feature
shalevr May 24, 2023
21acca8
Merge branch 'open-telemetry:main' into feature
imanshafiei540 Jun 9, 2023
5add449
Merge branch 'main' into feature
imanshafiei540 Jun 13, 2023
d6b953a
Merge branch 'main' into feature
shalevr Jun 16, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#1738](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1738))
- Fix `None does not implement middleware` error when there are no middlewares registered
([#1766](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1766))
- Fix `Invalid type NoneType for attribute X (opentelemetry-instrumentation-aws-lambda)` error when some attributes do not exist
([#1780](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1780))

## Version 1.17.0/0.38b0 (2023-03-22)

Expand Down
74 changes: 43 additions & 31 deletions ...metry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,24 +204,30 @@ def _set_api_gateway_v1_proxy_attributes(
span.set_attribute(SpanAttributes.HTTP_ROUTE, lambda_event.get("resource"))

if lambda_event.get("headers"):
span.set_attribute(
SpanAttributes.HTTP_USER_AGENT,
lambda_event["headers"].get("User-Agent"),
)
span.set_attribute(
SpanAttributes.HTTP_SCHEME,
lambda_event["headers"].get("X-Forwarded-Proto"),
)
span.set_attribute(
SpanAttributes.NET_HOST_NAME, lambda_event["headers"].get("Host")
)
if lambda_event["headers"].get("User-Agent"):
span.set_attribute(
SpanAttributes.HTTP_USER_AGENT,
lambda_event["headers"].get("User-Agent"),
)
if lambda_event["headers"].get("X-Forwarded-Proto"):
span.set_attribute(
SpanAttributes.HTTP_SCHEME,
lambda_event["headers"].get("X-Forwarded-Proto"),
)
if lambda_event["headers"].get("Host"):
span.set_attribute(
SpanAttributes.NET_HOST_NAME,
lambda_event["headers"].get("Host"),
)

if lambda_event.get("queryStringParameters"):
if lambda_event.get("queryStringParameters") and lambda_event.get(
"resource"
):
span.set_attribute(
SpanAttributes.HTTP_TARGET,
f"{lambda_event.get('resource')}?{urlencode(lambda_event.get('queryStringParameters'))}",
)
else:
elif lambda_event.get("resource"):
span.set_attribute(
SpanAttributes.HTTP_TARGET, lambda_event.get("resource")
)
Expand All @@ -237,31 +243,37 @@ def _set_api_gateway_v2_proxy_attributes(
More info:
https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html
"""
span.set_attribute(
SpanAttributes.NET_HOST_NAME,
lambda_event["requestContext"].get("domainName"),
)

if lambda_event["requestContext"].get("http"):
span.set_attribute(
SpanAttributes.HTTP_METHOD,
lambda_event["requestContext"]["http"].get("method"),
)
if lambda_event["requestContext"].get("domainName"):
span.set_attribute(
SpanAttributes.HTTP_USER_AGENT,
lambda_event["requestContext"]["http"].get("userAgent"),
)
span.set_attribute(
SpanAttributes.HTTP_ROUTE,
lambda_event["requestContext"]["http"].get("path"),
SpanAttributes.NET_HOST_NAME,
lambda_event["requestContext"].get("domainName"),
)

if lambda_event.get("rawQueryString"):
if lambda_event["requestContext"].get("http"):
if lambda_event["requestContext"]["http"].get("method"):
span.set_attribute(
SpanAttributes.HTTP_METHOD,
lambda_event["requestContext"]["http"].get("method"),
)
if lambda_event["requestContext"]["http"].get("userAgent"):
span.set_attribute(
SpanAttributes.HTTP_USER_AGENT,
lambda_event["requestContext"]["http"].get("userAgent"),
)
if lambda_event["requestContext"]["http"].get("path"):
span.set_attribute(
SpanAttributes.HTTP_ROUTE,
lambda_event["requestContext"]["http"].get("path"),
)

if lambda_event.get("rawQueryString") and lambda_event[
"requestContext"
]["http"].get("path"):
span.set_attribute(
SpanAttributes.HTTP_TARGET,
f"{lambda_event['requestContext']['http'].get('path')}?{lambda_event.get('rawQueryString')}",
)
else:
elif lambda_event["requestContext"]["http"].get("path"):
span.set_attribute(
SpanAttributes.HTTP_TARGET,
lambda_event["requestContext"]["http"].get("path"),
Expand Down