Skip to content
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

7.0.x/too long json/v1 #12204

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Conversation

jasonish
Copy link
Member

@jasonish jasonish commented Dec 2, 2024

Backport of: #12172

  • with exception of minor cleanup commit

Ticket: https://redmine.openinfosecfoundation.org/issues/7300

In the situation where the mem buffer cannot be expanded to the
requested size, drop the log message.

For each JSON log context, a warning will be emitted once with a partial
bit of the log record being dropped to identify what event types may be
leading to large log records.

This also fixes the call to MemBufferExpand which is supposed be
passed the amount to expand by, not the new size required.

Ticket: OISF#7300
(cherry picked from commit d39e427)
Copy link

codecov bot commented Dec 2, 2024

Codecov Report

Attention: Patch coverage is 46.66667% with 8 lines in your changes missing coverage. Please review.

Project coverage is 83.18%. Comparing base (1bae761) to head (093397f).
Report is 2 commits behind head on main-7.0.x.

Additional details and impacted files
@@             Coverage Diff             @@
##           main-7.0.x   #12204   +/-   ##
===========================================
  Coverage       83.17%   83.18%           
===========================================
  Files             922      922           
  Lines          260845   260858   +13     
===========================================
+ Hits           216966   216982   +16     
+ Misses          43879    43876    -3     
Flag Coverage Δ
fuzzcorpus 64.15% <46.66%> (-0.01%) ⬇️
suricata-verify 63.36% <46.66%> (+<0.01%) ⬆️
unittests 62.37% <0.00%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@suricata-qa
Copy link

Information: QA ran without warnings.

Pipeline 23637

@victorjulien victorjulien merged commit 093397f into OISF:main-7.0.x Dec 3, 2024
84 of 88 checks passed
@victorjulien
Copy link
Member

Merged in #12207, thanks!

@jasonish jasonish deleted the 7.0.x/too-long-json/v1 branch December 12, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants