fluentd 0.12.29 → 0.12.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf16c05e7df8f8bbd3608e3ef2f8e98133f6a68
-  data.tar.gz: 2cf753c53ada2ea70c03553fe6b99bfa1df85ede
+  metadata.gz: 63a646de1e8fe70118ebe431f68ab2492486c094
+  data.tar.gz: 2f5d57af5036d8197aa5bcb92061498d273031e2
 SHA512:
-  metadata.gz: cafed6f8e183e72fa23f72306c5bd6ed15df4af10c2385f43d971914c4ecf534bf98a199157d6da663d4811f09976f463bc2193f04cf2ac6dc25969d05e8d2d4
-  data.tar.gz: 1bcc21b7007590869375ba6e7bc37f4fd7cbdb362435b52404f2ce03f69fd19f25610563ff3edd37bfc57abb7cc429556a14c558df41a13f3121c20ec1e19f42
+  metadata.gz: b5a6242bf2ee47e9aa32ad27bb9af3c67643a9d6b41decc801afaee842758a2dfd18b2bd32fabe2e21eadb293d370bd2a06c0b05e3d609f0ba97bed6325c42b4
+  data.tar.gz: 0bfabdc2a87e25ca1106b6df6d1193ebe2bd6dd7c47ac8b32050877d3ab5fe9ba7b9d94222f6cd8b0002c1a2dcf37fbaf3d541f385386b9d60237f582b735fd9

data/ChangeLog

@@ -1,5 +1,25 @@
 # v0.12
 
+## Release 0.12.30 - 2016/12/01
+
+### New features / Enhancement
+
+* in_tail: Optimize to split lines
+  https://github.com/fluent/fluentd/pull/1325
+* in_monitor_agent: Port #1317 changes
+  https://github.com/fluent/fluentd/pull/1317
+* filter_parser: Add emit_invalid_record_to_error parameter
+  https://github.com/fluent/fluentd/pull/1339
+* test: Add v0.14 compatible test helpers
+  https://github.com/fluent/fluentd/pull/1322
+
+### Bug fixes
+
+* Use compat mode instead of stric mode for oj
+  https://github.com/fluent/fluentd/pull/1304
+* Port #1331 changes for oj
+  https://github.com/fluent/fluentd/pull/1331
+
 ## Release 0.12.29 - 2016/09/05
 
 ### New features / Enhancement

data/Rakefile

@@ -15,7 +15,7 @@ Rake::TestTask.new(:base_test) do |t|
   t.libs << "test"
   t.test_files = Dir["test/**/test_*.rb"].sort
   t.verbose = true
-  t.warning = false
+  #t.warning = true
 end
 
 task :parallel_test do

data/lib/fluent/env.rb

@@ -18,6 +18,7 @@ module Fluent
   DEFAULT_CONFIG_PATH = ENV['FLUENT_CONF'] || '/etc/fluent/fluent.conf'
   DEFAULT_PLUGIN_DIR = ENV['FLUENT_PLUGIN'] || '/etc/fluent/plugin'
   DEFAULT_SOCKET_PATH = ENV['FLUENT_SOCKET'] || '/var/run/fluent/fluent.sock'
+  DEFAULT_OJ_OPTIONS = {bigdecimal_load: :float, mode: :compat, use_to_json: true}
   DEFAULT_LISTEN_PORT = 24224
   DEFAULT_FILE_PERMISSION = 0644
   DEFAULT_DIR_PERMISSION = 0755

data/lib/fluent/formatter.rb

@@ -15,6 +15,7 @@
 #
 
 require 'fluent/configurable'
+require 'fluent/env'
 require 'fluent/registry'
 require 'fluent/mixin'
 
@@ -141,7 +142,7 @@ module Fluent
         begin
           raise LoadError unless @json_parser == 'oj'
           require 'oj'
-          Oj.default_options = {mode: :compat}
+          Oj.default_options = Fluent::DEFAULT_OJ_OPTIONS
           @dump_proc = Oj.method(:dump)
         rescue LoadError
           @dump_proc = Yajl.method(:dump)

data/lib/fluent/parser.rb

@@ -22,6 +22,7 @@ require 'yajl'
 require 'fluent/config/error'
 require 'fluent/config/element'
 require 'fluent/configurable'
+require 'fluent/env'
 require 'fluent/engine'
 require 'fluent/registry'
 require 'fluent/time'
@@ -260,7 +261,7 @@ module Fluent
         begin
           raise LoadError unless @json_parser == 'oj'
           require 'oj'
-          Oj.default_options = {bigdecimal_load: :float, mode: :strict}
+          Oj.default_options = Fluent::DEFAULT_OJ_OPTIONS
           @load_proc = Oj.method(:load)
           @error_class = Oj::ParseError
         rescue LoadError

data/lib/fluent/plugin/filter_parser.rb

@@ -12,6 +12,7 @@ class Fluent::ParserFilter < Fluent::Filter
   config_param :suppress_parse_error_log, :bool, default: false
   config_param :time_parse, :bool, default: true
   config_param :ignore_key_not_exist, :bool, default: false
+  config_param :emit_invalid_record_to_error, :bool, default: false
 
   attr_reader :parser
 
@@ -34,7 +35,11 @@ class Fluent::ParserFilter < Fluent::Filter
     es.each do |time,record|
       raw_value = record[@key_name]
       if raw_value.nil?
-        log.warn "#{@key_name} does not exist" unless @ignore_key_not_exist
+        if @emit_invalid_record_to_error
+          router.emit_error_event(tag, time, record, ArgumentError.new("#{@key_name} does not exist"))
+        else
+          log.warn "#{@key_name} does not exist" unless @ignore_key_not_exist
+        end
         new_es.add(time, handle_parsed(tag, record, time, {})) if @reserve_data
         next
       end
@@ -45,7 +50,11 @@ class Fluent::ParserFilter < Fluent::Filter
             r = handle_parsed(tag, record, t, values)
             new_es.add(t, r)
           else
-            log.warn "pattern not match with data '#{raw_value}'" unless @suppress_parse_error_log
+            if @emit_invalid_record_to_error
+              router.emit_error_event(tag, time, record, ::Fluent::ParserError.new("pattern not match with data '#{raw_value}'"))
+            else
+              log.warn "pattern not match with data '#{raw_value}'" unless @suppress_parse_error_log
+            end
             if @reserve_data
               t = time
               r = handle_parsed(tag, record, time, {})
@@ -53,33 +62,24 @@ class Fluent::ParserFilter < Fluent::Filter
             end
           end
         end
-      rescue Fluent::TextParser::ParserError => e
-        log.warn e.message unless @suppress_parse_error_log
-      rescue ArgumentError => e
-        if @replace_invalid_sequence
-          unless e.message.index("invalid byte sequence in") == 0
-            raise
-          end
-          replaced_string = replace_invalid_byte(raw_value)
-          @parser.parse(replaced_string) do |t,values|
-            if values
-              t ||= time
-              r = handle_parsed(tag, record, t, values)
-              new_es.add(t, r)
-            else
-              log.warn "pattern not match with data '#{raw_value}'" unless @suppress_parse_error_log
-              if @reserve_data
-                t = time
-                r = handle_parsed(tag, record, time, {})
-                new_es.add(t, r)
-              end
-            end
-          end
+      rescue Fluent::ParserError => e
+        if @emit_invalid_record_to_error
+          router.emit_error_event(tag, time, record, e)
         else
-          raise
+          log.warn e.message unless @suppress_parse_error_log
         end
+      rescue ArgumentError => e
+        raise unless @replace_invalid_sequence
+        raise unless e.message.index("invalid byte sequence in") == 0
+
+        raw_value = replace_invalid_byte(raw_value)
+        retry
       rescue => e
-        log.warn "parse failed #{e.message}" unless @suppress_parse_error_log
+        if @emit_invalid_record_to_error
+          router.emit_error_event(tag, time, record, Fluent::ParserError.new("parse failed #{e.message}"))
+        else
+          log.warn "parse failed #{e.message}" unless @suppress_parse_error_log
+        end
       end
     end
     new_es

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -33,6 +33,7 @@ module Fluent
     config_param :tag, :string, default: nil
     config_param :emit_interval, :time, default: 60
     config_param :emit_config, :bool, default: false
+    config_param :include_config, :bool, default: true
 
     class MonitorServlet < WEBrick::HTTPServlet::AbstractServlet
       def initialize(server, agent)
@@ -76,12 +77,16 @@ module Fluent
 
         # if ?debug=1 is set, set :with_debug_info for get_monitor_info
         # and :pretty_json for render_json_error
-        opts = {}
+        opts = {with_config: @agent.include_config}
         if s = qs['debug'] and s[0]
           opts[:with_debug_info] = true
           opts[:pretty_json] = true
         end
 
+        if with_config = get_search_parameter(qs, 'with_config'.freeze)
+          opts[:with_config] = Fluent::Config.bool_value(with_config)
+        end
+
         if tag = get_search_parameter(qs, 'tag'.freeze)
           # ?tag= to search an output plugin by match pattern
           if obj = @agent.plugin_info_by_tag(tag, opts)
@@ -389,7 +394,7 @@ module Fluent
       obj['plugin_id'] = pe.plugin_id
       obj['plugin_category'] = plugin_category(pe)
       obj['type'] = pe.config['@type'] || pe.config['type']
-      obj['config'] = pe.config if !opts.has_key?(:with_config) || opts[:with_config]
+      obj['config'] = pe.config if opts[:with_config]
 
       # run MONITOR_INFO in plugins' instance context and store the info to obj
       MONITOR_INFO.each_pair {|key,code|

data/lib/fluent/plugin/in_tail.rb

@@ -579,8 +579,8 @@ module Fluent
                   else
                     @buffer << @io.readpartial(2048, @iobuf)
                   end
-                  while line = @buffer.slice!(/.*?\n/m)
-                    @lines << line
+                  while idx = @buffer.index("\n".freeze)
+                    @lines << @buffer.slice!(0, idx + 1)
                   end
                   if @lines.size >= @read_lines_limit
                     # not to use too much memory in case the file is very large

data/lib/fluent/test/helpers.rb

@@ -0,0 +1,86 @@
+#
+# Fluentd
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+
+require 'fluent/config/element'
+require 'time'
+require 'fluent/time'
+
+module Fluent
+  module Test
+    module Helpers
+      # See "Example Custom Assertion: http://test-unit.github.io/test-unit/en/Test/Unit/Assertions.html
+      def assert_equal_event_time(expected, actual, message = nil)
+        expected_s = "#{expected}"
+        actual_s   = "#{actual}"
+        message = build_message(message, <<EOT, expected_s, actual_s)
+<?> time expected but was
+<?>.
+EOT
+        assert_block(message) do
+          expected.is_a?(Integer) && actual.is_a?(Integer) && expected == actual
+        end
+      end
+
+      def config_element(name = 'test', argument = '', params = {}, elements = [])
+        Fluent::Config::Element.new(name, argument, params, elements)
+      end
+
+      def event_time(str = nil, format: nil)
+        if str
+          if format
+            Time.strptime(str, format).to_i
+          else
+            Time.parse(str).to_i
+          end
+        else
+          Time.now.to_i
+        end
+      end
+
+      def with_timezone(tz)
+        oldtz, ENV['TZ'] = ENV['TZ'], tz
+        yield
+      ensure
+        ENV['TZ'] = oldtz
+      end
+
+      def time2str(time, localtime: false, format: nil)
+        if format
+          if localtime
+            Time.at(time).strftime(format)
+          else
+            Time.at(time).utc.strftime(format)
+          end
+        else
+          if localtime
+            Time.at(time).iso8601
+          else
+            Time.at(time).utc.iso8601
+          end
+        end
+      end
+
+      def capture_log(driver)
+        tmp = driver.instance.log.out
+        driver.instance.log.out = StringIO.new
+        yield
+        return driver.instance.log.out.string
+      ensure
+        driver.instance.log.out = tmp
+      end
+    end
+  end
+end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.29'
+  VERSION = '0.12.30'
 
 end

data/test/config/test_configurable.rb

@@ -296,7 +296,7 @@ module Fluent::Config
         def e(name, arg = '', attrs = {}, elements = [])
           attrs_str_keys = {}
           attrs.each{|key, value| attrs_str_keys[key.to_s] = value }
-          Fluent::Config::Element.new(name, arg, attrs_str_keys, elements)
+          config_element(name, arg, attrs_str_keys, elements)
         end
 
         BASE_ATTRS = {
@@ -577,7 +577,7 @@ module Fluent::Config
         def e(name, arg = '', attrs = {}, elements = [])
           attrs_str_keys = {}
           attrs.each{|key, value| attrs_str_keys[key.to_s] = value }
-          Fluent::Config::Element.new(name, arg, attrs_str_keys, elements)
+          config_element(name, arg, attrs_str_keys, elements)
         end
 
         test 'subclass configuration spec can overwrite superclass specs' do
@@ -682,7 +682,7 @@ module Fluent::Config
         def e(name, arg = '', attrs = {}, elements = [])
           attrs_str_keys = {}
           attrs.each{|key, value| attrs_str_keys[key.to_s] = value }
-          Fluent::Config::Element.new(name, arg, attrs_str_keys, elements)
+          config_element(name, arg, attrs_str_keys, elements)
         end
 
         test 'provides accessible data for alias attribute keys' do
@@ -701,7 +701,7 @@ module Fluent::Config
       def e(name, arg = '', attrs = {}, elements = [])
         attrs_str_keys = {}
         attrs.each { |key, value| attrs_str_keys[key.to_s] = value }
-        Fluent::Config::Element.new(name, arg, attrs_str_keys, elements)
+        config_element(name, arg, attrs_str_keys, elements)
       end
 
       setup do
@@ -813,7 +813,7 @@ module Fluent::Config
       test 'warned if deprecated parameter is configured' do
         obj = ConfigurableSpec::UnRecommended.new
         obj.log = Fluent::Test::TestLogger.new
-        obj.configure(Fluent::Config::Element.new('ROOT', '', {'key1' => 'yay'}, []))
+        obj.configure(config_element('ROOT', '', {'key1' => 'yay'}, []))
 
         assert_equal 'yay', obj.key1
         first_log = obj.log.logs.first
@@ -825,7 +825,7 @@ module Fluent::Config
         obj.log = Fluent::Test::TestLogger.new
 
         assert_raise Fluent::ObsoletedParameterError.new("'key2' parameter is already removed: key2 has been removed.") do
-          obj.configure(Fluent::Config::Element.new('ROOT', '', {'key2' => 'yay'}, []))
+          obj.configure(config_element('ROOT', '', {'key2' => 'yay'}, []))
         end
       end
     end

data/test/helper.rb

@@ -41,12 +41,15 @@ require 'test/unit/rr'
 require 'fileutils'
 require 'fluent/log'
 require 'fluent/test'
+require 'fluent/test/helpers'
 
 unless defined?(Test::Unit::AssertionFailedError)
   class Test::Unit::AssertionFailedError < StandardError
   end
 end
 
+include Fluent::Test::Helpers
+
 def unused_port
   s = TCPServer.open(0)
   port = s.addr[1]

data/test/plugin/test_filter_parser.rb

@@ -1,8 +1,11 @@
 require_relative '../helper'
 require 'timecop'
 require 'fluent/plugin/filter_parser'
+require 'flexmock/test_unit'
 
 class ParserFilterTest < Test::Unit::TestCase
+  include FlexMock::TestCase
+
   setup do
     Fluent::Test.setup
     @time = Time.parse("2012-01-02 13:14:15")
@@ -588,6 +591,15 @@ class ParserFilterTest < Test::Unit::TestCase
     assert_equal 1, filtered.length
     assert_nil filtered[0][2]['data']
     assert_equal 'bar', filtered[0][2]['foo']
+
+    d = create_driver(CONFIG_NOT_IGNORE + "emit_invalid_record_to_error true", 'test.no.ignore')
+    assert_nothing_raised {
+      flexmock(d.instance.router).should_receive(:emit_error_event).
+        with(String, Integer, Hash, ArgumentError).once
+      d.run do
+        d.filter({'foo' => 'bar'}, Time.now.to_i)
+      end
+    }
   end
 
   # suppress_parse_error_log test
@@ -689,13 +701,11 @@ class ParserFilterTest < Test::Unit::TestCase
     end
 
     def test_nothing_raised
-      swap_logger(@d.instance) do
       assert_nothing_raised {
         @d.run do
           @d.filter({'message' => VALID_MESSAGE}, Time.now.to_i)
         end
       }
-      end
     end
   end
 
@@ -706,14 +716,29 @@ class ParserFilterTest < Test::Unit::TestCase
     end
 
     def test_nothing_raised
-      swap_logger(@d.instance) do
       assert_nothing_raised {
         @d.run do
           @d.filter({'message' => INVALID_MESSAGE}, Time.now.to_i)
           @d.filter({'message' => VALID_MESSAGE},   Time.now.to_i)
         end
       }
-      end
+    end
+  end
+
+  class EmitInvalidRecordErrorTest < self
+    def setup
+      # enabled 'suppress_parse_error_log'
+      @d = create_driver(CONFIG_ENABELED_SUPPRESS_PARSE_ERROR_LOG + "emit_invalid_record_to_error true", 'test.no.change')
+    end
+
+    def test_nothing_raised
+      flexmock(@d.instance.router).should_receive(:emit_error_event).
+        with(String, Integer, Hash, Fluent::ParserError).once
+      assert_nothing_raised {
+        @d.run do
+          @d.filter({'message' => INVALID_MESSAGE}, Time.now.to_i)
+        end
+      }
     end
   end
 end

data/test/test_formatter.rb

@@ -29,6 +29,10 @@ module FormatterTest
     {'message' => 'awesome'}
   end
 
+  def symbolic_record
+    {:message => :awesome}
+  end
+
   def with_timezone(tz)
     oldtz, ENV['TZ'] = ENV['TZ'], tz
     yield
@@ -138,6 +142,14 @@ module FormatterTest
       assert_equal("#{Yajl.dump(record)}\n", formatted)
     end
 
+    data('oj' => 'oj', 'yajl' => 'yajl')
+    def test_format_with_symbolic_record(data)
+      @formatter.configure('json_parser' => data)
+      formatted = @formatter.format(tag, @time, symbolic_record)
+
+      assert_equal("#{JSON.generate(record)}\n", formatted)
+    end
+
     data('oj' => 'oj', 'yajl' => 'yajl')
     def test_format_with_include_tag(data)
       @formatter.configure('include_tag_key' => 'true', 'tag_key' => 'foo', 'json_parser' => data)

data/test/test_parser.rb

@@ -6,14 +6,6 @@ require 'fluent/plugin/string_util'
 module ParserTest
   include Fluent
 
-  def str2time(str_time, format = nil)
-    if format
-      Time.strptime(str_time, format).to_i
-    else
-      Time.parse(str_time).to_i
-    end
-  end
-
   class BaseParserTest < ::Test::Unit::TestCase
     include ParserTest
 
@@ -71,15 +63,15 @@ module ParserTest
     def test_call_with_parse
       parser = TextParser::TimeParser.new(nil)
 
-      time = str2time('2013-09-18 12:00:00 +0900')
-      assert_equal(time, parser.parse('2013-09-18 12:00:00 +0900'))
+      time = event_time('2013-09-18 12:00:00 +0900')
+      assert_equal_event_time(time, parser.parse('2013-09-18 12:00:00 +0900'))
     end
 
     def test_parse_with_strptime
       parser = TextParser::TimeParser.new('%d/%b/%Y:%H:%M:%S %z')
 
-      time = str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z')
-      assert_equal(time, parser.parse('28/Feb/2013:12:00:00 +0900'))
+      time = event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z')
+      assert_equal_event_time(time, parser.parse('28/Feb/2013:12:00:00 +0900'))
     end
 
     def test_parse_with_invalid_argument
@@ -99,13 +91,13 @@ module ParserTest
     def internal_test_case(parser)
       text = '192.168.0.1 - - [28/Feb/2013:12:00:00 +0900] [14/Feb/2013:12:00:00 +0900] "true /,/user HTTP/1.1" 200 777'
       [parser.parse(text), parser.parse(text) { |time, record| return time, record}].each { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal({
           'user' => '-',
           'flag' => true,
           'code' => 200.0,
           'size' => 777,
-          'date' => str2time('14/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'),
+          'date' => event_time('14/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'),
           'host' => '192.168.0.1',
           'path' => ['/', '/user']
         }, record)
@@ -139,12 +131,12 @@ module ParserTest
       )
       text = '2013-02-28 12:00:00 +0900'
       parser.parse(text) do |time, record|
-        assert_equal Time.parse(text).to_i, time
+        assert_equal event_time(text), time
       end
     end
 
     def test_parse_without_time
-      time_at_start = Time.now.to_i
+      time_at_start = event_time()
       text = "tagomori_satoshi tagomoris 34\n"
 
       parser = TextParser::RegexpParser.new(Regexp.new(%q!^(?<name>[^ ]*) (?<user>[^ ]*) (?<age>\d*)$!))
@@ -206,7 +198,7 @@ module ParserTest
     def test_call(method_name)
       m = @parser.method(method_name)
       m.call('192.168.0.1 - - [28/Feb/2013:12:00:00 +0900] "GET / HTTP/1.1" 200 777') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal({
           'user'    => '-',
           'method'  => 'GET',
@@ -245,21 +237,21 @@ module ParserTest
 
     def test_parse
       @parser.parse('[Wed Oct 11 14:32:52 2000] [error] [client 127.0.0.1] client denied by server configuration') { |time, record|
-        assert_equal(str2time('Wed Oct 11 14:32:52 2000'), time)
+        assert_equal_event_time(event_time('Wed Oct 11 14:32:52 2000'), time)
         assert_equal(@expected, record)
       }
     end
 
     def test_parse_with_pid
       @parser.parse('[Wed Oct 11 14:32:52 2000] [error] [pid 1000] [client 127.0.0.1] client denied by server configuration') { |time, record|
-        assert_equal(str2time('Wed Oct 11 14:32:52 2000'), time)
+        assert_equal_event_time(event_time('Wed Oct 11 14:32:52 2000'), time)
         assert_equal(@expected.merge('pid' => '1000'), record)
       }
     end
 
     def test_parse_without_client
       @parser.parse('[Wed Oct 11 14:32:52 2000] [notice] Apache/2.2.15 (Unix) DAV/2 configured -- resuming normal operations') { |time, record|
-        assert_equal(str2time('Wed Oct 11 14:32:52 2000'), time)
+        assert_equal_event_time(event_time('Wed Oct 11 14:32:52 2000'), time)
         assert_equal({
           'level' => 'notice',
           'message' => 'Apache/2.2.15 (Unix) DAV/2 configured -- resuming normal operations'
@@ -287,7 +279,7 @@ module ParserTest
 
     def test_parse
       @parser.parse('192.168.0.1 - - [28/Feb/2013:12:00:00 +0900] "GET / HTTP/1.1" 200 777 "-" "Opera/12.0"') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal(@expected, record)
       }
       assert_equal(TextParser::ApacheParser::REGEXP, @parser.patterns['format'])
@@ -296,7 +288,7 @@ module ParserTest
 
     def test_parse_without_http_version
       @parser.parse('192.168.0.1 - - [28/Feb/2013:12:00:00 +0900] "GET /" 200 777 "-" "Opera/12.0"') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal(@expected, record)
       }
     end
@@ -318,7 +310,7 @@ module ParserTest
     def test_parse
       @parser.configure({})
       @parser.parse('Feb 28 12:00:00 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
-        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('Feb 28 12:00:00', format: '%b %d %H:%M:%S'), time)
         assert_equal(@expected, record)
       }
       assert_equal(TextParser::SyslogParser::REGEXP, @parser.instance.patterns['format'])
@@ -328,7 +320,7 @@ module ParserTest
     def test_parse_with_time_format
       @parser.configure('time_format' => '%b %d %M:%S:%H')
       @parser.parse('Feb 28 00:00:12 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
-        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('Feb 28 12:00:00', format: '%b %d %H:%M:%S'), time)
         assert_equal(@expected, record)
       }
       assert_equal('%b %d %M:%S:%H', @parser.instance.patterns['time_format'])
@@ -337,7 +329,7 @@ module ParserTest
     def test_parse_with_priority
       @parser.configure('with_priority' => true)
       @parser.parse('<6>Feb 28 12:00:00 192.168.0.1 fluentd[11111]: [error] Syslog test') { |time, record|
-        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('Feb 28 12:00:00', format: '%b %d %H:%M:%S'), time)
         assert_equal(@expected.merge('pri' => 6), record)
       }
       assert_equal(TextParser::SyslogParser::REGEXP_WITH_PRI, @parser.instance.patterns['format'])
@@ -347,7 +339,7 @@ module ParserTest
     def test_parse_without_colon
       @parser.configure({})
       @parser.parse('Feb 28 12:00:00 192.168.0.1 fluentd[11111] [error] Syslog test') { |time, record|
-        assert_equal(str2time('Feb 28 12:00:00', '%b %d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('Feb 28 12:00:00', format: '%b %d %H:%M:%S'), time)
         assert_equal(@expected, record)
       }
       assert_equal(TextParser::SyslogParser::REGEXP, @parser.instance.patterns['format'])
@@ -377,7 +369,7 @@ module ParserTest
     def test_parse(data)
       @parser.configure('json_parser' => data)
       @parser.parse('{"time":1362020400,"host":"192.168.0.1","size":777,"method":"PUT"}') { |time, record|
-        assert_equal(str2time('2013-02-28 12:00:00 +0900').to_i, time)
+        assert_equal_event_time(event_time('2013-02-28 12:00:00 +0900'), time)
         assert_equal({
           'host'   => '192.168.0.1',
           'size'   => 777,
@@ -421,6 +413,14 @@ module ParserTest
       }
     end
 
+    data('oj' => 'oj', 'yajl' => 'yajl')
+    def test_parse_with_colon_string(data)
+      @parser.configure('json_parser' => data)
+      @parser.parse('{"time":1362020400,"log":":message"}') { |time, record|
+        assert_equal(record['log'], ':message')
+      }
+    end
+
     data('oj' => 'oj', 'yajl' => 'yajl')
     def test_parse_with_invalid_time(data)
       @parser.configure('json_parser' => data)
@@ -464,21 +464,21 @@ module ParserTest
 
     def test_parse
       @parser.parse('127.0.0.1 192.168.0.1 - [28/Feb/2013:12:00:00 +0900] "GET / HTTP/1.1" 200 777 "-" "Opera/12.0"') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal(@expected, record)
       }
     end
 
     def test_parse_with_empty_included_path
       @parser.parse('127.0.0.1 192.168.0.1 - [28/Feb/2013:12:00:00 +0900] "GET /a[ ]b HTTP/1.1" 200 777 "-" "Opera/12.0"') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal(@expected.merge('path' => '/a[ ]b'), record)
       }
     end
 
     def test_parse_without_http_version
       @parser.parse('127.0.0.1 192.168.0.1 - [28/Feb/2013:12:00:00 +0900] "GET /" 200 777 "-" "Opera/12.0"') { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal(@expected, record)
       }
     end
@@ -507,7 +507,7 @@ module ParserTest
       parser = TextParser::TSVParser.new
       parser.configure('keys' => param, 'time_key' => 'time')
       parser.parse("2013/02/28 12:00:00\t192.168.0.1\t111") { |time, record|
-        assert_equal(str2time('2013/02/28 12:00:00', '%Y/%m/%d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('2013/02/28 12:00:00', format: '%Y/%m/%d %H:%M:%S'), time)
         assert_equal({
           'a' => '192.168.0.1',
           'b' => '111',
@@ -612,7 +612,7 @@ module ParserTest
       parser = TextParser::CSVParser.new
       parser.configure('keys' => param, 'time_key' => 'time')
       parser.parse("2013/02/28 12:00:00,192.168.0.1,111") { |time, record|
-        assert_equal(str2time('2013/02/28 12:00:00', '%Y/%m/%d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('2013/02/28 12:00:00', format: '%Y/%m/%d %H:%M:%S'), time)
         assert_equal({
           'c' => '192.168.0.1',
           'd' => '111',
@@ -715,7 +715,7 @@ module ParserTest
       parser = TextParser::LabeledTSVParser.new
       parser.configure({})
       parser.parse("time:2013/02/28 12:00:00\thost:192.168.0.1\treq_id:111") { |time, record|
-        assert_equal(str2time('2013/02/28 12:00:00', '%Y/%m/%d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('2013/02/28 12:00:00', format: '%Y/%m/%d %H:%M:%S'), time)
         assert_equal({
           'host'   => '192.168.0.1',
           'req_id' => '111',
@@ -730,7 +730,7 @@ module ParserTest
         'label_delimiter' => '=',
       )
       parser.parse('time=2013/02/28 12:00:00,host=192.168.0.1,req_id=111') { |time, record|
-        assert_equal(str2time('2013/02/28 12:00:00', '%Y/%m/%d %H:%M:%S'), time)
+        assert_equal_event_time(event_time('2013/02/28 12:00:00', format: '%Y/%m/%d %H:%M:%S'), time)
         assert_equal({
           'host'   => '192.168.0.1',
           'req_id' => '111',
@@ -745,7 +745,7 @@ module ParserTest
         'time_format' => '%d/%b/%Y:%H:%M:%S %z',
       )
       parser.parse("mytime:28/Feb/2013:12:00:00 +0900\thost:192.168.0.1\treq_id:111") { |time, record|
-        assert_equal(str2time('28/Feb/2013:12:00:00 +0900', '%d/%b/%Y:%H:%M:%S %z'), time)
+        assert_equal_event_time(event_time('28/Feb/2013:12:00:00 +0900', format: '%d/%b/%Y:%H:%M:%S %z'), time)
         assert_equal({
           'host'   => '192.168.0.1',
           'req_id' => '111',
@@ -890,7 +890,7 @@ javax.management.RuntimeErrorException: null
 \tat Main.main(Main.java:16) ~[bin/:na]
 EOS
 
-        assert_equal(str2time('2013-3-03 14:27:33').to_i, time)
+        assert_equal_event_time(event_time('2013-3-03 14:27:33'), time)
         assert_equal({
           "thread"  => "main",
           "level"   => "ERROR",
@@ -908,7 +908,7 @@ message=test1
 EOS
 
         assert(parser.firstline?('----'))
-        assert_equal(str2time('2013-3-03 14:27:33').to_i, time)
+        assert_equal_event_time(event_time('2013-3-03 14:27:33'), time)
         assert_equal({"message" => "test1"}, record)
       }
     end
@@ -930,7 +930,7 @@ Completed 200 OK in 4ms (Views: 3.2ms | ActiveRecord: 0.0ms)
 EOS
 
         assert(parser.firstline?('Started GET "/users/123/" for 127.0.0.1...'))
-        assert_equal(str2time('2013-06-14 12:00:11 +0900').to_i, time)
+        assert_equal_event_time(event_time('2013-06-14 12:00:11 +0900'), time)
         assert_equal({
           "method" => "GET",
           "path" => "/users/123/",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.29
+  version: 0.12.30
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -403,6 +403,7 @@ files:
 - lib/fluent/test/base.rb
 - lib/fluent/test/filter_test.rb
 - lib/fluent/test/formatter_test.rb
+- lib/fluent/test/helpers.rb
 - lib/fluent/test/input_test.rb
 - lib/fluent/test/output_test.rb
 - lib/fluent/test/parser_test.rb