Skip to content

formatter_json: use JSON as fallback parser instead of Yajl for performance #4835

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Feb 21, 2025
Merged

formatter_json: use JSON as fallback parser instead of Yajl for performance #4835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11ac894
formatter_json: use JSON as fallback parser instead of Yajl for perfo…
Watson1978 Feb 18, 2025
4cd6b8d
test_out_stdout: fix test
Watson1978 Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/fluent/plugin/formatter_json.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ def configure(conf)
if Fluent::OjOptions.available?
@dump_proc = Oj.method(:dump)
else
log.info "Oj isn't installed, fallback to Yajl as json parser"
@dump_proc = Yajl.method(:dump)
log.info "Oj isn't installed, fallback to JSON as json parser"
@dump_proc = JSON.method(:generate)
end
else
@dump_proc = Yajl.method(:dump)
@dump_proc = JSON.method(:generate)
end

# format json is used on various highload environment, so re-define method to skip if check
Expand Down
2 changes: 1 addition & 1 deletion test/plugin/test_out_stdout.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def create_driver(conf = CONFIG)

if data == 'yajl'
# NOTE: Float::NAN is not jsonable
assert_raise(Yajl::EncodeError) { d.feed('test', time, {'test' => Float::NAN}) }
assert_raise(JSON::GeneratorError) { d.feed('test', time, {'test' => Float::NAN}) }
else
out = capture_log { d.feed('test', time, {'test' => Float::NAN}) }
assert_equal "#{Time.at(time).localtime.strftime(TIME_FORMAT)} test: {\"test\":NaN}\n", out
Expand Down
Loading