Skip to content

remove private import of ddtrace functionality #835

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

Merged
emmettbutler merged 5 commits into from
Jun 23, 2026
Merged

remove private import of ddtrace functionality #835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b04b06
remove private import of ddtrace functionality
emmettbutler Jun 18, 2026
14aba79
mock blocking exception
emmettbutler Jun 18, 2026
ea58e9b
slightly more permissive name check
emmettbutler Jun 18, 2026
3cbd588
exception types
emmettbutler Jun 23, 2026
0a4430d
undo
emmettbutler Jun 23, 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
6 changes: 3 additions & 3 deletions datadog_lambda/wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from importlib import import_module
from time import time_ns

from ddtrace.internal._exceptions import BlockingException
from datadog_lambda.extension import should_use_extension, flush_extension
from datadog_lambda.cold_start import (
set_cold_start,
Expand Down Expand Up @@ -191,8 +190,6 @@ def __call__(self, event, context, **kwargs):
if self.blocking_response:
return self.blocking_response
self.response = self.func(event, context, **kwargs)
except BlockingException:
self.blocking_response = get_asm_blocked_response(self.event_source)
except Exception:
from datadog_lambda.metric import submit_errors_metric

Expand All @@ -201,6 +198,9 @@ def __call__(self, event, context, **kwargs):
if self.span:
self.span.set_traceback()
raise
except BaseException as e:
if "BlockingException" in type(e).__name__:
self.blocking_response = get_asm_blocked_response(self.event_source)
finally:
self._after(event, context)
if self.blocking_response:
Expand Down
5 changes: 4 additions & 1 deletion tests/test_wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,11 +724,14 @@ def test_blocking_before(self):
def test_blocking_during(self):
self.mock_get_asm_blocking_response.return_value = None

class BlockingException(BaseException):
pass

def lambda_handler(event, context):
self.mock_get_asm_blocking_response.return_value = (
self.fake_blocking_response
)
raise wrapper.BlockingException()
raise BlockingException()

lambda_handler = wrapper.datadog_lambda_wrapper(lambda_handler)

Expand Down
Loading