out_gelf: test: Implement injecting tag capability #9031
Merged
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
cosmo0920
force-pushed
the
cosmo0920-gelf-tag
branch
from
9d680c5
to
a494870
Compare
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
cosmo0920
force-pushed
the
cosmo0920-gelf-tag
branch
from
a494870
to
55f0bca
Compare
cosmo0920
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
edsiper
requested changes
Jul 3, 2024
plugins/out_gelf/gelf.c
Outdated
| msgpack_sbuffer_destroy(&sbuf); | ||
| return -1; | ||
| } | ||
| memcpy(*out_buf, sbuf.data, sbuf.size); |
There was a problem hiding this comment.
here is possible to avoid the memory copy by simply assigning the pointer to the msgpack buffer, e.g:
*out_buf = sbuf.data
*out_size = sbuf.sizejust do not destroy sbuf before returning and should be fine
There was a problem hiding this comment.
Ah, got it. Direct operation should be fine if avoiding memory copy:
static inline void msgpack_sbuffer_init(msgpack_sbuffer* sbuf)
{
memset(sbuf, 0, sizeof(msgpack_sbuffer));
}
static inline void msgpack_sbuffer_destroy(msgpack_sbuffer* sbuf)
{
free(sbuf->data);
}Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
edsiper
requested changes
Jul 4, 2024
plugins/out_gelf/gelf.c
Outdated
| msgpack_pack_object(&pck, map->via.map.ptr[i].val); | ||
| } | ||
|
|
||
| for (i = 0; i < 1; i++){ |
There was a problem hiding this comment.
I unrolled a needless loop.
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
Signed-off-by: Hiroshi Hatake <hiroshi@chronosphere.io>
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.
To align the behavior of Fluentd side of gelf plugin, we need to implement a capability to inject tag information to gelf records if available.
Closes #8921
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:
Without Tag
$ bin/fluent-bit -i dummy -pdummy='{"message":"dummy","send":"from fluent-bit"}' -o gelf -p port=12202 -pgelf_short_message_key=message -vWith Tag
Without Tag
With Tag
Without Tag
With Tag
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
fluent/fluent-bit-docs#1403
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.