Repository navigation
fix(parser): CloudWatch Log Envelope handles non-JSON - #3505
Merged
Merged
Conversation
|
am29d
reviewed
Jan 22, 2025
am29d
reviewed
Jan 22, 2025
am29d
left a comment
Contributor
There was a problem hiding this comment.
Minor qustion on why we deleted other events that has nothing to do with CloudWatch.
am29d
approved these changes
Jan 22, 2025
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
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.



Summary
Changes
This PR fixes the
CloudWatchEnvelopebuilt-in envelope so that it correctly handles log messages that are not JSON strings. The previous implementation forced the parsing to always attempt aJSON.parsewhich would fail in the case of non-JSON-structured log messages.For example, parsing a series of log messages from an AWS Lambda function invocation would fail when encountering messages like this:
{ "id": "38569604798453153764115268074363468419149517103543812096", "timestamp": 1729520895158, "message": "2024-10-21T14:28:15.158Z\teadc91c8-8273-4a2d-b170-b0a7883b619e\tINFO\tHello from other.ts\n" }, { "id": "38569604798453153764115268074363468419149517103543812097", "timestamp": 1729520895158, "message": "START RequestId: eadc91c8-8273-4a2d-b170-b0a7883b619e Version: $LATEST\n" }, { "id": "38569604798475454509313798697505004137422165465049792514", "timestamp": 1729520895159, "message": "{\"level\":\"INFO\",\"message\":\"Hello from other.ts\",\"sampling_rate\":0,\"service\":\"service_undefined\",\"timestamp\":\"2024-10-21T14:28:15.158Z\",\"xray_trace_id\":\"1-671664ff-69b0ec7624423e04544c023f\"}\n" },This PR fixes this behavior by removing the forced JSON parsing and instead letting the customer set the parsing if they know their
messageis JSON-structured, i.e.The PR also refactored the unit tests for both the schema & the envelope, as well as removing the usage of
Envelopein favor of an implementation in theCloudWatchEnvelopethat now includes the correct full path in the error, i.e.The PR also adds a new custom error that is thrown when either the unzip or decode operations fail, since the error thrown by the standard library is rather opaque and a generic
Error.While working on this PR I also removed another batch of test event files that were not used nor referenced anywhere.
Issue number: fixes #3225
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Disclaimer: We value your time and bandwidth. As such, any pull requests created on non-triaged issues might not be successful.