fix: reconcile upstream with v1 API PR

   - fixing missing code to make v1 API commit work with upstream changes
   - fixing functions for new parameter `force_line_breaks`
   - fixing rubocop errors and exanded lineLength to 100 chars
   - all tests pass on ruby 2.7.4

Signed-off-by: Cryptophobia <[email protected]>

Author: Cryptophobia

.rubocop.yml

@@ -14,6 +14,11 @@ Metrics/AbcSize:
 Metrics/ClassLength:
   Max: 1300
 
+# Offense count: 2
+# Configuration parameters: CountComments.
+Metrics/LineLength:
+  Max: 100
+
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:

README.rdoc

@@ -70,7 +70,7 @@ The plugin supports the following parameters:
                             forwarded. If not set, incomplete exceptions stacks
                             are not flushed.
 
-[force_line_breaks]  Force line breaks between each lines when comibining exception stacks.
+[force_line_breaks]  Force line breaks between each lines when combining exception stacks.
                      This is useful if your exception is formatted
                      as a single line. i.e., logs retrieved from the docker's
                      logging driver don't have any line break.

fluent-plugin-detect-exceptions.gemspec

@@ -20,7 +20,7 @@ eos
   gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
-  gem.add_runtime_dependency 'fluentd', '>= 1.0', "< 2"
+  gem.add_runtime_dependency 'fluentd', '>= 1.0', '< 2'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop', '= 0.42.0'

lib/fluent/plugin/out_detect_exceptions.rb

@@ -26,6 +26,8 @@ class DetectExceptionsOutput < Fluent::Plugin::Output
 
     helpers :compat_parameters, :thread, :event_emitter
 
+    desc 'The prefix to be removed from the input tag when outputting a record.'
+    config_param :remove_tag_prefix, :string
     desc 'The field which contains the raw message text in the input JSON data.'
     config_param :message, :string, default: ''
     desc 'The interval of flushing the buffer for multiline format.'

test/plugin/test_out_detect_exceptions.rb

@@ -82,7 +82,7 @@ def feed_lines_without_line_breaks(driver, t, *messages, stream: nil)
     messages.each do |m|
       m.each_line do |line|
         line.delete!("\n")
-        driver.emit(log_entry(line, count, stream), t + count)
+        driver.feed(t + count, log_entry(line, count, stream))
         count += 1
       end
     end
@@ -125,10 +125,10 @@ def test_exception_detection
     d = create_driver
     t = Time.now.to_i
     messages = [ARBITRARY_TEXT, JAVA_EXC, ARBITRARY_TEXT]
-    d.run(default_tag: DEFAULT_TAG) do
+    d.run(default_tag: DEFAULT_TAG_STRIPPED) do
       feed_lines(d, t, *messages)
     end
-    assert_equal(make_logs("test.tag", t, *messages), d.events)
+    assert_equal(make_logs('test.tag', t, *messages), d.events)
   end
 
   def test_ignore_nested_exceptions
@@ -183,7 +183,7 @@ def test_ignore_nested_exceptions
 
       d.instance.router = router_mock
 
-      d.run(default_tag: DEFAULT_TAG) do
+      d.run(default_tag: DEFAULT_TAG_STRIPPED) do
         feed_lines(d, t, json_line_with_exception + json_line_without_exception)
       end
     end
@@ -195,11 +195,11 @@ def test_single_language_config
 languages java)
     d = create_driver(cfg)
     t = Time.now.to_i
-    d.run(default_tag: DEFAULT_TAG) do
+    d.run(default_tag: DEFAULT_TAG_STRIPPED) do
       feed_lines(d, t, ARBITRARY_TEXT, JAVA_EXC, PYTHON_EXC)
     end
     expected = ARBITRARY_TEXT.lines + [JAVA_EXC] + PYTHON_EXC.lines
-    assert_equal(make_logs(DEFAULT_TAG, t, *expected), d.events)
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t, *expected), d.events)
   end
 
   def test_multi_language_config
@@ -208,11 +208,11 @@ def test_multi_language_config
 languages python, java)
     d = create_driver(cfg)
     t = Time.now.to_i
-    d.run(default_tag: DEFAULT_TAG) do
+    d.run(default_tag: DEFAULT_TAG_STRIPPED) do
       feed_lines(d, t, ARBITRARY_TEXT, JAVA_EXC, PYTHON_EXC)
     end
     expected = ARBITRARY_TEXT.lines + [JAVA_EXC] + [PYTHON_EXC]
-    assert_equal(make_logs(DEFAULT_TAG, t, *expected), d.events)
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t, *expected), d.events)
   end
 
   def test_split_exception_after_timeout
@@ -229,8 +229,8 @@ def test_split_exception_after_timeout
       t2 = Time.now.to_i
       feed_lines(d, t2, "  at x\n  at y\n")
     end
-    assert_equal(make_logs(DEFAULT_TAG, t1, JAVA_EXC) +
-                 make_logs(DEFAULT_TAG, t2, "  at x\n", "  at y\n"),
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t1, JAVA_EXC) +
+                 make_logs(DEFAULT_TAG_STRIPPED, t2, "  at x\n", "  at y\n"),
                  d.events)
   end
 
@@ -246,7 +246,7 @@ def test_do_not_split_exception_after_pause
       feed_lines(d, t2, "  at x\n  at y\n")
       d.instance.before_shutdown
     end
-    assert_equal(make_logs("test.tag", t1, JAVA_EXC + "  at x\n  at y\n"), d.events)
+    assert_equal(make_logs('test.tag', t1, JAVA_EXC + "  at x\n  at y\n"), d.events)
   end
 
   def test_remove_tag_prefix_is_required
@@ -277,11 +277,11 @@ def test_force_line_breaks_false
 force_line_breaks true)
     d = create_driver(cfg)
     t = Time.now.to_i
-    d.run do
+    d.run(default_tag: DEFAULT_TAG) do
       feed_lines(d, t, JAVA_EXC)
     end
     expected = JAVA_EXC
-    assert_equal(make_logs(t, *expected), d.events)
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t, *expected), d.events)
   end
 
   def test_force_line_breaks_true
@@ -290,7 +290,7 @@ def test_force_line_breaks_true
 force_line_breaks true)
     d = create_driver(cfg)
     t = Time.now.to_i
-    d.run do
+    d.run(default_tag: DEFAULT_TAG) do
       feed_lines_without_line_breaks(d, t, JAVA_EXC)
     end
     # Expected: the first two lines of the exception are buffered and combined.
@@ -300,7 +300,7 @@ def test_force_line_breaks_true
     # are buffered and combined. So are the first two lines of the second
     # exception. Then the rest is logged line-by-line.
     expected = JAVA_EXC.chomp
-    assert_equal(make_logs(t, *expected), d.events)
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t, *expected), d.events)
   end
 
   def test_flush_after_max_lines
@@ -321,7 +321,7 @@ def test_flush_after_max_lines
     expected = [PYTHON_EXC.lines[0..1].join] + PYTHON_EXC.lines[2..-1] + \
                [JAVA_EXC.lines[0..1].join] + [JAVA_EXC.lines[2..3].join] + \
                JAVA_EXC.lines[4..-1]
-    assert_equal(make_logs(DEFAULT_TAG, t, *expected), d.events)
+    assert_equal(make_logs(DEFAULT_TAG_STRIPPED, t, *expected), d.events)
   end
 
   def test_separate_streams
@@ -342,10 +342,10 @@ def test_separate_streams
     # because they belong to different streams.
     # Note that the Java exception is only detected when 'something else'
     # is processed.
-    expected = make_logs(DEFAULT_TAG, t, JAVA_EXC, stream: 'java') +
-               make_logs(DEFAULT_TAG, t, PYTHON_EXC, stream: 'python') +
-               make_logs(DEFAULT_TAG, t, JAVA_EXC, stream: 'java') +
-               make_logs(DEFAULT_TAG, t, 'something else', stream: 'java')
+    expected = make_logs(DEFAULT_TAG_STRIPPED, t, JAVA_EXC, stream: 'java') +
+               make_logs(DEFAULT_TAG_STRIPPED, t, PYTHON_EXC, stream: 'python') +
+               make_logs(DEFAULT_TAG_STRIPPED, t, JAVA_EXC, stream: 'java') +
+               make_logs(DEFAULT_TAG_STRIPPED, t, 'something else', stream: 'java')
     assert_equal(expected, d.events)
   end
 end