Skip to content
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

formatter_ltsv: suppress delimiters in output #3288

Merged
merged 2 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/fluent/plugin/formatter_ltsv.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ class LabeledTSVFormatter < Formatter

config_param :delimiter, :string, default: "\t".freeze
config_param :label_delimiter, :string, default: ":".freeze
config_param :replacement, :string, default: " ".freeze
config_param :add_newline, :bool, default: true

# TODO: escaping for \t in values
def format(tag, time, record)
formatted = ""
record.each do |label, value|
formatted << @delimiter if formatted.length.nonzero?
formatted << "#{label}#{@label_delimiter}#{value}"
formatted << "#{label}#{@label_delimiter}#{value.to_s.gsub(@delimiter, @replacement)}"
end
formatted << @newline if @add_newline
formatted
Expand Down
30 changes: 30 additions & 0 deletions test/test_formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,36 @@ def test_format_with_customized_delimiters

assert_equal("message=awesome,greeting=hello#{@newline}", formatted)
end

def record_with_tab
{'message' => "awe\tsome", 'greeting' => "hello\t"}
end

def test_format_suppresses_tab
@formatter.configure({})
formatted = @formatter.format(tag, @time, record_with_tab)

assert_equal("message:awe some\tgreeting:hello \n", formatted)
end

def test_format_suppresses_tab_custom_replacement
@formatter.configure(
'replacement' => 'X',
)
formatted = @formatter.format(tag, @time, record_with_tab)

assert_equal("message:aweXsome\tgreeting:helloX\n", formatted)
end

def test_format_suppresses_custom_delimiter
@formatter.configure(
'delimiter' => 'w',
'label_delimiter' => '=',
)
formatted = @formatter.format(tag, @time, record)

assert_equal("message=a esomewgreeting=hello\n", formatted)
end
end

class CsvFormatterTest < ::Test::Unit::TestCase
Expand Down