filter_parser: Transition from single record to stream #4620

Athishpranav2003 · 2024-08-29T06:42:04Z

Which issue(s) this PR fixes:
Fixes #4100

What this PR does / why we need it:
Transition filter_parser from using filter_with_time to filter_stream logic
Docs Changes:
N/A
Release Note:
N/A

Athishpranav2003 · 2024-08-29T06:43:13Z

@daipom i have raised this as a draft. This needs other changes like changing the tests around this, exception handling and etc.

For now lets have discussion on the base logic and in meantime i will add them once we fix it

daipom · 2024-08-29T08:28:09Z

Thanks! I will see this this weekend!

Athishpranav2003 · 2024-08-29T08:48:23Z

@daipom thank you. The tests needs to be revamped for filter parser since the tests involve few instance variables. Do check it in freetime and let me know

Athishpranav2003 · 2024-09-02T12:07:22Z

@daipom any opinion on this logic? Should we go ahead with this?

daipom · 2024-09-06T09:01:56Z

@Athishpranav2003 Sorry for my late response.
I got COVID-19 last weekend and only got a little work done this week 😢
I will see this now, please wait a few more days 😢

daipom

@Athishpranav2003 Sorry for my late response.
Basically, it looks good to me! Thanks for this fix!

We would like to address the tests while considering the following points.

The behavior of @emit_invalid_record_to_error.

The reason why the old code raises errors would be that the following base class logic handled the errors.

fluentd/lib/fluent/plugin/filter.rb

Lines 86 to 91 in 919e91b

    
           begin 
        
             filtered_time, filtered_record = filter_with_time(tag, time, record) 
        
             new_es.add(filtered_time, filtered_record) if filtered_time && filtered_record 
        
           rescue => e 
        
             router.emit_error_event(tag, time, record, e) 
        
           end

In the new code, we would need to handle it on the plugin side.

Code readability.

It appears that adding some inner methods would improve code readability.

For example ...

def filter_stream(tag, es)
  new_es = Fluent::MultiEventStream.new
  es.each do |time, record|
    begin
      filter_one_record(tag, time, record) do |filtered_time, filtered_record|
        new_es.add(filtered_time, filtered_record)
      end
    rescue => e
      router.emit_error_event(tag, time, record, e)
    end
  end
  new_es
end

def filter_one_record(tag, time, record)
  ...
  yield result_time, result_record
  ...
end

lib/fluent/plugin/filter_parser.rb

daipom · 2024-09-09T04:51:20Z

It appears that adding some inner methods would improve code readability.
For example ...

I guess we need to think a little better about handling error events...

Athishpranav2003 · 2024-09-09T05:43:12Z

@daipom yah
I wanted to make sure we are in same page. I will refactor the code and change the error part after that

daipom · 2024-09-09T05:57:20Z

@daipom yah I wanted to make sure we are in same page. I will refactor the code and change the error part after that

Thanks! This would be the right direction!

Athishpranav2003 · 2024-09-10T06:23:30Z

@daipom you can check this now

Athishpranav2003 · 2024-09-10T07:22:38Z

@daipom I guess the CI test fail is not related to this change

daipom · 2024-09-10T07:32:32Z

Thanks!! I will see this!

I guess the CI test fail is not related to this change

Yes, They are not related.

daipom

Great! Thanks!
Looks good to me for normal cases.

I'm concerned about some abnormal cases.
The behavior of some of rescue cases appears to have changed.
I would like to have it checked.

I would be very happy if you could add some automated tests for the rescue cases if possible, as there seems to be a lack of those tests.

lib/fluent/plugin/filter_parser.rb

test/plugin/test_filter_parser.rb

Athishpranav2003 · 2024-09-12T06:00:03Z

@daipom

fluentd/test/plugin/test_filter_parser.rb

Lines 659 to 666 in 51b860b

    
           def test_call_emit_error_event_when_parser_error 
        
             d = create_driver(CONFIG_INVALID_TIME_VALUE) 
        
             flexmock(d.instance.router).should_receive(:emit_error_event). 
        
               with(String, Integer, Hash, ParserError).once 
        
             d.run do 
        
               d.feed(@tag, Fluent::EventTime.now.to_i, {'data' => '{"time":[], "f1":"v1"}'}) 
        
             end 
        
           end

could you please point which emit_event is this call part of

Athishpranav2003 · 2024-09-12T06:11:06Z

After doing some verification

fluentd/lib/fluent/plugin/filter.rb

Lines 82 to 104 in 51b860b

    
           def filter_stream(tag, es) 
        
             new_es = MultiEventStream.new 
        
             if @has_filter_with_time 
        
               es.each do |time, record| 
        
                 begin 
        
                   filtered_time, filtered_record = filter_with_time(tag, time, record) 
        
                   new_es.add(filtered_time, filtered_record) if filtered_time && filtered_record 
        
                 rescue => e 
        
                   router.emit_error_event(tag, time, record, e) 
        
                 end 
        
               end 
        
             else 
        
               es.each do |time, record| 
        
                 begin 
        
                   filtered_record = filter(tag, time, record) 
        
                   new_es.add(time, filtered_record) if filtered_record 
        
                 rescue => e 
        
                   router.emit_error_event(tag, time, record, e) 
        
                 end 
        
               end 
        
             end 
        
             new_es 
        
           end

The emit error event is in line 90/99. This implies that earlier we raise the exception in filter one record and capture in the filter stream. Now since we have implemented stream directly so the raise not needed

Failure: test_call_emit_error_event_when_parser_error(ParserFilterTest):
  in mock 'flexmock(Fluent::Test::Driver::TestEventRouter)': no matching handler found for emit_error_event("test", 1272942121, {"data"=>"{\"time\":[], \"f1\":\"v1\"}"}, #<Fluent::Plugin::Parser::ParserError: value must be a string or a number: [](Array)>)
  Defined expectations:
    should_receive(:emit_error_event).with("String", Integer, Hash, Fluent::Plugin::Parser::ParserError).once.
  <false> is not true.
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/test_unit_integration.rb:57:in `make_assertion'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/test_unit_integration.rb:65:in `check'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/core_class_methods.rb:104:in `check'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/expectation_director.rb:41:in `call'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/core.rb:150:in `block in method_missing'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/core.rb:289:in `flexmock_wrap'
/home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/core.rb:146:in `method_missing'
(eval at /home/aggressive_racer1/projects/fluentd/vendor/bundle/ruby/3.3.0/gems/flexmock-2.3.8/lib/flexmock/partial_mock.rb:429):3:in `emit_error_event'
/home/aggressive_racer1/projects/fluentd/lib/fluent/plugin/filter.rb:90:in `rescue in block in filter_stream'
/home/aggressive_racer1/projects/fluentd/lib/fluent/plugin/filter.rb:86:in `block in filter_stream'
/home/aggressive_racer1/projects/fluentd/lib/fluent/event.rb:110:in `each'
/home/aggressive_racer1/projects/fluentd/lib/fluent/plugin/filter.rb:85:in `filter_stream'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/filter.rb:49:in `block (2 levels) in instance_hook_after_started'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/event_feeder.rb:43:in `feed_to_plugin'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/event_feeder.rb:87:in `feed'
/home/aggressive_racer1/projects/fluentd/test/plugin/test_filter_parser.rb:664:in `block in test_call_emit_error_event_when_parser_error'
     661:     flexmock(d.instance.router).should_receive(:emit_error_event).
     662:       with("String", Integer, Hash, ParserError).once
     663:     d.run do
  => 664:       d.feed(@tag, Fluent::EventTime.now.to_i, {'data' => '{"time":[], "f1":"v1"}'})
     665:     end
     666:   end
     667: 
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/base.rb:204:in `block in run_actual'
/usr/share/ruby/timeout.rb:186:in `block in timeout'
/usr/share/ruby/timeout.rb:41:in `handle_timeout'
/usr/share/ruby/timeout.rb:195:in `timeout'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/base.rb:203:in `run_actual'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/base.rb:96:in `run'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/base_owner.rb:130:in `run'
/home/aggressive_racer1/projects/fluentd/lib/fluent/test/driver/event_feeder.rb:39:in `run'
/home/aggressive_racer1/projects/fluentd/test/plugin/test_filter_parser.rb:663:in `test_call_emit_error_event_when_parser_error'

I used the following jugad way to find the function call

daipom · 2024-09-12T07:34:33Z

Now since we have implemented stream directly so the raise not needed

Yes, we don't need raise in the new implementation.
However, router.emit_error_event should be called as before.

daipom · 2024-09-12T07:45:26Z

fluentd/test/plugin/test_filter_parser.rb

Lines 659 to 666 in 51b860b

def test_call_emit_error_event_when_parser_error

d = create_driver(CONFIG_INVALID_TIME_VALUE)

flexmock(d.instance.router).should_receive(:emit_error_event).

with(String, Integer, Hash, ParserError).once

d.run do

d.feed(@tag, Fluent::EventTime.now.to_i, {'data' => '{"time":[], "f1":"v1"}'})

end

end

could you please point which emit_event is this call part of

In the current implementation:

fluentd/lib/fluent/plugin/filter_parser.rb

Lines 114 to 119 in 78a7972

    
           rescue Fluent::Plugin::Parser::ParserError => e 
        
             if @emit_invalid_record_to_error 
        
               raise e 
        
             else 
        
               return FAILED_RESULT 
        
             end

In the new implementation:

fluentd/lib/fluent/plugin/filter_parser.rb

Lines 105 to 108 in 9ec5a95

    
           rescue Fluent::Plugin::Parser::ParserError => e 
        
             if @emit_invalid_record_to_error 
        
               router.emit_error_event(tag, time, record, e) 
        
             end

This change is OK because emit_error_event is called similarly after all.

Athishpranav2003 · 2024-09-12T07:59:25Z

@daipom
i am not sure what is this issue

Failure: test_filter_key_not_exist(ParserFilterTest):
  in mock 'flexmock(Fluent::Test::Driver::TestEventRouter)': no matching handler found for emit_error_event("test", 1272942121, {"foo"=>"bar"}, #<ArgumentError: data does not exist>)
  Defined expectations:
    should_receive(:emit_error_event).with(String, Integer, Hash, #<ArgumentError: data does not exist>).once.
  <false> is not true.

For now i have pushed the alternative code. Now the functionality looks visibly same as before. Could you please let me know which part is still ambigious and needs tests?

daipom · 2024-09-12T09:29:24Z

@daipom i am not sure what is this issue

Failure: test_filter_key_not_exist(ParserFilterTest):
  in mock 'flexmock(Fluent::Test::Driver::TestEventRouter)': no matching handler found for emit_error_event("test", 1272942121, {"foo"=>"bar"}, #<ArgumentError: data does not exist>)
  Defined expectations:
    should_receive(:emit_error_event).with(String, Integer, Hash, #<ArgumentError: data does not exist>).once.
  <false> is not true.

I see. This test code specifies the content of expected arguments too strictly.
It appears that this requires all values of the instance match, but the stacktrace data can be different.
We should soften the conditions.

diff --git a/test/plugin/test_filter_parser.rb b/test/plugin/test_filter_parser.rb
index ec36c836..4201cec8 100644
--- a/test/plugin/test_filter_parser.rb
+++ b/test/plugin/test_filter_parser.rb
@@ -650,7 +650,7 @@ class ParserFilterTest < Test::Unit::TestCase
   def test_filter_key_not_exist
     d = create_driver(CONFIG_NOT_IGNORE)
     flexmock(d.instance.router).should_receive(:emit_error_event).
-      with(String, Integer, Hash, ArgumentError.new("data does not exist")).once
+      with(String, Integer, Hash, ArgumentError).once
     assert_nothing_raised {
       d.run do
         d.feed(@tag, Fluent::EventTime.now.to_i, {'foo' => 'bar'})

daipom

Thanks!
I think it could be simpler, so I would suggest the following code change.

lib/fluent/plugin/filter_parser.rb

test/plugin/test_filter_parser.rb

Athishpranav2003 · 2024-09-12T10:11:11Z

Got it @daipom
Will make the changes in sometime

daipom · 2024-09-12T10:39:20Z

Thanks!

Athishpranav2003 · 2024-09-12T11:42:42Z

@daipom i have addressed the comments. Additionally i felt there was a redundant rescue in the prev code so i have removed that as well. Is it fine now?

daipom

Thanks!! The code change looks good to me!
I'd like to confirm the behavior a little more.
We would need more tests of anomaly scenarios.
I will add some tests later.

daipom · 2024-09-16T15:34:33Z

I made another PR to add some test cases for abnormal cases.

filter_parser: reorganize tests for abnormal cases #4638

Let's rebase after it is merged.

I confirmed the test results on my local for this PR.
Basically, there is no problem, but a few tests fail.
It is because this PR removes the following rescue, and it changes the error message a little bit.

fluentd/lib/fluent/plugin/filter_parser.rb

Lines 114 to 119 in 51b860b

    
           rescue Fluent::Plugin::Parser::ParserError => e 
        
             if @emit_invalid_record_to_error 
        
               raise e 
        
             else 
        
               return FAILED_RESULT 
        
             end

With this, I believe we should stop removing this rescue, even if this is redundant.
It is preferable to keep the error message as unchanged as possible because it could cause a disadvantage to existing users.

The result of #4638 tests applied to this PR:

Failure: test_parser_error[invalid format with default](ParserFilterTest::abnormal cases)
/home/daipom/work/fluentd/fluentd/test/plugin/test_filter_parser.rb:546:in `run_and_assert'
/home/daipom/work/fluentd/fluentd/test/plugin/test_filter_parser.rb:691:in `test_parser_error'
     688:         </parse>
     689:       EOC
     690: 
  => 691:       run_and_assert(driver, **data.except(:additional_config))
     692:     end
     693: 
     694:     data(
<[[],
 [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
 [[Fluent::Plugin::Parser::ParserError,
   "value must be a string or a number: [](Array)"]]]> expected but was
<[[],
 [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
 [[Fluent::Plugin::Parser::ParserError,
   "parse failed value must be a string or a number: [](Array)"]]]>

diff:
  [[],
   [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
   [[Fluent::Plugin::Parser::ParserError,
?    "parse failed value must be a string or a number: [](Array)"]]]
======================================================================================================
F
======================================================================================================
Failure: test_parser_error[mixed valid and invalid with default](ParserFilterTest::abnormal cases)
/home/daipom/work/fluentd/fluentd/test/plugin/test_filter_parser.rb:546:in `run_and_assert'
/home/daipom/work/fluentd/fluentd/test/plugin/test_filter_parser.rb:691:in `test_parser_error'
     688:         </parse>
     689:       EOC
     690: 
  => 691:       run_and_assert(driver, **data.except(:additional_config))
     692:     end
     693: 
     694:     data(
<[[{"f1"=>"v1"}],
 [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
 [[Fluent::Plugin::Parser::ParserError,
   "value must be a string or a number: [](Array)"]]]> expected but was
<[[{"f1"=>"v1"}],
 [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
 [[Fluent::Plugin::Parser::ParserError,
   "parse failed value must be a string or a number: [](Array)"]]]>

diff:
  [[{"f1"=>"v1"}],
   [{"data"=>"{\"time\":[], \"f1\":\"v1\"}"}],
   [[Fluent::Plugin::Parser::ParserError,
?    "parse failed value must be a string or a number: [](Array)"]]]

Athishpranav2003 · 2024-09-16T17:08:03Z

@daipom thanks for this help. I had difficulty in figuring out the edgecases. Thanks for doing it along with this to make it move ahead

Signed-off-by: Athish Pranav D <athishanna@gmail.com>

Athishpranav2003 · 2024-09-18T03:56:30Z

@daipom i have reverted the change with redundant rescue. Can you point out the change in the error messages if its still present in this pr?

daipom

Thanks! I have confirmed this change passes tests on #4638.
I believe we are now ready to merge! (after #4638)
Thanks so much for this fix!

daipom · 2024-09-18T04:57:02Z

@ashie @kenhys
Which version should we release this on?

This solves the limitation of #4474, which is released on v1.17.0.
It's ambiguous whether it's a bug fix or an enhancement.

I think it is possible to release this on v1.17.
On the other hand, since this is a large fix for filter_parser, 1.18 may be safer, given the risk of regression.

daipom self-requested a review August 29, 2024 08:28

Athishpranav2003 force-pushed the filter_parser_fix branch from 904f7df to 919e91b Compare August 29, 2024 08:30

Athishpranav2003 changed the title ~~Transition filter_parser from single record to stream~~ filter_parser: Transition from single record to stream Aug 29, 2024

daipom reviewed Sep 9, 2024

View reviewed changes

lib/fluent/plugin/filter_parser.rb Outdated Show resolved Hide resolved

Athishpranav2003 force-pushed the filter_parser_fix branch from 919e91b to 90c8501 Compare September 10, 2024 05:52

Athishpranav2003 marked this pull request as ready for review September 10, 2024 06:22

Athishpranav2003 requested a review from daipom September 10, 2024 06:23

daipom requested changes Sep 12, 2024

View reviewed changes

lib/fluent/plugin/filter_parser.rb Show resolved Hide resolved

lib/fluent/plugin/filter_parser.rb Outdated Show resolved Hide resolved

test/plugin/test_filter_parser.rb Outdated Show resolved Hide resolved

Athishpranav2003 force-pushed the filter_parser_fix branch from 9ec5a95 to c9b61f2 Compare September 12, 2024 08:01

Athishpranav2003 requested a review from daipom September 12, 2024 08:02

daipom requested changes Sep 12, 2024

View reviewed changes

Athishpranav2003 force-pushed the filter_parser_fix branch from c9b61f2 to cfb9f1d Compare September 12, 2024 11:42

Athishpranav2003 requested a review from daipom September 12, 2024 11:42

daipom reviewed Sep 16, 2024

View reviewed changes

daipom mentioned this pull request Sep 16, 2024

filter_parser: reorganize tests for abnormal cases #4638

Open

Athishpranav2003 added 2 commits September 18, 2024 09:23

Transition filter_parser from single record to stream

9aba437

Signed-off-by: Athish Pranav D <athishanna@gmail.com>

Added UTs

1ca7ea1

Signed-off-by: Athish Pranav D <athishanna@gmail.com>

Athishpranav2003 force-pushed the filter_parser_fix branch from cfb9f1d to 1ca7ea1 Compare September 18, 2024 03:54

daipom approved these changes Sep 18, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

filter_parser: Transition from single record to stream #4620

filter_parser: Transition from single record to stream #4620

Athishpranav2003 commented Aug 29, 2024

Athishpranav2003 commented Aug 29, 2024

daipom commented Aug 29, 2024

Athishpranav2003 commented Aug 29, 2024

Athishpranav2003 commented Sep 2, 2024

daipom commented Sep 6, 2024

daipom left a comment

daipom commented Sep 9, 2024

Athishpranav2003 commented Sep 9, 2024

daipom commented Sep 9, 2024

Athishpranav2003 commented Sep 10, 2024

Athishpranav2003 commented Sep 10, 2024

daipom commented Sep 10, 2024

daipom left a comment

Athishpranav2003 commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024

daipom commented Sep 12, 2024

daipom commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024 •

edited

Loading

daipom commented Sep 12, 2024

daipom left a comment

Athishpranav2003 commented Sep 12, 2024

daipom commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024

daipom left a comment

daipom commented Sep 16, 2024

Athishpranav2003 commented Sep 16, 2024

Athishpranav2003 commented Sep 18, 2024

daipom left a comment

daipom commented Sep 18, 2024

	begin
	filtered_time, filtered_record = filter_with_time(tag, time, record)
	new_es.add(filtered_time, filtered_record) if filtered_time && filtered_record
	rescue => e
	router.emit_error_event(tag, time, record, e)
	end

filter_parser: Transition from single record to stream #4620

Are you sure you want to change the base?

filter_parser: Transition from single record to stream #4620

Conversation

Athishpranav2003 commented Aug 29, 2024

Athishpranav2003 commented Aug 29, 2024

daipom commented Aug 29, 2024

Athishpranav2003 commented Aug 29, 2024

Athishpranav2003 commented Sep 2, 2024

daipom commented Sep 6, 2024

daipom left a comment

Choose a reason for hiding this comment

daipom commented Sep 9, 2024

Athishpranav2003 commented Sep 9, 2024

daipom commented Sep 9, 2024

Athishpranav2003 commented Sep 10, 2024

Athishpranav2003 commented Sep 10, 2024

daipom commented Sep 10, 2024

daipom left a comment

Choose a reason for hiding this comment

Athishpranav2003 commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024

daipom commented Sep 12, 2024

daipom commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024 • edited Loading

daipom commented Sep 12, 2024

daipom left a comment

Choose a reason for hiding this comment

Athishpranav2003 commented Sep 12, 2024

daipom commented Sep 12, 2024

Athishpranav2003 commented Sep 12, 2024

daipom left a comment

Choose a reason for hiding this comment

daipom commented Sep 16, 2024

Athishpranav2003 commented Sep 16, 2024

Athishpranav2003 commented Sep 18, 2024

daipom left a comment

Choose a reason for hiding this comment

daipom commented Sep 18, 2024

Athishpranav2003 commented Sep 12, 2024 •

edited

Loading