fluent-plugin-record-modifier 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 50fbb4b964b12f2b00fcb947614ba55e7d5df199
-  data.tar.gz: 1184b66de40e482d7cdc882b903b60656b8f323d
+SHA256:
+  metadata.gz: 5223ce121e04b41b661a2d575a7067f69295ea5d665656cb37a23acbd71d3624
+  data.tar.gz: 00e6c78cf07e354ab0a0d77d42a5bc00f782a1bcb9ca56899440ac75dbd6f4b1
 SHA512:
-  metadata.gz: ca78925ef98fca002b037e3e4e250563eec3d1782e998ae3e8594ca72c363d1c510909a4ad44d7b56c3d6b1f274ef43c0438e515f2c984fcd9994ab9f6faa458
-  data.tar.gz: 03bc94a47d90ad10e3fa96931d9e2d315e3a3fdee6ccc901a7b233f5c927e7adf8d667580a333a9ec749adc1eb41885fb0b2529a0fd868a5e7663984ba070384
+  metadata.gz: 79597158486f6da9646479758d981afc494da860653006d93428abf9d5c211008f60339ca39d238a04b77f2aadd38f459f70b4dccb46c23618614cbc75795894
+  data.tar.gz: 8912416c324b79f0d4e4e6d29f8625105e1c983492e509a56484a81d5cb0c72b6270a915f087b4946d5d522b1817133a99341b9a91c241de01c4f7c501f3310b

data/.github/workflows/linux.yml

@@ -0,0 +1,26 @@
+name: linux
+on:
+  - push
+  - pull_request
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', '3.1']
+        os:
+          - ubuntu-latest
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: unit testing
+      env:
+        CI: true
+      run: |
+        gem install bundler rake
+        bundle install --jobs 4 --retry 3
+        bundle exec rake test

data/ChangeLog

@@ -1,3 +1,16 @@
+Release 2.1.1 - 2022/08/25
+
+  * Improve whitelist_keys performance
+  * Fix documentation for named capture references
+
+Release 2.1.0 - 2019/12/18
+
+  * Add <record> keys to whitelist_keys
+
+Release 2.0.1 - 2019/02/06
+
+  * Update output plugin to support multi process environment
+
 Release 2.0.0 - 2019/01/23
 
   * Update output plugin to follow filter plugin

data/README.md

@@ -164,7 +164,7 @@ If you want to replace specific value for keys you can use `replace` section.
     # your regexp
     expression /^(?<start>.+).{2}(?<end>.+)$/
     # replace string
-    replace \\k<start>ors\\k<end>
+    replace \k<start>ors\k<end>
   </replace>
   # replace key key2
   <replace>
@@ -173,7 +173,7 @@ If you want to replace specific value for keys you can use `replace` section.
     # your regexp
     expression /^(.{1}).{2}(.{1})$/
     # replace string
-    replace \\1ors\\2
+    replace \1ors\2
   </replace>
 </filter>
 ```

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.1

data/fluent-plugin-record-modifier.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "fluentd", [">= 1.0", "< 2"]
   gem.add_development_dependency "rake", ">= 0.9.2"
-  gem.add_development_dependency("test-unit", ["~> 3.1.4"])
+  gem.add_development_dependency("test-unit", ["~> 3.3"])
 end

data/lib/fluent/plugin/filter_record_modifier.rb

@@ -83,6 +83,7 @@ DESC
         @remove_keys = @remove_keys.split(',').map(&:strip)
       elsif @whitelist_keys
         @whitelist_keys = @whitelist_keys.split(',').map(&:strip)
+        @whitelist_keys.concat(@map.keys).uniq!
       end
 
       # Collect DynamicExpander related garbage instructions
@@ -102,8 +103,8 @@ DESC
         }
       elsif @whitelist_keys
         modified = {}
-        record.each do |k, v|
-          modified[k] = v if @whitelist_keys.include?(k)
+        @whitelist_keys.each do |key|
+          modified[key] = record[key] if record.has_key?(key)
         end
         record = modified
       end

data/lib/fluent/plugin/out_record_modifier.rb

@@ -88,6 +88,7 @@ DESC
         @remove_keys = @remove_keys.split(',').map(&:strip)
       elsif @whitelist_keys
         @whitelist_keys = @whitelist_keys.split(',').map(&:strip)
+        @whitelist_keys.concat(@map.keys).uniq!
       end
 
       @has_tag_parts = true if @tag.include?('tag_parts')
@@ -97,6 +98,10 @@ DESC
       GC.start
     end
 
+    def multi_workers_ready?
+      true
+    end
+
     def process(tag, es)
       tag_parts = @has_tag_parts ? tag.split('.') : nil
       if @tag_ex.param_value.nil?
@@ -133,8 +138,8 @@ DESC
         }
       elsif @whitelist_keys
         modified = {}
-        record.each do |k, v|
-          modified[k] = v if @whitelist_keys.include?(k)
+        @whitelist_keys.each do |key|
+          modified[key] = record[key] if record.has_key?(key)
         end
         record = modified
       end

data/test/test_filter_record_modifier.rb

@@ -116,6 +116,9 @@ class RecordModifierFilterTest < Test::Unit::TestCase
 
   def test_remove_non_whitelist_keys
     d = create_driver %[
+      <record>
+        foo bar
+      </record>
       whitelist_keys k1, k2, k3
     ]
 
@@ -123,7 +126,7 @@ class RecordModifierFilterTest < Test::Unit::TestCase
       d.feed("k1" => 'v', "k2" => 'v', "k4" => 'v', "k5" => 'v')
     end
 
-    assert_equal [{"k1" => 'v', "k2" => 'v'}], d.filtered.map(&:last)
+    assert_equal [{"k1" => 'v', "k2" => 'v', 'foo' => 'bar'}], d.filtered.map(&:last)
   end
 
   def test_prepare_values
@@ -142,18 +145,18 @@ class RecordModifierFilterTest < Test::Unit::TestCase
   end
 
   def test_replace_values
-    d = create_driver %[
+    d = create_driver <<'CONFIG'
         <replace>
           key k1
           expression /^(?<start>.+).{2}(?<end>.+)$/
-          replace \\k<start>ors\\k<end>
+          replace \k<start>ors\k<end>
         </replace>
         <replace>
           key k2
           expression /^(.{1}).{2}(.{1})$/
-          replace \\1ors\\2
+          replace \1ors\2
         </replace>
-    ]
+CONFIG
 
     d.run(default_tag: @tag) do
       d.feed("k1" => 'hoge', "k2" => 'hoge', "k3" => 'bar')
@@ -163,13 +166,13 @@ class RecordModifierFilterTest < Test::Unit::TestCase
   end
 
   def test_does_not_replace
-    d = create_driver %[
+    d = create_driver <<'CONFIG'
         <replace>
           key k1
           expression /^(?<start>.+).{2}(?<end>.+)$/
-          replace \\k<start>ors\\k<end>
+          replace \k<start>ors\k<end>
         </replace>
-    ]
+CONFIG
 
     d.run(default_tag: @tag) do
       d.feed("k1" => 'hog')

data/test/test_out_record_modifier.rb

@@ -127,6 +127,9 @@ class RecordModifierOutputTest < Test::Unit::TestCase
   def test_remove_non_whitelist_keys
     d = create_driver %[
       tag foo.filtered
+      <record>
+        foo bar
+      </record>
       whitelist_keys k1, k2, k3
     ]
 
@@ -134,6 +137,6 @@ class RecordModifierOutputTest < Test::Unit::TestCase
       d.feed({"k1" => 'v', "k2" => 'v', "k4" => 'v', "k5" => 'v'})
     end
 
-    assert_equal [{"k1" => 'v', "k2" => 'v'}], d.events.map { |e| e.last }
+    assert_equal [{"k1" => 'v', "k2" => 'v', 'foo' => 'bar'}], d.events.map { |e| e.last }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-modifier
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Masahiro Nakagawa
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -50,20 +50,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '3.3'
 description: Filter plugin for modifying event record
 email: repeatedly@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/linux.yml"
 - ".travis.yml"
 - ChangeLog
 - Gemfile
@@ -79,7 +80,7 @@ homepage: https://github.com/repeatedly/fluent-plugin-record-modifier
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,9 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Filter plugin for modifying event record
 test_files: