mp: fix flb_mp_accessor_keys_remove for sibling keys removal#10013
Merged
edsiper merged 2 commits intofluent:masterfrom Apr 22, 2025
Merged
mp: fix flb_mp_accessor_keys_remove for sibling keys removal#10013edsiper merged 2 commits intofluent:masterfrom
flb_mp_accessor_keys_remove for sibling keys removal#10013edsiper merged 2 commits intofluent:masterfrom
Conversation
Signed-off-by: Arkady Dyakonov <[email protected]>
Signed-off-by: Arkady Dyakonov <[email protected]>
ca703cc to
5c96491
Compare
Contributor
Author
|
Hi @edsiper, I've noticed that my PR still carries the docs-requires label, even though I didn't make any documentation changes. Could you please let me know if I missed anything in the description? Thanks for your help. |
|
@edsiper @leonardo-albertovich @fujimotos @koleini Can we get someone to take a look at this PR? This particular bug has been causing huge amounts of unnecessary log volume ingestion into Grafana Cloud for us. We currently have a workaround implemented in lua by @shirolimit (while we wait for this PR to be accepted), and I can tell you that fixing the bug lowered our ingestion by 25%-30%, so this bug is very much impactful. |
Member
|
thank you folks! this will be part of v4.0.1 |
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.
Fixes #9091
The PR aims to make
flb_mp_accessor_keys_removework for sibling subkeys.The existing versions of the function can only remove one (the first) subkey of a given key. This method is used by several output plugins including
lokiwhich my team uses. We noticed that not all keys are removed from log records when there are multiple subkeys specified.A good example is provided in the added unit test, but here is another example of existing behaviour the PR is fixing.
Payload:
{ "kubernetes": { "pod_id": "id", "pod_name": "name", "host": "localhost" }, "msg": "foo" }Accessor keys to remove:
Will result in only
pod_namebeing removed. I.e.:{ "kubernetes": { "pod_id": "id", "host": "localhost" }, "msg": "foo" }With the PR change the output will be:
{ "kubernetes": { "host": "localhost" }, "msg": "foo" }Valgrind output for unit tests
Valgrind output for main binary (with config)
[SERVICE] flush 1 log_level info [INPUT] name dummy dummy {"logType":"UFL","location":"location","runInfo":{},"message":"test","kubernetes":{"container_name":"test","pod_id":"e900ac60-70eb-4f0c-872a-7127884ccf45","host":"ip-10-193-25-96.ec2.internal","pod_name":"b59ce932-f732-49e3-bb89-f15a3908f096-cqktm","annotations":{"connector-schema-name":"schema","connector-detail":"Ft/Group/postgres_rds/schema"}}} samples 1 [OUTPUT] name loki match * host localhost port 8000 line_format json labels source=fluent-bit structured_metadata pod_name=$kubernetes['pod_name'],foo=$kubernetes['foo'],schema=$kubernetes['annotations']['connector-schema-name'],pod_id=$kubernetes['pod_id'] remove_keys _p drop_single_key offEnter
[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:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
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.