Decode error message and error type #500
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
duncanista
reviewed
Dec 17, 2024
| debug!("Failed to decode error message: {e}"); | ||
| m.to_string() | ||
| } | ||
| }; |
Contributor
There was a problem hiding this comment.
I'm pretty sure there's a cleaner way to do this
duncanista
reviewed
Dec 17, 2024
| let decoded_message = match base64_to_string(m) { | ||
| Ok(decoded) => decoded, | ||
| Err(e) => { | ||
| debug!("Failed to decode error message: {e}"); |
Contributor
There was a problem hiding this comment.
Message is too ambiguous, since you're actually setting the error at the end, so it's kinda misleading and user might think that it failed, but the error message is actually there
duncanista
reviewed
Dec 17, 2024
duncanista
reviewed
Dec 18, 2024
|
|
||
| if let Some(m) = message { | ||
| let decoded_message = base64_to_string(m).unwrap_or_else(|_| { | ||
| debug!("Error message header may not be encoded, setting as is"); |
Contributor
There was a problem hiding this comment.
Much more cleaner, great!
duncanista
reviewed
Dec 18, 2024
| } | ||
| }; | ||
| let decoded_stack = base64_to_string(s).unwrap_or_else(|_| { | ||
| debug!("Error stack header may not be encoded, setting as is"); |
Contributor
There was a problem hiding this comment.
This always comes encoded, so the previous error message was OK
duncanista
approved these changes
Dec 18, 2024
Contributor
duncanista
left a comment
duncanista
left a comment
There was a problem hiding this comment.
Let's keep the previous message for the error stack, overall LGTM
shreyamalpani
added a commit
to DataDog/dd-trace-dotnet
that referenced
this pull request
Dec 20, 2024
## Summary of changes Encodes `error.msg` and `error.type` like the previously encoded `error.stack`.  Related extension changes: DataDog/datadog-agent#32231 DataDog/datadog-lambda-extension#500 ## Reason for change Prevents the tracer from throwing an exception due to non-ASCII characters in these header values. [[SLES-2001] .NET Datadog Tracer throws exception from AWS Lambda Function](https://datadoghq.atlassian.net/browse/SLES-2001) [[SVLS-6041] Having non-ascii characters in a stack trace causes an exception within the tracer.](https://datadoghq.atlassian.net/browse/SVLS-6041) ## Implementation details Encodes the string values to UTF-8 bytes and then to a Base64 string. ## Test coverage Updated tests to check for encoded values. ## Other details <!-- Fixes #{issue} --> <!--⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. --> [SLES-2001]: https://datadoghq.atlassian.net/browse/SLES-2001?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [SVLS-6041]: https://datadoghq.atlassian.net/browse/SVLS-6041?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
chojomok
pushed a commit
to DataDog/dd-trace-dotnet
that referenced
this pull request
Jul 15, 2025
## Summary of changes Encodes `error.msg` and `error.type` like the previously encoded `error.stack`.  Related extension changes: DataDog/datadog-agent#32231 DataDog/datadog-lambda-extension#500 ## Reason for change Prevents the tracer from throwing an exception due to non-ASCII characters in these header values. [[SLES-2001] .NET Datadog Tracer throws exception from AWS Lambda Function](https://datadoghq.atlassian.net/browse/SLES-2001) [[SVLS-6041] Having non-ascii characters in a stack trace causes an exception within the tracer.](https://datadoghq.atlassian.net/browse/SVLS-6041) ## Implementation details Encodes the string values to UTF-8 bytes and then to a Base64 string. ## Test coverage Updated tests to check for encoded values. ## Other details <!-- Fixes #{issue} --> <!--⚠️ Note: where possible, please obtain 2 approvals prior to merging. Unless CODEOWNERS specifies otherwise, for external teams it is typically best to have one review from a team member, and one review from apm-dotnet. Trivial changes do not require 2 reviews. --> [SLES-2001]: https://datadoghq.atlassian.net/browse/SLES-2001?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [SVLS-6041]: https://datadoghq.atlassian.net/browse/SVLS-6041?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Decodes error.msg and error.type headers as was previously done for the error.stack header, because of DataDog/dd-trace-dotnet#6438 encoding error.msg and error.type.
Motivation
[SLES-2001] .NET Datadog Tracer throws exception from AWS Lambda Function
[SVLS-6041] Having non-ascii characters in a stack trace causes an exception within the tracer.
Testing
Tested with a lambda that throws an exception with an error message containing a non-ASCII character.
