Skip to content

Commit f6808ea

Browse files
committed
in_forward: enable skip_invalid_event by default
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 25ff215 commit f6808ea

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

lib/fluent/plugin/in_forward.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class ForwardInput < Input
5555
desc 'Received chunk is dropped if it is larger than this value.'
5656
config_param :chunk_size_limit, :size, default: nil
5757
desc 'Skip an event if incoming event is invalid.'
58-
config_param :skip_invalid_event, :bool, default: false
58+
config_param :skip_invalid_event, :bool, default: true
5959

6060
desc "The field name of the client's source address."
6161
config_param :source_address_key, :string, default: nil

test/plugin/test_in_forward.rb

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -580,9 +580,6 @@ def create_driver(conf=base_config)
580580
end
581581
chunk = ["tag1", entries, { 'compressed' => 'gzip' }].to_msgpack
582582

583-
# check CompressedMessagePackEventStream is created
584-
mock(Fluent::CompressedMessagePackEventStream).new(entries, nil, 0, compress: :gzip)
585-
586583
d.run do
587584
Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
588585
option = d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)
@@ -604,13 +601,10 @@ def create_driver(conf=base_config)
604601
entries = ''
605602
events.each do |_tag, _time, record|
606603
v = [_time, record].to_msgpack
607-
entries << compress(v)
604+
entries << compress(v, type: :zstd)
608605
end
609606
chunk = ["tag1", entries, { 'compressed' => 'zstd' }].to_msgpack
610607

611-
# check CompressedMessagePackEventStream is created
612-
mock(Fluent::CompressedMessagePackEventStream).new(entries, nil, 0, compress: :zstd)
613-
614608
d.run do
615609
Fluent::MessagePackFactory.msgpack_unpacker.feed_each(chunk) do |obj|
616610
option = d.instance.send(:on_message, obj, chunk.size, DUMMY_SOCK)

test/plugin/test_out_forward.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ def try_write(chunk)
541541
end
542542

543543
test 'send_compressed_message_pack_stream_if_compress_is_gzip' do
544-
target_input_driver = create_target_input_driver
544+
target_input_driver = create_target_input_driver(conf: target_config + "skip_invalid_event false")
545545

546546
@d = d = create_driver(config + %[
547547
flush_interval 1s
@@ -571,7 +571,7 @@ def try_write(chunk)
571571
end
572572

573573
test 'send_compressed_message_pack_stream_if_compress_is_zstd' do
574-
target_input_driver = create_target_input_driver
574+
target_input_driver = create_target_input_driver(conf: target_config + "skip_invalid_event false")
575575

576576
@d = d = create_driver(config + %[
577577
flush_interval 1s

0 commit comments

Comments
 (0)