Skip to content

fix: remove return from finally block to resolve Python 3.14 SyntaxWa… #767

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.

Sign up for GitHub

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

Open
jcstorms1 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: remove return from finally block to resolve Python 3.14 SyntaxWa… #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d323ab3
fix: remove return from finally block to resolve Python 3.14 SyntaxWa…
Mar 25, 2026
678d00b
update snapshots
jcstorms1 Apr 1, 2026
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
7 changes: 4 additions & 3 deletions datadog_lambda/wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ def __call__(self, event, context, **kwargs):
if self.blocking_response:
return self.blocking_response
self.response = self.func(event, context, **kwargs)
return self.response
except BlockingException:
self.blocking_response = get_asm_blocked_response(self.event_source)
except Exception:
Expand All @@ -201,8 +200,10 @@ def __call__(self, event, context, **kwargs):
raise
finally:
self._after(event, context)
if self.blocking_response:
return self.blocking_response

if self.blocking_response:
return self.blocking_response
return self.response

def _inject_authorizer_span_headers(self, request_id):
reference_span = self.inferred_span if self.inferred_span else self.span
Expand Down
40 changes: 20 additions & 20 deletions tests/integration/snapshots/logs/sync-metrics_python310.log
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "true",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -86,7 +87,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"span.kind": "server",
"http.url": "https://XXXX.execute-api.us-east-2.amazonaws.com/Prod/",
"http.method": "GET",
"http.route": "/",
Expand Down Expand Up @@ -174,7 +174,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -227,6 +227,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"meta": {
"runtime-id": "XXXX",
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -236,7 +237,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"language": "python"
},
"metrics": {
Expand Down Expand Up @@ -322,7 +322,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -455,6 +455,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -464,7 +465,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "dynamodb",
"function_trigger.event_source_arn": "XXXX"
},
Expand Down Expand Up @@ -550,7 +550,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -635,6 +635,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -644,7 +645,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "eventbridge"
},
"metrics": {
Expand Down Expand Up @@ -729,7 +729,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -824,6 +824,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -835,7 +836,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX$default",
"span.kind": "server",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com/httpapi/get",
"http.method": "GET",
"http.route": "/httpapi/get",
Expand Down Expand Up @@ -923,7 +923,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -1015,6 +1015,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -1024,7 +1025,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "kinesis",
"function_trigger.event_source_arn": "XXXX"
},
Expand Down Expand Up @@ -1110,7 +1110,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -1211,6 +1211,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -1220,7 +1221,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "s3",
"function_trigger.event_source_arn": "XXXX"
},
Expand Down Expand Up @@ -1306,7 +1306,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -1396,6 +1396,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -1405,7 +1406,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "sns",
"function_trigger.event_source_arn": "XXXX"
},
Expand Down Expand Up @@ -1491,7 +1491,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -1580,6 +1580,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -1589,7 +1590,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"datadog_lambda": "X.X.X",
"dd_trace": "X.X.X",
"span.name": "aws.lambda",
"span.kind": "server",
"function_trigger.event_source": "sqs",
"function_trigger.event_source_arn": "XXXX"
},
Expand Down Expand Up @@ -1675,7 +1675,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down Expand Up @@ -1770,6 +1770,7 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"duration": "XXXX",
"meta": {
"_dd.origin": "lambda",
"span.kind": "server",
"cold_start": "false",
"function_arn": "arn:aws:lambda:eu-west-1:XXXX:eu-west-1-tests-python-XXXX-sync-metrics_python310",
"function_version": "$LATEST",
Expand All @@ -1781,7 +1782,6 @@ HTTP GET https://www.datadoghq.com/ Headers: ["Accept-Encoding:gzip, deflate","A
"span.name": "aws.lambda",
"function_trigger.event_source": "api-gateway",
"function_trigger.event_source_arn": "XXXX",
"span.kind": "server",
"http.url": "https://XXXX.execute-api.eu-west-1.amazonaws.com",
"http.status_code": "200"
},
Expand Down Expand Up @@ -1867,7 +1867,7 @@ HTTP POST https://api.datadoghq.com/api/v1/distribution_points Headers: ["Accept
"http.method": "POST",
"http.url": "https://api.datadoghq.com/api/v1/distribution_points",
"out.host": "api.datadoghq.com",
"http.status_code": "202",
"http.status_code": "403",
"http.useragent": "datadogpy/XX (python XX; os linux; arch XXXX)",
"_dd.p.dm": "-0",
"_dd.p.tid": "XXXX",
Expand Down
Loading
Loading