Remove deprecated strip_underscores config option

Author: errm

lib/fluent/plugin/in_systemd.rb

@@ -17,8 +17,6 @@ class SystemdInput < Input
       config_param :path, :string, default: '/var/log/journal'
       config_param :filters, :array, default: []
       config_param :read_from_head, :bool, default: false
-      config_param :strip_underscores, :bool, default: false, deprecated: 'Use <entry> section or `systemd_entry` ' \
-                                                                          'filter plugin instead'
       config_param :tag, :string
 
       config_section :storage do
@@ -38,10 +36,7 @@ def configure(conf)
         super
         @journal = nil
         @pos_storage = storage_create(usage: 'positions')
-        # legacy strip_underscores backwards compatibility (legacy takes
-        # precedence and is mutually exclusive with the entry block)
-        mut_opts = @strip_underscores ? { fields_strip_underscores: true } : @entry_opts.to_h
-        @mutator = SystemdEntryMutator.new(**mut_opts)
+        @mutator = SystemdEntryMutator.new(**@entry_opts.to_h)
         @mutator.warnings.each { |warning| log.warn(warning) }
       end
 

test/plugin/test_in_systemd.rb

@@ -65,11 +65,6 @@ def setup
       read_from_head true
     )
 
-    # deprecated
-    @strip_config = base_config + %(
-      strip_underscores true
-    )
-
     @storage_path = File.join(Dir.mktmpdir('pos_dir'), 'storage.json')
 
     @storage_config = @base_config + %(
@@ -99,7 +94,7 @@ def setup
   end
 
   attr_reader :journal, :base_config, :head_config,
-              :filter_config, :strip_config, :tail_config, :not_present_config,
+              :filter_config, :tail_config, :not_present_config,
               :badmsg_config, :storage_path, :storage_config
 
   def create_driver(config)
@@ -149,18 +144,6 @@ def test_reading_from_the_journal_tail_mutate_entry(data)
     assert_equal(expected, d.events)
   end
 
-  # deprecated config option for backwards compatibility
-  def test_reading_from_the_journal_tail_with_strip_underscores_legacy
-    d = create_driver(strip_config)
-    expected = [[
-      'test',
-      1_364_519_243,
-      EntryTestData::EXPECTED[:fields_strip_underscores]
-    ]]
-    d.run(expect_emits: 1)
-    assert_equal(expected, d.events)
-  end
-
   def test_storage_file_is_written
     d = create_driver(storage_config)
     d.run(expect_emits: 1)