in_http: Honor keep_time_key parameter in batch mode.
#2020
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
The in_http plugin supports "batch" mode for sending multiple events in
a single HTTP request. The problem is that in_http does not honor the
`keep_time_key` option when processing those bulk-insertion requests.
This means that "time" key in each record gets discarded unconditionally
in batch mode. For example, the following request:
$ curl -d '[{"time":1514736000,"key":"foo"}]' http://localhost/
will produces a log record:
2018-01-01 01:00:00.000000000 +0900 : {"key":"foo"}
even if the `keep_time_key` option is enabled.
This patch fixes this issue by teaching in_http to honor the option
value of its parser plugin instance.
Signed-off-by: Fujimoto Seiji <[email protected]>
repeatedly
reviewed
Jun 15, 2018
lib/fluent/plugin/in_http.rb
Outdated
| single_time = time | ||
| end | ||
|
|
||
| unless @parser and @parser.keep_time_key |
There was a problem hiding this comment.
This condition can be moved to under above if single_record._has_key?
There was a problem hiding this comment.
I fixed this point by 39f3a0d
fujimotos
pushed a commit
to fujimotos/fluentd
that referenced
this pull request
Jun 18, 2018
Pointed out by repeatedly in the patch review. See the conversation
in the following ticket for details:
fluent#2020
Pointed out by repeatedly in the patch review. See the conversation
in the following ticket for details:
fluent#2020
Signed-off-by: Fujimoto Seiji <[email protected]>
fujimotos
force-pushed
the
sf/honor-keep-time-key
branch
from
5f7ea1c
to
39f3a0d
Compare
|
Could you add test? |
This patch adds a test case (test_multi_json_with_keep_time_key) to
test_in_http.rb.
I've confirmed it passes without problems in my testing machine:
test_multi_json_with_keep_time_key: .: (0.606005)
Signed-off-by: Fujimoto Seiji <[email protected]>
I have added a test case for this usage pattern in d0809c6. |
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.
This patch fixes the issue reported by Eugen Cristea at fluent/fluentd-docs#507.
Problem
in_httpplugin supports "batch" mode for sending multiple events in a single HTTP request.The problem is that in_http does not honor the
keep_time_keyoption when processingthose bulk-insertion requests.
This means that "time" key in each record gets discarded unconditionally in batch mode.
For example, the following request:
will produces a log record:
... even if the
keep_time_keyoption is enabled.Solution
This patch fixes this issue by teaching
in_httpto honor the option value of its parserplugin instance.
Signed-off-by: Fujimoto Seiji [email protected]