@@ -277,7 +277,7 @@ def create_driver(conf=base_config)
277277 end
278278
279279 test 'metadata attached logs type in entries array' do
280- @d = d = create_driver
280+ @d = d = create_driver ( base_config + "skip_invalid_event false" )
281281
282282 time = event_time ( "2011-01-02 13:14:15 UTC" )
283283 metadata = { }
@@ -292,6 +292,7 @@ def create_driver(conf=base_config)
292292 send_data packer . write ( [ "tag1" , entries , { "fluent_signal" => 0 } ] ) . to_s
293293 end
294294 assert_equal ( [ "tag1" , "tag1" ] , d . events . map { |tag , _time , _record | tag } )
295+ assert_equal ( [ time , time ] , d . events . map { |_tag , time , _record | time } )
295296 assert_equal ( records , d . events . map { |_tag , _time , record | record } )
296297 end
297298
@@ -427,7 +428,7 @@ def create_driver(conf=base_config)
427428 end
428429
429430 test 'metadata attached logs type in packed entries' do
430- @d = d = create_driver
431+ @d = d = create_driver ( base_config + "skip_invalid_event false" )
431432
432433 time = event_time ( "2011-01-02 13:14:15 UTC" )
433434 metadata = { }
@@ -445,6 +446,7 @@ def create_driver(conf=base_config)
445446 send_data packer . write ( [ "tag1" , entries , { "fluent_signal" => 0 } ] ) . to_s
446447 end
447448 assert_equal ( [ "tag1" , "tag1" ] , d . events . map { |tag , _time , _record | tag } )
449+ assert_equal ( [ time , time ] , d . events . map { |_tag , time , _record | time } )
448450 assert_equal ( records , d . events . map { |_tag , _time , record | record } )
449451 end
450452
@@ -550,6 +552,33 @@ def create_driver(conf=base_config)
550552 end
551553
552554 sub_test_case 'compressed packed forward' do
555+ test 'metadata attached logs type without skip_invalid_event' do
556+ @d = d = create_driver ( base_config + "skip_invalid_event false" )
557+
558+ time = event_time ( "2011-01-02 13:14:15 UTC" )
559+ metadata = { }
560+ records = [
561+ { "a" => 1 } ,
562+ { "a" => 2 } ,
563+ ]
564+
565+ entries = ''
566+ records . each do |record |
567+ entries << compress ( [ [ time , metadata ] , record ] . to_msgpack )
568+ end
569+ chunk = [ "tag1" , entries , { 'compressed' => 'gzip' , 'fluent_signal' => 0 } ] . to_msgpack
570+
571+ d . run do
572+ Fluent ::MessagePackFactory . msgpack_unpacker . feed_each ( chunk ) do |obj |
573+ d . instance . send ( :on_message , obj , chunk . size , DUMMY_SOCK )
574+ end
575+ end
576+
577+ assert_equal ( [ "tag1" , "tag1" ] , d . events . map { |tag , _time , _record | tag } )
578+ assert_equal ( [ time , time ] , d . events . map { |_tag , _time , _record | _time } )
579+ assert_equal ( records , d . events . map { |_tag , _time , record | record } )
580+ end
581+
553582 test 'set_compress_to_option_gzip' do
554583 @d = d = create_driver
555584
0 commit comments