Skip to content

fix: type check event before treating it as a dict #233

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

Merged
merged 2 commits into from
Jun 27, 2022

Conversation

astuyve
Copy link
Contributor

@astuyve astuyve commented Jun 27, 2022

What does this PR do?

fixes #232
fixes #225

Still need to extract WSGI payloads

Motivation

Testing Guidelines

Additional Notes

Types of Changes

  • Bug fix
  • New feature
  • Breaking change
  • Misc (docs, refactoring, dependency upgrade, etc.)

Check all that apply

  • This PR's description is comprehensive
  • This PR contains breaking changes that are documented in the description
  • This PR introduces new APIs or parameters that are documented and unlikely to change in the foreseeable future
  • This PR impacts documentation, and it has been updated (or a ticket has been logged)
  • This PR's changes are covered by the automated tests
  • This PR collects user input/sensitive content into Datadog
  • This PR passes the integration tests (ask a Datadog member to run the tests)

@astuyve astuyve requested a review from a team as a code owner June 27, 2022 20:00
@astuyve astuyve merged commit b36ab47 into main Jun 27, 2022
@astuyve astuyve deleted the aj/fix-event-is-not-iterable-error branch June 27, 2022 20:21
@@ -332,7 +332,7 @@ def extract_dd_trace_context(event, lambda_context, extractor=None):
parent_id,
sampling_priority,
) = extract_context_custom_extractor(extractor, event, lambda_context)
elif "headers" in event:
elif isinstance(event, (list, dict)) and "headers" in event:
Copy link
Contributor

Choose a reason for hiding this comment

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

@astuyve I'm wondering we should only check dict. Is it possible for list to contain Datadog trace context?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was trying to consider which data structures implement an iterable, but realize that list probably won't help us. I think I'm going to replace list with set, since another library might convert the event into a set instead of a dict.

Copy link
Contributor

@kimi-p kimi-p Jun 27, 2022

Choose a reason for hiding this comment

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

SG! Just for me own knowledge, do we have a doc that lists what lib might form event in what format?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It varies wildly depending on the integration (see docs). But this library seems to have been written basically only for a Dict or Set type event - however Lambda allows the type of event to be None, binary data, or a few other options (including a list/array), and since we don't have an guarantee, we have to duck-type it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Non-object events are not handled TypeError: argument of type 'NoneType' is not iterable
3 participants