fluent-plugin-record-reformer 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abcb8c05a4359b363c8a1a0f0cf75a16df123c03
-  data.tar.gz: 55d88baf42ee056e4de0f181fae316fcefc451ac
+  metadata.gz: dc59bc6bee21df0c85068cc0e3eef1ccfbb9c9a0
+  data.tar.gz: 88548f35221803b464118e7920893ce59f633139
 SHA512:
-  metadata.gz: de246d926ea5785af76414cc7d8d60acde19cc552d8a81e988ca91a290f0ce41c77482a29d18ef99f9953097b958a6ec695ad7db7d8276e8721063bc6716fd72
-  data.tar.gz: d905845078c70d674b33098b4269fd62ba76d32a3fb3ef9e1bcc9758138b359e7d08c15313f1a4b7d12abbf09bcdb9ce4eec516837f6ff977fd4b372052f339f
+  metadata.gz: 165159b501d607dde4a932fa8e1e39248b21b4d01f50c87581bd4857a7af529484158140a28088a5717e4358cfd9e1064674c083b5080b56d8f188591889a2fe
+  data.tar.gz: a5b0ad5603625ba7350f336e9a7fe8bbc63f91081bcf834f59fcb99dc7cc6de8bb04d38bfc24f581a86c3a18b0e0c22450b70f4d944709ed0fc4fd334797dcdd

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.3 (2017/01/26)
+
+Fixes
+
+* Apply `remove_keys` last, otherwise, `renew_time_key` could be removed before generating new time
+
 ## 0.8.2 (2016/08/21)
 
 Fixes

data/fluent-plugin-record-reformer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-record-reformer"
-  gem.version     = "0.8.2"
+  gem.version     = "0.8.3"
   gem.authors     = ["Naotoshi Seo"]
   gem.email       = "sonots@gmail.com"
   gem.homepage    = "https://github.com/sonots/fluent-plugin-record-reformer"

data/lib/fluent/plugin/out_record_reformer.rb

@@ -116,6 +116,7 @@ module Fluent
           if @renew_time_key && new_record.has_key?(@renew_time_key)
             time = new_record[@renew_time_key].to_i
           end
+          @remove_keys.each {|k| new_record.delete(k) } if @remove_keys
           router.emit(new_tag, time, new_record)
         end
       }
@@ -146,7 +147,6 @@ module Fluent
       new_record = @renew_record ? {} : record.dup
       @keep_keys.each {|k| new_record[k] = record[k]} if @keep_keys and @renew_record
       new_record.merge!(expand_placeholders(@map, placeholders))
-      @remove_keys.each {|k| new_record.delete(k) } if @remove_keys
 
       [new_tag, new_record]
     end
@@ -209,7 +209,6 @@ module Fluent
 
       def prepare_placeholders(placeholder_values)
         placeholders = {}
-        reserved_keys = Set.new(placeholder_values.keys)
 
         placeholder_values.each do |key, value|
           if value.kind_of?(Array) # tag_parts, etc
@@ -220,7 +219,7 @@ module Fluent
             end
           elsif value.kind_of?(Hash) # record, etc
             value.each do |k, v|
-              unless reserved_keys.include?(k) # prevent overwriting the reserved keys such as tag
+              unless placeholder_values.has_key?(k) # prevent overwriting the reserved keys such as tag
                 placeholders.store("${#{k}}", v)
               end
               placeholders.store(%Q[${#{key}["#{k}"]}], v) # record["foo"]

data/test/test_out_record_reformer.rb

@@ -146,14 +146,37 @@ class RecordReformerOutputTest < Test::Unit::TestCase
         config = <<EOC
     tag reformed.${tag}
     enable_ruby true
-    message ${Time.parse(message).to_i}
-    renew_time_key message
+    renew_time_key event_time_key
+    <record>
+      event_time_key ${Time.parse(record["message"]).to_i}
+    </record>
 EOC
         msgs = times.map{|t| t.to_s }
         emits = emit(config, use_v1, msgs)
         emits.each_with_index do |(tag, time, record), i|
           assert_equal("reformed.#{@tag}", tag)
           assert_equal(times[i].to_i, time)
+          assert_true(record.has_key?('event_time_key'))
+        end
+      end
+
+      test 'renew_time_key and remove_keys' do
+        config = <<EOC
+    tag reformed.${tag}
+    renew_time_key event_time_key
+    remove_keys event_time_key
+    auto_typecast true
+    <record>
+      event_time_key ${Time.parse(record["message"]).to_i}
+    </record>
+EOC
+        times = [ Time.local(2,2,3,4,5,2010,nil,nil,nil,nil), Time.local(3,2,3,4,5,2010,nil,nil,nil,nil) ]
+        msgs = times.map{|t| t.to_s }
+        emits = emit(config, use_v1, msgs)
+        emits.each_with_index do |(tag, time, record), i|
+          assert_equal("reformed.#{@tag}", tag)
+          assert_equal(times[i].to_i, time)
+          assert_false(record.has_key?('event_time_key'))
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-21 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd