fluent-plugin-record_splitter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd96d0a95cd0fea74f83b3696a5f613a6317871f
-  data.tar.gz: 776b7ed3e78ebfc77ac57afe9ae1aac0080841d1
+  metadata.gz: 2230a45d9a9323b764283a1291fb8fb9325a2e8e
+  data.tar.gz: e53abcfdf737b9a2c7b15760943ef17a6a8c8f51
 SHA512:
-  metadata.gz: 40689124abcdb86913e46d1eae027a2527b908f3f67ce63f65ed5b7092b63dfc9e5e46d0a579621a550badbaba000764592ed8e34a8854e71fddb66b9f8f093f
-  data.tar.gz: e015c41e2be6f89c13e80fa671064946a0ee30a14b965dd2915be7bde0101dfce2aac6ede69fe58ef2b5af2f075f191873314953fe3290d79be3985e9e6994d6
+  metadata.gz: 21be9d7a7014d94b09b3fd92b9b677050a936ef54e93bf37b764b9718d3a382147f65580524e60ecd1553a04789140f99fb9015c61f8c5bab1c325ca606a17e6
+  data.tar.gz: a58c65739e47df46ac510eb6e3279cd281942e7c0516a97cf01369625e33968611f21b45122ff34ba44f5135434b9334765993f0f64348a6b37225ff18e7dcad

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/fluent/plugin/out_record_splitter.rb

@@ -1,4 +1,5 @@
 require 'fluent/plugin/output'
+require 'fluent/mixin'
 require 'fluent/mixin/config_placeholders'
 require 'fluent/mixin/rewrite_tag_name'
 
@@ -7,9 +8,7 @@ module Fluent
     class RecordSplitterOutput < Output
       Fluent::Plugin.register_output('record_splitter', self)
 
-      config_param :tag, :string
-      config_param :remove_prefix, :string, default: nil
-      config_param :add_prefix, :string, default: nil
+      config_param :tag, :string, default: nil
       config_param :split_key, :string
       config_param :keep_other_key, :bool, default: false
       config_param :keep_keys, :array, default: []
@@ -17,7 +16,7 @@ module Fluent
 
       include SetTagKeyMixin
       include Fluent::Mixin::ConfigPlaceholders
-      include Fluent::HandleTagNameMixin
+      include HandleTagNameMixin
       include Fluent::Mixin::RewriteTagName
 
       helpers :event_emitter
@@ -37,12 +36,6 @@ module Fluent
         if !@keep_other_key && !@remove_keys.empty?
           raise Fluent::ConfigError, 'Cannot set remove_keys when keep_other_key is false.'
         end
-        if !@tag && !@remove_prefix && !@add_prefix
-          raise Fluent::ConfigError, 'missing both of remove_prefix and add_prefix'
-        end
-        if @tag && (@remove_prefix || @add_prefix)
-          raise Fluent::ConfigError, 'both of tag and remove_prefix/add_prefix must not be specified'
-        end
       end
 
       def process(tag, es)
@@ -52,7 +45,10 @@ module Fluent
           filter_record(emit_tag, time, record)
 
           if @keep_other_key
-            common = record.reject { |key, _value| key == @split_key || @remove_keys.include?(key) }
+            common = record.reject do |key, _value|
+              key == @split_key ||
+                @remove_keys.include?(key)
+            end
           else
             common = record.select { |key, _value| @keep_keys.include?(key) }
           end

data/test/test_out_record_splitter.rb

@@ -103,4 +103,67 @@ class RecordSplitterOutputTest < Test::Unit::TestCase
        { 'common' => 'c', 'general' => 'g', 'k2' => 'v2' }]
     ], d.events
   end
+
+  def test_tag_nochange
+    d = create_driver %(
+      type record_splitter
+      split_key target_field
+    )
+
+    d.run(default_tag: 'test') do
+      d.feed(event_time, 'target_field' => [{ 'k1' => 'v1' }])
+    end
+
+    d.events.each do |tag, _|
+      assert_equal tag, 'test'
+    end
+  end
+
+  def test_tag_change
+    d = create_driver %(
+      type record_splitter
+      tag test.split
+      split_key target_field
+    )
+
+    d.run(default_tag: 'test') do
+      d.feed(event_time, 'target_field' => [{ 'k1' => 'v1' }])
+    end
+
+    d.events.each do |tag, _|
+      assert_equal tag, 'test.split'
+    end
+  end
+
+  def test_add_tag_suffix
+    d = create_driver %(
+      type record_splitter
+      add_tag_suffix .split
+      split_key target_field
+    )
+
+    d.run(default_tag: 'test') do
+      d.feed(event_time, 'target_field' => [{ 'k1' => 'v1' }])
+    end
+
+    d.events.each do |tag, _|
+      assert_equal tag, 'test.split'
+    end
+  end
+
+  def test_add_tag_prefix
+    d = create_driver %(
+      type record_splitter
+      add_tag_prefix split.
+      split_key target_field
+    )
+
+    d.run(default_tag: 'test') do
+      d.feed(event_time, 'target_field' => [{ 'k1' => 'v1' }])
+    end
+
+    d.events.each do |tag, _|
+      assert_equal tag, 'split.test'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record_splitter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yuri Odagiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd