Skip to content

config: backport 31a8163, b41742e, and 7130d74 #10344

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

Open
wants to merge 3 commits into
base: 3.2
Choose a base branch
from

Conversation

stoksc
Copy link

@stoksc stoksc commented May 16, 2025

Backport #10305 and #10296.

I backported @niedbalski's change first because my change is based on it in a small way and, with the conflicts, my choices were to either:

  • drop the part of his changes contain in mine, which felt worrisome because if his is cherry-picked it is likely the goto error in my change is missed since it wouldn't conflict anymore.
  • implicitly accept his change as part of mine, without his tests

both of which felt worse than just picking his change first.

His commits had no conflicts except that I dropped two small chunks from his change in flb_processor.c that updated log messages that do not exist in 3.2.


Enter [N/A] in the box, if an item is not applicable to your change.

Testing
Before we can approve your change; please submit the following in a comment:

  • Example configuration file for the change
  • Debug log output from testing the change
  • Attached Valgrind output that shows no leaks or memory corruption was found

If this is a change to packaging of containers or native binaries then please confirm it works for all targets.

  • Run local packaging test showing all targets (including any new ones) build.
  • Set ok-package-test label to test for all targets (requires maintainer to do).

Documentation

  • Documentation required for this feature

Backporting

  • Backport to latest stable release.

Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.

niedbalski and others added 3 commits May 16, 2025 10:23
This change makes Fluent Bit fail to start when a configuration includes
an invalid processor (one that doesn't exist or fails to initialize).
Previously, Fluent Bit would log an error but continue starting up,
potentially masking configuration issues.

- Add early exit conditions when a processor plugin doesn't exist
- Add early exit conditions when a processor plugin fails to initialize
- Improve error messages to be more descriptive

Part of fluent#10305
… handling

This test verifies Fluent Bit's behavior when configured with a non-existent
processor. It checks that Fluent Bit properly fails to start and reports
a relevant error message.

Part of fluent#10305
After this change, when a plugin configuration contains an invalid property,
`configure_plugins_type` returns an error which ultimately crashes fluentbit,
instead of only printing an error log and continuing on. The change also fixes
a small issue where `name` was printed by `flb_error` after it was freed. To
properly test this change and get the test to pass with `-DSANITIZE_ADDRESS=On`
on all platforms, I had to update `configure_plugins_type` to free objects that
it fails to instantiate.

Signed-off-by: Bradley Laney <[email protected]>
@stoksc stoksc changed the title backport 31a8163, b41742e, and 7130d74 config: backport 31a8163, b41742e, and 7130d74 May 16, 2025
@stoksc
Copy link
Author

stoksc commented May 19, 2025

This backport is stale now. Once my commit is approved and merged in master I will redo this backport. I would like to wait until then to prevent any wasted effort.

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

Successfully merging this pull request may close these issues.

3 participants