fix: don't be kill when send large payload when log is debug #11279
Conversation
This file contains 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
zhongwencool
requested review from
a team,
lafirest and
sstrigler
as code owners
lafirest
reviewed
Jul 18, 2023
| format_payload(Payload, hex) when ?MAX_PAYLOAD_FORMAT_LIMIT(Payload) -> | ||
| ["Payload(hex)=", binary:encode_hex(Payload)]; | ||
| format_payload(_, hidden) -> | ||
| "Payload=******"; |
There was a problem hiding this comment.
Or only display a part to keep consistent with the above
id
reviewed
Jul 24, 2023
apps/emqx/src/emqx_packet.erl
Outdated
| format_payload(_, hidden) -> | ||
| "Payload=******"; | ||
| format_payload(Payload, _) -> | ||
| ["Payload=Large data detected (", integer_to_list(byte_size(Payload)), " bytes)"]. |
There was a problem hiding this comment.
Agree with @lafirest, perhaps it's better to display ?MAX_PAYLOAD_FORMAT_SIZE characters in this case
zhongwencool
force-pushed
the
trace-log
branch
from
e9475c0
to
5a4dd3a
Compare
lafirest
approved these changes
Aug 10, 2023
zmstone
reviewed
Aug 14, 2023
| @@ -679,4 +679,7 @@ end). | |||
| -define(THROW_FRAME_ERROR(Reason), erlang:throw({?FRAME_PARSE_ERROR, Reason})). | |||
| -define(THROW_SERIALIZE_ERROR(Reason), erlang:throw({?FRAME_SERIALIZE_ERROR, Reason})). | |||
|
|
|||
| -define(MAX_PAYLOAD_FORMAT_SIZE, 1024). | |||
| -define(MAX_PAYLOAD_FORMAT_LIMIT(Bin), (byte_size(Bin) =< ?MAX_PAYLOAD_FORMAT_SIZE)). | |||
zmstone
reviewed
Aug 14, 2023
| format_payload(Payload, hex) when ?MAX_PAYLOAD_FORMAT_LIMIT(Payload) -> binary:encode_hex(Payload); | ||
| format_payload(<<Part:100, _/binary>> = Payload, _) -> | ||
| [ | ||
| Part, |
There was a problem hiding this comment.
Format Part according to 2nd arg.
zmstone
reviewed
Aug 14, 2023
| format_payload(<<Part:100, _/binary>> = Payload, _) -> | ||
| [ | ||
| "Payload=", | ||
| Part, |
There was a problem hiding this comment.
format Part according to 2nd arg.
9 tasks
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.
Fixes https://emqx.atlassian.net/browse/EMQX-10482
Summary
馃 Generated by Copilot at b277d4a
This pull request improves the performance and readability of the
emqx_packetandemqx_trace_formattermodules by using OTP 24 features and refactoring some code. It also fixes some test settings and limits the output of large payloads in the trace and packet formatting functions.PR Checklist
Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:
changes/(ce|ee)/(feat|perf|fix)-<PR-id>.en.mdfilesChecklist for CI (.github/workflows) changes
changes/dir for user-facing artifacts update