fluent-plugin-record-reformer 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc59bc6bee21df0c85068cc0e3eef1ccfbb9c9a0
-  data.tar.gz: 88548f35221803b464118e7920893ce59f633139
+  metadata.gz: 224873397bd762ffdf8b4256c727f0d274c0f39b
+  data.tar.gz: 3c2f1c849c49d690c1e583ac03ecd3817ba670ea
 SHA512:
-  metadata.gz: 165159b501d607dde4a932fa8e1e39248b21b4d01f50c87581bd4857a7af529484158140a28088a5717e4358cfd9e1064674c083b5080b56d8f188591889a2fe
-  data.tar.gz: a5b0ad5603625ba7350f336e9a7fe8bbc63f91081bcf834f59fcb99dc7cc6de8bb04d38bfc24f581a86c3a18b0e0c22450b70f4d944709ed0fc4fd334797dcdd
+  metadata.gz: b8dbc917cf34ea266ec33e4a39c59e87536856bf43af2ea1889714b71eb3d1145dc03f45789d7af99b6c89f9d36b581fd171ca94188c1afe25d19bcf3153464a
+  data.tar.gz: 9c47cd0a33f18d0b3f62ecc43077df7c1a2710aca5e110d39225a4c2a66e89823826ba3685f9f444f921098897fb67c1b71941575d3580d578e0817f9c4ee9ae

data/.travis.yml

@@ -1,14 +1,14 @@
 rvm:
-  - 2.0.*
   - 2.1.*
   - 2.2.*
   - 2.3.0
+  - 2.4.0
 gemfile:
   - Gemfile
   - Gemfile.fluentd.0.12
   - Gemfile.fluentd.0.10
 matrix:
   exclude:
-    - rvm: 2.0.*
-      gemfile: Gemfile
+    - rvm: 2.4.0
+      gemfile: Gemfile.fluentd.0.10
 before_install: gem update bundler

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.0 (2017/02/21)
+
+Enhancements:
+
+* Use v0.14 API for fluentd v0.14
+
 ## 0.8.3 (2017/01/26)
 
 Fixes

data/README.md

@@ -4,6 +4,12 @@
 
 Fluentd plugin to add or replace fields of a event record
 
+## Requirements
+
+See [.travis.yml](.travis.yml)
+
+Note that `fluent-plugin-record-reformer` supports both v0.14 API and v0.12 API in one gem.
+
 ## Installation
 
 Use RubyGems:
@@ -25,7 +31,7 @@ Example:
         hostname ${hostname}
         input_tag ${tag}
         last_tag ${tag_parts[-1]}
-        message ${message}, yay!
+        message ${record['message']}, yay!
       </record>
     </match>
 
@@ -65,7 +71,7 @@ Example:
       hostname ${hostname}
       input_tag ${tag}
       last_tag ${tag_parts[-1]}
-      message ${message}, yay!
+      message ${record['message']}, yay!
     </match>
 
 This results in same, but please note that following option parameters are reserved, so can not be used as a record key.

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.3"
+  gem.version     = "0.9.0"
   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

@@ -1,356 +1,7 @@
-require 'ostruct'
-
-module Fluent
-  class RecordReformerOutput < Output
-    Fluent::Plugin.register_output('record_reformer', self)
-
-    def initialize
-      require 'socket'
-      super
-    end
-
-    config_param :output_tag, :string, :default => nil, # obsolete
-      :desc => 'The output tag name. This option is deprecated. Use `tag` option instead.'
-    config_param :tag, :string, :default => nil,
-      :desc => 'The output tag name.'
-    config_param :remove_keys, :string, :default => nil,
-      :desc => 'Specify record keys to be removed by a string separated by , (comma).'
-    config_param :keep_keys, :string, :default => nil,
-      :desc => 'Specify record keys to be kept by a string separated by , (comma).'
-    config_param :renew_record, :bool, :default => false,
-      :desc => 'Creates an output record newly without extending (merging) the input record fields.'
-    config_param :renew_time_key, :string, :default => nil,
-      :desc => 'Overwrites the time of events with a value of the record field.'
-    config_param :enable_ruby, :bool, :default => true, # true for lower version compatibility
-      :desc => 'Enable to use ruby codes in placeholders.'
-    config_param :auto_typecast, :bool, :default => false, # false for lower version compatibility
-      :desc => 'Automatically cast the field types.'
-
-    BUILTIN_CONFIGURATIONS = %W(@id @type @label type tag output_tag remove_keys renew_record keep_keys enable_ruby renew_time_key auto_typecast)
-
-    # To support log_level option implemented by Fluentd v0.10.43
-    unless method_defined?(:log)
-      define_method("log") { $log }
-    end
-
-    # Define `router` method of v0.12 to support v0.10 or earlier
-    unless method_defined?(:router)
-      define_method("router") { Fluent::Engine }
-    end
-
-    def configure(conf)
-      super
-
-      map = {}
-      conf.each_pair { |k, v|
-        next if BUILTIN_CONFIGURATIONS.include?(k)
-        conf.has_key?(k) # to suppress unread configuration warning
-        map[k] = parse_value(v)
-      }
-      # <record></record> directive
-      conf.elements.select { |element| element.name == 'record' }.each { |element|
-        element.each_pair { |k, v|
-          element.has_key?(k) # to suppress unread configuration warning
-          map[k] = parse_value(v)
-        }
-      }
-
-      if @remove_keys
-        @remove_keys = @remove_keys.split(',')
-      end
-
-      if @keep_keys
-        raise Fluent::ConfigError, "out_record_reformer: `renew_record` must be true to use `keep_keys`" unless @renew_record
-        @keep_keys = @keep_keys.split(',')
-      end
-
-      if @output_tag and @tag.nil? # for lower version compatibility
-        log.warn "out_record_reformer: `output_tag` is deprecated. Use `tag` option instead."
-        @tag = @output_tag
-      end
-      if @tag.nil?
-        raise Fluent::ConfigError, "out_record_reformer: `tag` must be specified"
-      end
-
-      placeholder_expander_params = {
-        :log           => log,
-        :auto_typecast => @auto_typecast,
-      }
-      @placeholder_expander =
-        if @enable_ruby
-          # require utilities which would be used in ruby placeholders
-          require 'pathname'
-          require 'uri'
-          require 'cgi'
-          RubyPlaceholderExpander.new(placeholder_expander_params)
-        else
-          PlaceholderExpander.new(placeholder_expander_params)
-        end
-      @map = @placeholder_expander.preprocess_map(map)
-      @tag = @placeholder_expander.preprocess_map(@tag)
-
-      @hostname = Socket.gethostname
-    end
-
-    def emit(tag, es, chain)
-      tag_parts = tag.split('.')
-      tag_prefix = tag_prefix(tag_parts)
-      tag_suffix = tag_suffix(tag_parts)
-      placeholder_values = {
-        'tag'        => tag,
-        'tags'       => tag_parts, # for old version compatibility
-        'tag_parts'  => tag_parts,
-        'tag_prefix' => tag_prefix,
-        'tag_suffix' => tag_suffix,
-        'hostname'   => @hostname,
-      }
-      last_record = nil
-      es.each {|time, record|
-        last_record = record # for debug log
-        placeholder_values.merge!({
-          'time'     => @placeholder_expander.time_value(time),
-          'record'   => record,
-        })
-        new_tag, new_record = reform(@tag, record, placeholder_values)
-        if new_tag
-          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
-      }
-      chain.next
-    rescue => e
-      log.warn "record_reformer: #{e.class} #{e.message} #{e.backtrace.first}"
-      log.debug "record_reformer: tag:#{@tag} map:#{@map} record:#{last_record} placeholder_values:#{placeholder_values}"
-    end
-
-    private
-
-    def parse_value(value_str)
-      if value_str.start_with?('{', '[')
-        JSON.parse(value_str)
-      else
-        value_str
-      end
-    rescue => e
-      log.warn "failed to parse #{value_str} as json. Assuming #{value_str} is a string", :error_class => e.class, :error => e.message
-      value_str # emit as string
-    end
-
-    def reform(tag, record, placeholder_values)
-      placeholders = @placeholder_expander.prepare_placeholders(placeholder_values)
-
-      new_tag = expand_placeholders(tag, placeholders)
-
-      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))
-
-      [new_tag, new_record]
-    end
-
-    def expand_placeholders(value, placeholders)
-      if value.is_a?(String)
-        new_value = @placeholder_expander.expand(value, placeholders)
-      elsif value.is_a?(Hash)
-        new_value = {}
-        value.each_pair do |k, v|
-          new_key = @placeholder_expander.expand(k, placeholders, true)
-          new_value[new_key] = expand_placeholders(v, placeholders)
-        end
-      elsif value.is_a?(Array)
-        new_value = []
-        value.each_with_index do |v, i|
-          new_value[i] = expand_placeholders(v, placeholders)
-        end
-      else
-        new_value = value
-      end
-      new_value
-    end
-
-    def tag_prefix(tag_parts)
-      return [] if tag_parts.empty?
-      tag_prefix = [tag_parts.first]
-      1.upto(tag_parts.size-1).each do |i|
-        tag_prefix[i] = "#{tag_prefix[i-1]}.#{tag_parts[i]}"
-      end
-      tag_prefix
-    end
-
-    def tag_suffix(tag_parts)
-      return [] if tag_parts.empty?
-      rev_tag_parts = tag_parts.reverse
-      rev_tag_suffix = [rev_tag_parts.first]
-      1.upto(tag_parts.size-1).each do |i|
-        rev_tag_suffix[i] = "#{rev_tag_parts[i]}.#{rev_tag_suffix[i-1]}"
-      end
-      rev_tag_suffix.reverse!
-    end
-
-    # THIS CLASS MUST BE THREAD-SAFE
-    class PlaceholderExpander
-      attr_reader :placeholders, :log
-
-      def initialize(params)
-        @log = params[:log]
-        @auto_typecast = params[:auto_typecast]
-      end
-
-      def time_value(time)
-        Time.at(time).to_s
-      end
-
-      def preprocess_map(value, force_stringify = false)
-        value
-      end
-
-      def prepare_placeholders(placeholder_values)
-        placeholders = {}
-
-        placeholder_values.each do |key, value|
-          if value.kind_of?(Array) # tag_parts, etc
-            size = value.size
-            value.each_with_index do |v, idx|
-              placeholders.store("${#{key}[#{idx}]}", v)
-              placeholders.store("${#{key}[#{idx-size}]}", v) # support [-1]
-            end
-          elsif value.kind_of?(Hash) # record, etc
-            value.each do |k, v|
-              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"]
-            end
-          else # string, interger, float, and others?
-            placeholders.store("${#{key}}", value)
-          end
-        end
-
-        placeholders
-      end
-
-      # Expand string with placeholders
-      #
-      # @param [String] str
-      # @param [Boolean] force_stringify the value must be string, used for hash key
-      def expand(str, placeholders, force_stringify = false)
-        if @auto_typecast and !force_stringify
-          single_placeholder_matched = str.match(/\A(\${[^}]+}|__[A-Z_]+__)\z/)
-          if single_placeholder_matched
-            log_if_unknown_placeholder($1, placeholders)
-            return placeholders[single_placeholder_matched[1]]
-          end
-        end
-        str.gsub(/(\${[^}]+}|__[A-Z_]+__)/) {
-          log_if_unknown_placeholder($1, placeholders)
-          placeholders[$1]
-        }
-      end
-
-      private
-
-      def log_if_unknown_placeholder(placeholder, placeholders)
-        unless placeholders.include?(placeholder)
-          log.warn "record_reformer: unknown placeholder `#{placeholder}` found"
-        end
-      end
-    end
-
-    # THIS CLASS MUST BE THREAD-SAFE
-    class RubyPlaceholderExpander
-      attr_reader :log
-
-      def initialize(params)
-        @log = params[:log]
-        @auto_typecast = params[:auto_typecast]
-        @cleanroom_expander = CleanroomExpander.new
-      end
-
-      def time_value(time)
-        Time.at(time)
-      end
-
-      # Preprocess record map to convert into ruby string expansion
-      #
-      # @param [Hash|String|Array] value record map config
-      # @param [Boolean] force_stringify the value must be string, used for hash key
-      def preprocess_map(value, force_stringify = false)
-        new_value = nil
-        if value.is_a?(String)
-          if @auto_typecast and !force_stringify
-            num_placeholders = value.scan('${').size
-            if num_placeholders == 1 and value.start_with?('${') && value.end_with?('}')
-              new_value = value[2..-2] # ${..} => ..
-            end
-          end
-          unless new_value
-            new_value = "%Q[#{value.gsub('${', '#{')}]" # xx${..}xx => %Q[xx#{..}xx]
-          end
-        elsif value.is_a?(Hash)
-          new_value = {}
-          value.each_pair do |k, v|
-            new_value[preprocess_map(k, true)] = preprocess_map(v)
-          end
-        elsif value.is_a?(Array)
-          new_value = []
-          value.each_with_index do |v, i|
-            new_value[i] = preprocess_map(v)
-          end
-        else
-          new_value = value
-        end
-        new_value
-      end
-
-      def prepare_placeholders(placeholder_values)
-        placeholder_values
-      end
-
-      # Expand string with placeholders
-      #
-      # @param [String] str
-      def expand(str, placeholders, force_stringify = false)
-        @cleanroom_expander.expand(
-          str,
-          placeholders['tag'],
-          placeholders['time'],
-          placeholders['record'],
-          placeholders['tag_parts'],
-          placeholders['tag_prefix'],
-          placeholders['tag_suffix'],
-          placeholders['hostname'],
-        )
-      rescue => e
-        log.warn "record_reformer: failed to expand `#{str}`", :error_class => e.class, :error => e.message
-        log.warn_backtrace
-        nil
-      end
-
-      class CleanroomExpander
-        def expand(__str_to_eval__, tag, time, record, tag_parts, tag_prefix, tag_suffix, hostname)
-          tags = tag_parts # for old version compatibility
-          Thread.current[:record_reformer_record] = record # for old version compatibility
-          instance_eval(__str_to_eval__)
-        end
-
-        # for old version compatibility
-        def method_missing(name)
-          key = name.to_s
-          record = Thread.current[:record_reformer_record]
-          if record.has_key?(key)
-            record[key]
-          else
-            raise NameError, "undefined local variable or method `#{key}'"
-          end
-        end
-
-        (Object.instance_methods).each do |m|
-          undef_method m unless m.to_s =~ /^__|respond_to_missing\?|object_id|public_methods|instance_eval|method_missing|define_singleton_method|respond_to\?|new_ostruct_member/
-        end
-      end
-    end
-  end
+require 'fluent/version'
+major, minor, patch = Fluent::VERSION.split('.').map(&:to_i)
+if major > 0 || (major == 0 && minor >= 14)
+  require_relative 'out_record_reformer/v14'
+else
+  require_relative 'out_record_reformer/v12'
 end

data/lib/fluent/plugin/out_record_reformer/core.rb

@@ -0,0 +1,345 @@
+require 'ostruct'
+require 'socket'
+
+module Fluent
+  module RecordReformerOutputCore
+    def initialize
+      super
+    end
+    
+    def self.included(klass)
+      klass.config_param :output_tag, :string, :default => nil, # obsolete
+        :desc => 'The output tag name. This option is deprecated. Use `tag` option instead.'
+      klass.config_param :tag, :string, :default => nil,
+        :desc => 'The output tag name.'
+      klass.config_param :remove_keys, :string, :default => nil,
+        :desc => 'Specify record keys to be removed by a string separated by , (comma).'
+      klass.config_param :keep_keys, :string, :default => nil,
+        :desc => 'Specify record keys to be kept by a string separated by , (comma).'
+      klass.config_param :renew_record, :bool, :default => false,
+        :desc => 'Creates an output record newly without extending (merging) the input record fields.'
+      klass.config_param :renew_time_key, :string, :default => nil,
+        :desc => 'Overwrites the time of events with a value of the record field.'
+      klass.config_param :enable_ruby, :bool, :default => true, # true for lower version compatibility
+        :desc => 'Enable to use ruby codes in placeholders.'
+      klass.config_param :auto_typecast, :bool, :default => false, # false for lower version compatibility
+        :desc => 'Automatically cast the field types.'
+    end
+
+    BUILTIN_CONFIGURATIONS = %W(@id @type @label type tag output_tag remove_keys renew_record keep_keys enable_ruby renew_time_key auto_typecast)
+
+    def configure(conf)
+      super
+
+      map = {}
+      conf.each_pair { |k, v|
+        next if BUILTIN_CONFIGURATIONS.include?(k)
+        conf.has_key?(k) # to suppress unread configuration warning
+        map[k] = parse_value(v)
+      }
+      # <record></record> directive
+      conf.elements.select { |element| element.name == 'record' }.each { |element|
+        element.each_pair { |k, v|
+          element.has_key?(k) # to suppress unread configuration warning
+          map[k] = parse_value(v)
+        }
+      }
+
+      if @remove_keys
+        @remove_keys = @remove_keys.split(',')
+      end
+
+      if @keep_keys
+        raise Fluent::ConfigError, "out_record_reformer: `renew_record` must be true to use `keep_keys`" unless @renew_record
+        @keep_keys = @keep_keys.split(',')
+      end
+
+      if @output_tag and @tag.nil? # for lower version compatibility
+        log.warn "out_record_reformer: `output_tag` is deprecated. Use `tag` option instead."
+        @tag = @output_tag
+      end
+      if @tag.nil?
+        raise Fluent::ConfigError, "out_record_reformer: `tag` must be specified"
+      end
+
+      placeholder_expander_params = {
+        :log           => log,
+        :auto_typecast => @auto_typecast,
+      }
+      @placeholder_expander =
+        if @enable_ruby
+          # require utilities which would be used in ruby placeholders
+          require 'pathname'
+          require 'uri'
+          require 'cgi'
+          RubyPlaceholderExpander.new(placeholder_expander_params)
+        else
+          PlaceholderExpander.new(placeholder_expander_params)
+        end
+      @map = @placeholder_expander.preprocess_map(map)
+      @tag = @placeholder_expander.preprocess_map(@tag)
+
+      @hostname = Socket.gethostname
+    end
+
+    def process(tag, es)
+      tag_parts = tag.split('.')
+      tag_prefix = tag_prefix(tag_parts)
+      tag_suffix = tag_suffix(tag_parts)
+      placeholder_values = {
+        'tag'        => tag,
+        'tags'       => tag_parts, # for old version compatibility
+        'tag_parts'  => tag_parts,
+        'tag_prefix' => tag_prefix,
+        'tag_suffix' => tag_suffix,
+        'hostname'   => @hostname,
+      }
+      last_record = nil
+      es.each {|time, record|
+        last_record = record # for debug log
+        placeholder_values.merge!({
+          'time'     => @placeholder_expander.time_value(time),
+          'record'   => record,
+        })
+        new_tag, new_record = reform(@tag, record, placeholder_values)
+        if new_tag
+          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
+      }
+    rescue => e
+      log.warn "record_reformer: #{e.class} #{e.message} #{e.backtrace.first}"
+      log.debug "record_reformer: tag:#{@tag} map:#{@map} record:#{last_record} placeholder_values:#{placeholder_values}"
+    end
+
+    private
+
+    def parse_value(value_str)
+      if value_str.start_with?('{', '[')
+        JSON.parse(value_str)
+      else
+        value_str
+      end
+    rescue => e
+      log.warn "failed to parse #{value_str} as json. Assuming #{value_str} is a string", :error_class => e.class, :error => e.message
+      value_str # emit as string
+    end
+
+    def reform(tag, record, placeholder_values)
+      placeholders = @placeholder_expander.prepare_placeholders(placeholder_values)
+
+      new_tag = expand_placeholders(tag, placeholders)
+
+      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))
+
+      [new_tag, new_record]
+    end
+
+    def expand_placeholders(value, placeholders)
+      if value.is_a?(String)
+        new_value = @placeholder_expander.expand(value, placeholders)
+      elsif value.is_a?(Hash)
+        new_value = {}
+        value.each_pair do |k, v|
+          new_key = @placeholder_expander.expand(k, placeholders, true)
+          new_value[new_key] = expand_placeholders(v, placeholders)
+        end
+      elsif value.is_a?(Array)
+        new_value = []
+        value.each_with_index do |v, i|
+          new_value[i] = expand_placeholders(v, placeholders)
+        end
+      else
+        new_value = value
+      end
+      new_value
+    end
+
+    def tag_prefix(tag_parts)
+      return [] if tag_parts.empty?
+      tag_prefix = [tag_parts.first]
+      1.upto(tag_parts.size-1).each do |i|
+        tag_prefix[i] = "#{tag_prefix[i-1]}.#{tag_parts[i]}"
+      end
+      tag_prefix
+    end
+
+    def tag_suffix(tag_parts)
+      return [] if tag_parts.empty?
+      rev_tag_parts = tag_parts.reverse
+      rev_tag_suffix = [rev_tag_parts.first]
+      1.upto(tag_parts.size-1).each do |i|
+        rev_tag_suffix[i] = "#{rev_tag_parts[i]}.#{rev_tag_suffix[i-1]}"
+      end
+      rev_tag_suffix.reverse!
+    end
+
+    # THIS CLASS MUST BE THREAD-SAFE
+    class PlaceholderExpander
+      attr_reader :placeholders, :log
+
+      def initialize(params)
+        @log = params[:log]
+        @auto_typecast = params[:auto_typecast]
+      end
+
+      def time_value(time)
+        Time.at(time).to_s
+      end
+
+      def preprocess_map(value, force_stringify = false)
+        value
+      end
+
+      def prepare_placeholders(placeholder_values)
+        placeholders = {}
+
+        placeholder_values.each do |key, value|
+          if value.kind_of?(Array) # tag_parts, etc
+            size = value.size
+            value.each_with_index do |v, idx|
+              placeholders.store("${#{key}[#{idx}]}", v)
+              placeholders.store("${#{key}[#{idx-size}]}", v) # support [-1]
+            end
+          elsif value.kind_of?(Hash) # record, etc
+            value.each do |k, v|
+              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"]
+            end
+          else # string, interger, float, and others?
+            placeholders.store("${#{key}}", value)
+          end
+        end
+
+        placeholders
+      end
+
+      # Expand string with placeholders
+      #
+      # @param [String] str
+      # @param [Boolean] force_stringify the value must be string, used for hash key
+      def expand(str, placeholders, force_stringify = false)
+        if @auto_typecast and !force_stringify
+          single_placeholder_matched = str.match(/\A(\${[^}]+}|__[A-Z_]+__)\z/)
+          if single_placeholder_matched
+            log_if_unknown_placeholder($1, placeholders)
+            return placeholders[single_placeholder_matched[1]]
+          end
+        end
+        str.gsub(/(\${[^}]+}|__[A-Z_]+__)/) {
+          log_if_unknown_placeholder($1, placeholders)
+          placeholders[$1]
+        }
+      end
+
+      private
+
+      def log_if_unknown_placeholder(placeholder, placeholders)
+        unless placeholders.include?(placeholder)
+          log.warn "record_reformer: unknown placeholder `#{placeholder}` found"
+        end
+      end
+    end
+
+    # THIS CLASS MUST BE THREAD-SAFE
+    class RubyPlaceholderExpander
+      attr_reader :log
+
+      def initialize(params)
+        @log = params[:log]
+        @auto_typecast = params[:auto_typecast]
+        @cleanroom_expander = CleanroomExpander.new
+      end
+
+      def time_value(time)
+        Time.at(time)
+      end
+
+      # Preprocess record map to convert into ruby string expansion
+      #
+      # @param [Hash|String|Array] value record map config
+      # @param [Boolean] force_stringify the value must be string, used for hash key
+      def preprocess_map(value, force_stringify = false)
+        new_value = nil
+        if value.is_a?(String)
+          if @auto_typecast and !force_stringify
+            num_placeholders = value.scan('${').size
+            if num_placeholders == 1 and value.start_with?('${') && value.end_with?('}')
+              new_value = value[2..-2] # ${..} => ..
+            end
+          end
+          unless new_value
+            new_value = "%Q[#{value.gsub('${', '#{')}]" # xx${..}xx => %Q[xx#{..}xx]
+          end
+        elsif value.is_a?(Hash)
+          new_value = {}
+          value.each_pair do |k, v|
+            new_value[preprocess_map(k, true)] = preprocess_map(v)
+          end
+        elsif value.is_a?(Array)
+          new_value = []
+          value.each_with_index do |v, i|
+            new_value[i] = preprocess_map(v)
+          end
+        else
+          new_value = value
+        end
+        new_value
+      end
+
+      def prepare_placeholders(placeholder_values)
+        placeholder_values
+      end
+
+      # Expand string with placeholders
+      #
+      # @param [String] str
+      def expand(str, placeholders, force_stringify = false)
+        @cleanroom_expander.expand(
+          str,
+          placeholders['tag'],
+          placeholders['time'],
+          placeholders['record'],
+          placeholders['tag_parts'],
+          placeholders['tag_prefix'],
+          placeholders['tag_suffix'],
+          placeholders['hostname'],
+        )
+      rescue => e
+        log.warn "record_reformer: failed to expand `#{str}`", :error_class => e.class, :error => e.message
+        log.warn_backtrace
+        nil
+      end
+
+      class CleanroomExpander
+        def expand(__str_to_eval__, tag, time, record, tag_parts, tag_prefix, tag_suffix, hostname)
+          tags = tag_parts # for old version compatibility
+          Thread.current[:record_reformer_record] = record # for old version compatibility
+          instance_eval(__str_to_eval__)
+        end
+
+        # for old version compatibility
+        def method_missing(name)
+          key = name.to_s
+          record = Thread.current[:record_reformer_record]
+          if record.has_key?(key)
+            record[key]
+          else
+            raise NameError, "undefined local variable or method `#{key}'"
+          end
+        end
+
+        (Object.instance_methods).each do |m|
+          undef_method m unless m.to_s =~ /^__|respond_to_missing\?|object_id|public_methods|instance_eval|method_missing|define_singleton_method|respond_to\?|new_ostruct_member/
+        end
+      end
+    end
+  end
+end

data/lib/fluent/plugin/out_record_reformer/v12.rb

@@ -0,0 +1,32 @@
+require_relative 'core'
+
+module Fluent
+  class RecordReformerOutput < Output
+    Fluent::Plugin.register_output('record_reformer', self)
+
+    include ::Fluent::RecordReformerOutputCore
+
+    def initialize
+      super
+    end
+
+    # To support log_level option implemented by Fluentd v0.10.43
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
+    # Define `router` method of v0.12 to support v0.10 or earlier
+    unless method_defined?(:router)
+      define_method("router") { Fluent::Engine }
+    end
+
+    def configure(conf)
+      super
+    end
+
+    def emit(tag, es, chain)
+      process(tag, es)
+      chain.next
+    end
+  end
+end

data/lib/fluent/plugin/out_record_reformer/v14.rb

@@ -0,0 +1,22 @@
+require_relative 'core'
+
+module Fluent
+  class Plugin::RecordReformerOutput < Plugin::Output
+    Fluent::Plugin.register_output('record_reformer', self)
+
+    helpers :event_emitter
+    include ::Fluent::RecordReformerOutputCore
+
+    def initialize
+      super
+    end
+    
+    def configure(conf)
+      super
+    end
+
+    def process(tag, es)
+      super
+    end
+  end
+end

data/test/helper.rb

@@ -28,3 +28,48 @@ module Fluent
     end
   end
 end
+
+require 'fluent/version'
+major, minor, patch = Fluent::VERSION.split('.').map(&:to_i)
+if major > 0 || (major == 0 && minor >= 14)
+  require 'fluent/test/driver/output'
+  require 'fluent/test/helpers'
+  include Fluent::Test::Helpers
+
+  # I do not want to use Fluent::Test::OutputTestDriver, but
+  # want to have a test driver whose interface is compatible with of v0.12
+  class RecordReformerOutputTestDriver < Fluent::Test::Driver::Output
+    def initialize(klass, tag)
+      super(klass)
+      @tag = tag
+    end
+
+    def configure(conf, use_v1)
+      super(conf, syntax: use_v1 ? :v1 : :v0)
+    end
+
+    def run(&block)
+      super(default_tag: @tag, &block)
+    end
+
+    def emit(record, time)
+      feed(time, record)
+    end
+
+    def emits
+      events
+    end
+  end
+
+  def create_driver(conf, use_v1)
+    RecordReformerOutputTestDriver.new(Fluent::Plugin::RecordReformerOutput, @tag).configure(conf, use_v1)
+  end
+else
+  def event_time(str)
+    Time.parse(str)
+  end
+
+  def create_driver(conf, use_v1)
+    Fluent::Test::OutputTestDriver.new(Fluent::RecordReformerOutput, @tag).configure(conf, use_v1)
+  end
+end

data/test/test_out_record_reformer.rb

@@ -5,22 +5,6 @@ require 'fluent/plugin/out_record_reformer'
 Fluent::Test.setup
 
 class RecordReformerOutputTest < Test::Unit::TestCase
-  setup do
-    @hostname = Socket.gethostname.chomp
-    @tag = 'test.tag'
-    @tag_parts = @tag.split('.')
-    @time = Time.local(1,2,3,4,5,2010,nil,nil,nil,nil)
-    Timecop.freeze(@time)
-  end
-
-  teardown do
-    Timecop.return
-  end
-
-  def create_driver(conf, use_v1)
-    Fluent::Test::OutputTestDriver.new(Fluent::RecordReformerOutput, @tag).configure(conf, use_v1)
-  end
-
   def emit(config, use_v1, msgs = [''])
     d = create_driver(config, use_v1)
     d.run do
@@ -37,6 +21,18 @@ class RecordReformerOutputTest < Test::Unit::TestCase
     d.emits
   end
 
+  setup do
+    @hostname = Socket.gethostname.chomp
+    @tag = 'test.tag'
+    @tag_parts = @tag.split('.')
+    @time = event_time("2010-05-04 03:02:01")
+    Timecop.freeze(@time)
+  end
+
+  teardown do
+    Timecop.return
+  end
+
   CONFIG = %[
     tag reformed.${tag}
 
@@ -77,7 +73,7 @@ class RecordReformerOutputTest < Test::Unit::TestCase
           assert_equal('bar', record['eventType0'])
           assert_equal(@hostname, record['hostname'])
           assert_equal(@tag, record['input_tag'])
-          assert_equal(@time.to_s, record['time'])
+          assert_equal(Time.at(@time).localtime.to_s, record['time'])
           assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
         end
       end
@@ -109,7 +105,7 @@ class RecordReformerOutputTest < Test::Unit::TestCase
           assert_equal('bar', record['eventType0'])
           assert_equal(@hostname, record['hostname'])
           assert_equal(@tag, record['tag'])
-          assert_equal(@time.to_s, record['time'])
+          assert_equal(Time.at(@time).localtime.to_s, record['time'])
           assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
         end
       end
@@ -122,7 +118,7 @@ class RecordReformerOutputTest < Test::Unit::TestCase
           assert_not_include(record, 'eventType0')
           assert_equal(@hostname, record['hostname'])
           assert_equal(@tag, record['input_tag'])
-          assert_equal(@time.to_s, record['time'])
+          assert_equal(Time.at(@time).localtime.to_s, record['time'])
           assert_not_include(record, 'message')
         end
       end
@@ -136,13 +132,13 @@ class RecordReformerOutputTest < Test::Unit::TestCase
           assert_not_include(record, 'eventType0')
           assert_equal(@hostname, record['hostname'])
           assert_equal(@tag, record['input_tag'])
-          assert_equal(@time.to_s, record['time'])
+          assert_equal(Time.at(@time).localtime.to_s, record['time'])
           assert_equal("#{@hostname} #{@tag_parts[-1]} #{msgs[i]}", record['message'])
         end
       end
 
       test 'renew_time_key' do
-        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) ]
+        times = [ Time.at(event_time("2010-05-04 03:02:02")), Time.at(event_time("2010-05-04 03:02:03")) ]
         config = <<EOC
     tag reformed.${tag}
     enable_ruby true
@@ -170,7 +166,7 @@ EOC
       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) ]
+        times = [ Time.at(event_time("2010-05-04 03:02:02")), Time.at(event_time("2010-05-04 03:02:03")) ]
         msgs = times.map{|t| t.to_s }
         emits = emit(config, use_v1, msgs)
         emits.each_with_index do |(tag, time, record), i|
@@ -295,7 +291,7 @@ EOC
           ]
           emits = emit(config, use_v1)
           emits.each do |(tag, time, record)|
-            assert_equal(@time.to_s, record['message'])
+            assert_equal(Time.at(time).localtime.to_s, record['message'])
           end
         end
 
@@ -335,7 +331,7 @@ EOC
             assert_not_equal('tag', record['new_tag'])
             assert_equal(@tag, record['new_tag'])
             assert_not_equal('time', record['new_time'])
-            assert_equal(@time.to_s, record['new_time'])
+            assert_equal(Time.at(@time).localtime.to_s, record['new_time'])
             assert_equal('tag', record['new_record_tag'])
             assert_equal('time', record['new_record_time'])
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-record-reformer
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -127,6 +127,9 @@ files:
 - example.conf
 - fluent-plugin-record-reformer.gemspec
 - lib/fluent/plugin/out_record_reformer.rb
+- lib/fluent/plugin/out_record_reformer/core.rb
+- lib/fluent/plugin/out_record_reformer/v12.rb
+- lib/fluent/plugin/out_record_reformer/v14.rb
 - test/bench_out_record_reformer.rb
 - test/helper.rb
 - test/test_out_record_reformer.rb
@@ -150,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to add or replace fields of a event record