fluentd 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db2e0fe87d5466ddca212327e3e0ad56bd7c6055daffd05bc351c5544153908d
-  data.tar.gz: b6b92ecd3814b496dfa7522850876bffeb6f2b59278159462b3de2e91a613170
+  metadata.gz: 592df476adfeb30ef3a08865d03af3eeb7f60e1d27684f22dc3505b8dc7bcab4
+  data.tar.gz: acc575bbf086686addf560a7a65e084221a609ce5eff6385b88a9aea65c4aca4
 SHA512:
-  metadata.gz: c359fac49d0273d40d2b8452eacc3c85d899264d44f9eb57e11bcdf73373b146f065dc0d2cee87b8542a4da3087a917d344809697e1e8065165066530eda26b5
-  data.tar.gz: a080e5d6948fe33bbc02ebfba49fb851c1facd9cf6a30a38a5f3762cb8e629e93950b3cf9d24780215655c12a7ca69a7cdaf546bed31bdab8319e8dcbdd9e405
+  metadata.gz: c1f5ebc8c426c80c7b6501afba2ac9534aeceafe21945e58fd0530dbde099d8cdbd0a6c9533c7500d838db09f66dfbefd4fbed5cb6304ab71fe473ab0a63cd5c
+  data.tar.gz: 6eef15e5140fc4547c59215ae01cd9eb661429bb7eb36067e6834f877c916bf78507345091002116129435e548525654e289db36c3a786f7aebc5780835458ef

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # v1.2
 
+## Release v1.2.3 - 2018/07/10
+
+### Enhancements
+
+* in_http: Consider `<parse>` parameters in batch mode
+  https://github.com/fluent/fluentd/pull/2055
+* in_http: Support gzip payload
+  https://github.com/fluent/fluentd/pull/2060
+* output: Improve compress performance
+  https://github.com/fluent/fluentd/pull/2031
+* in_monitor_agent: Add missing descriptions for configurable options
+  https://github.com/fluent/fluentd/pull/2037
+* parser_syslog: update regex of pid field for conformance to RFC5424 spec
+  https://github.com/fluent/fluentd/pull/2051
+
+### Bug fixes
+
+* in_tail: Fix to rescue Errno::ENOENT for File.mtime()
+  https://github.com/fluent/fluentd/pull/2063
+* fluent-plugin-generate: Fix Parser plugin template
+  https://github.com/fluent/fluentd/pull/2026
+* fluent-plugin-config-format: Fix NoMethodError for some plugins
+  https://github.com/fluent/fluentd/pull/2023
+* config: Don't warn message for reserved parameters in DSL
+  https://github.com/fluent/fluentd/pull/2034
+
 ## Release v1.2.2 - 2018/06/12
 
 ### Enhancements

data/fluentd.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["frsyuki@gmail.com"]
   gem.description   = %q{Fluentd is an open source data collector designed to scale and simplify log management. It can collect, process and ship many kinds of data in near real-time.}
   gem.summary       = %q{Fluentd event collector}
-  gem.homepage      = "https://fluentd.org/"
+  gem.homepage      = "https://www.fluentd.org/"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/config/configure_proxy.rb

@@ -384,7 +384,7 @@ module Fluent
         end
         # Overwrite by config_set_default
         @defaults.each do |name, value|
-          if @params.key?(name) || @argument.first == name
+          if @params.key?(name) || (@argument && @argument.first == name)
             dumped_config[name][:default] = value
           else
             dumped_config[name] = { default: value }

data/lib/fluent/config/dsl.rb

@@ -22,6 +22,8 @@ require 'fluent/config/element'
 module Fluent
   module Config
     module DSL
+      RESERVED_PARAMETERS = [:type, :id, :log_level, :label] # Need '@' prefix for reserved parameters
+
       module Parser
         def self.read(path)
           path = File.expand_path(path)
@@ -95,11 +97,12 @@ module Fluent
             proxy.element.instance_exec(&block)
             @elements.push(proxy.to_config_element)
           else
-            @attrs[name.to_s] = if value.is_a?(Array) || value.is_a?(Hash)
-                                  JSON.dump(value)
-                                else
-                                  value.to_s
-                                end
+            param_name = RESERVED_PARAMETERS.include?(name) ? "@#{name}" : name.to_s
+            @attrs[param_name] = if value.is_a?(Array) || value.is_a?(Hash)
+                                   JSON.dump(value)
+                                 else
+                                   value.to_s
+                                 end
           end
 
           self

data/lib/fluent/plugin/compressable.rb

@@ -60,7 +60,7 @@ module Fluent
         out = ''
         loop do
           gz = Zlib::GzipReader.new(io)
-          out += gz.read
+          out << gz.read
           unused = gz.unused
           gz.finish
 

data/lib/fluent/plugin/in_http.rb

@@ -78,10 +78,16 @@ module Fluent::Plugin
             @parser_json = parser_create(usage: 'parser_in_http_json', type: 'json')
             @parser_json.estimate_current_event = false
             @format_name = 'default'
+            @parser_time_key = if parser_config = conf.elements('parse').first
+                                 parser_config['time_key'] || 'time'
+                               else
+                                 'time'
+                               end
             method(:parse_params_default)
           else
             @parser = parser_create
             @format_name = @parser_configs.first['@type']
+            @parser_time_key = @parser.time_key
             method(:parse_params_with_parser)
           end
       self.singleton_class.module_eval do
@@ -202,11 +208,18 @@ module Fluent::Plugin
             if @add_remote_addr
               single_record['REMOTE_ADDR'] = params['REMOTE_ADDR']
             end
-            single_time = if t = single_record.delete('time')
-                            Fluent::EventTime.from_time(Time.at(t))
-                          else
-                            time
-                          end
+
+            if defined? @parser
+              single_time = @parser.parse_time(single_record)
+              single_time, single_record = @parser.convert_values(single_time, single_record)
+            else
+              single_time = if t = single_record.delete(@parser_time_key)
+                              Fluent::EventTime.from_time(Time.at(t))
+                            else
+                              time
+                            end
+            end
+
             mes.add(single_time, single_record)
           end
           router.emit_stream(tag, mes)
@@ -305,6 +318,7 @@ module Fluent::Plugin
         end
         @env = {}
         @content_type = ""
+        @content_encoding = ""
         headers.each_pair {|k,v|
           @env["HTTP_#{k.gsub('-','_').upcase}"] = v
           case k
@@ -314,6 +328,8 @@ module Fluent::Plugin
             size = v.to_i
           when /Content-Type/i
             @content_type = v
+          when /Content-Encoding/i
+            @content_encoding = v
           when /Connection/i
             if v =~ /close/i
               @keep_alive = false
@@ -365,6 +381,22 @@ module Fluent::Plugin
           end
         end
 
+        # Content Encoding
+        # =================
+        # Decode payload according to the "Content-Encoding" header.
+        # For now, we only support 'gzip' and 'deflate'.
+        begin
+          if @content_encoding == 'gzip'
+            @body = Zlib::GzipReader.new(StringIO.new(@body)).read
+          elsif @content_encoding == 'deflate'
+            @body = Zlib::Inflate.inflate(@body)
+          end
+        rescue
+          @log.warn 'fails to decode payload', error: $!.to_s
+          send_response_and_close("400 Bad Request", {}, "")
+          return
+        end
+
         @env['REMOTE_ADDR'] = @remote_addr if @remote_addr
 
         uri = URI.parse(@parser.request_url)

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -30,11 +30,17 @@ module Fluent::Plugin
 
     helpers :timer, :thread
 
+    desc 'The address to bind to.'
     config_param :bind, :string, default: '0.0.0.0'
+    desc 'The port to listen to.'
     config_param :port, :integer, default: 24220
+    desc 'The tag with which internal metrics are emitted.'
     config_param :tag, :string, default: nil
+    desc 'Determine the rate to emit internal metrics as events.'
     config_param :emit_interval, :time, default: 60
+    desc 'Determine whether to include the config information.'
     config_param :include_config, :bool, default: true
+    desc 'Determine whether to include the retry information.'
     config_param :include_retry, :bool, default: true
 
     class MonitorServlet < WEBrick::HTTPServlet::AbstractServlet

data/lib/fluent/plugin/in_tail.rb

@@ -216,20 +216,24 @@ module Fluent::Plugin
         path = date.strftime(path)
         if path.include?('*')
           paths += Dir.glob(path).select { |p|
-            is_file = !File.directory?(p)
-            if File.readable?(p) && is_file
-              if @limit_recently_modified && File.mtime(p) < (date - @limit_recently_modified)
-                false
+            begin
+              is_file = !File.directory?(p)
+              if File.readable?(p) && is_file
+                if @limit_recently_modified && File.mtime(p) < (date - @limit_recently_modified)
+                  false
+                else
+                  true
+                end
               else
-                true
-              end
-            else
-              if is_file
-                unless @ignore_list.include?(path)
-                  log.warn "#{p} unreadable. It is excluded and would be examined next time."
-                  @ignore_list << path if @ignore_repeated_permission_error
+                if is_file
+                  unless @ignore_list.include?(path)
+                    log.warn "#{p} unreadable. It is excluded and would be examined next time."
+                    @ignore_list << path if @ignore_repeated_permission_error
+                  end
                 end
+                false
               end
+            rescue Errno::ENOENT
               false
             end
           }

data/lib/fluent/plugin/parser_syslog.rb

@@ -27,8 +27,8 @@ module Fluent
       REGEXP = /^(?<time>[^ ]*\s*[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\[]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
       # From in_syslog default pattern
       REGEXP_WITH_PRI = /^\<(?<pri>[0-9]+)\>(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[^ :\[]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$/
-      REGEXP_RFC5424 = /\A^(?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>[-0-9]+) (?<msgid>[^ ]+) (?<extradata>(\[(.*)\]|[^ ])) (?<message>.+)$\z/
-      REGEXP_RFC5424_WITH_PRI = /\A^\<(?<pri>[0-9]{1,3})\>[1-9]\d{0,2} (?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>[-0-9]+) (?<msgid>[^ ]+) (?<extradata>(\[(.*)\]|[^ ])) (?<message>.+)$\z/
+      REGEXP_RFC5424 = /\A^(?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>.{1,128}) (?<msgid>[^ ]+) (?<extradata>(\[(.*)\]|[^ ])) (?<message>.+)$\z/
+      REGEXP_RFC5424_WITH_PRI = /\A^\<(?<pri>[0-9]{1,3})\>[1-9]\d{0,2} (?<time>[^ ]+) (?<host>[^ ]+) (?<ident>[^ ]+) (?<pid>.{1,128}) (?<msgid>[^ ]+) (?<extradata>(\[(.*)\]|[^ ])) (?<message>.+)$\z/
       REGEXP_DETECT_RFC5424 = /^\<.*\>[1-9]\d{0,2}/
 
       config_set_default :time_format, "%b %d %H:%M:%S"

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 
 end

data/templates/new_gem/lib/fluent/plugin/parser.rb.erb

@@ -6,10 +6,10 @@ module Fluent
   module Plugin
     class <%= class_name %> < Fluent::Plugin::Parser
       Fluent::Plugin.register_parser("<%= plugin_name %>", self)
-    end
 
-    def parse(text)
-      yield time, record
+      def parse(text)
+        yield time, record
+      end
     end
   end
 end

data/test/config/test_dsl.rb

@@ -176,7 +176,7 @@ module Fluent::Config
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
@@ -185,11 +185,11 @@ module Fluent::Config
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
@@ -203,7 +203,7 @@ module Fluent::Config
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end
@@ -302,7 +302,7 @@ module Fluent::Config
           assert_equal('source', ele4.name)
           assert_predicate(ele4.arg, :empty?)
           assert_equal(2, ele4.keys.size)
-          assert_equal('tail', ele4['type'])
+          assert_equal('tail', ele4['@type'])
           assert_equal("/var/log/httpd/access.part4.log", ele4['path'])
         end
 
@@ -311,11 +311,11 @@ module Fluent::Config
 
           assert_equal('filter', filter0.name)
           assert_equal('bar.**', filter0.arg)
-          assert_equal('hoge', filter0['type'])
+          assert_equal('hoge', filter0['@type'])
           assert_equal('moge', filter0['val1'])
           assert_equal(JSON.dump(['foo', 'bar', 'baz']), filter0['val2'])
           assert_equal('10', filter0['val3'])
-          assert_equal('hoge', filter0['id'])
+          assert_equal('hoge', filter0['@id'])
 
           assert_equal(2, filter0.elements.size)
           assert_equal('subsection', filter0.elements[0].name)
@@ -329,7 +329,7 @@ module Fluent::Config
 
           assert_equal('match', match0.name)
           assert_equal('{foo,bar}.**', match0.arg)
-          assert_equal('file', match0['type'])
+          assert_equal('file', match0['@type'])
           assert_equal('/var/log/httpd/access.myhostname.4.log', match0['path'])
         end
       end

data/test/counter/test_client.rb

@@ -64,6 +64,12 @@ class CounterClientTest < ::Test::Unit::TestCase
     store[key]
   end
 
+  def travel(sec)
+    # Since Timecop.travel() causes test failures on Windows/AppVeyor by inducing
+    # rounding errors to Time.now, we need to use Timecop.freeze() instead.
+    Timecop.freeze(Time.now + sec)
+  end
+
   sub_test_case 'establish' do
     test 'establish a scope' do
       @client.establish(@scope)
@@ -277,7 +283,7 @@ class CounterClientTest < ::Test::Unit::TestCase
       assert_equal 0, v['total']
       assert_equal 0, v['current']
 
-      Timecop.travel(1)
+      travel(1)
       inc_obj = { name: @name, value: 10 }
       @client.inc(inc_obj).get
 
@@ -444,7 +450,7 @@ class CounterClientTest < ::Test::Unit::TestCase
       assert_equal @now, Fluent::EventTime.new(*v1['last_reset_at'])
 
       travel_sec = 6            # greater than reset_interval
-      Timecop.travel(travel_sec)
+      travel(travel_sec)
 
       v2 = @client.reset(@name).get
       data = v2.data.first
@@ -472,7 +478,7 @@ class CounterClientTest < ::Test::Unit::TestCase
       assert_equal @now, Fluent::EventTime.new(*v1['last_reset_at'])
 
       travel_sec = 4            # less than reset_interval
-      Timecop.travel(travel_sec)
+      travel(travel_sec)
 
       v2 = @client.reset(@name).get
       data = v2.data.first
@@ -520,7 +526,7 @@ class CounterClientTest < ::Test::Unit::TestCase
       unknown_name = 'key2'
 
       travel_sec = 6            # greater than reset_interval
-      Timecop.travel(travel_sec)
+      travel(travel_sec)
 
       response = @client.reset(@name, unknown_name).get
       data = response.data.first

data/test/counter/test_server.rb

@@ -28,6 +28,12 @@ class CounterServerTest < ::Test::Unit::TestCase
     store[key]
   end
 
+  def travel(sec)
+    # Since Timecop.travel() causes test failures on Windows/AppVeyor by inducing
+    # rounding errors to Time.now, we need to use Timecop.freeze() instead.
+    Timecop.freeze(Time.now + sec)
+  end
+
   test 'raise an error when server name is invalid' do
     assert_raise do
       Fluent::Counter::Server.new("\tinvalid_name")
@@ -387,7 +393,7 @@ class CounterServerTest < ::Test::Unit::TestCase
     end
 
     test 'reset a value in the counter' do
-      Timecop.travel(@travel_sec)
+      travel(@travel_sec)
 
       result = @server.send('reset', [@name], @scope, {})
       assert_nil result['errors']
@@ -412,7 +418,7 @@ class CounterServerTest < ::Test::Unit::TestCase
 
     test 'reset a value after `reset_interval` passed' do
       first_travel_sec = 5
-      Timecop.travel(first_travel_sec) # jump time less than reset_interval
+      travel(first_travel_sec) # jump time less than reset_interval
       result = @server.send('reset', [@name], @scope, {})
       v = result['data'].first
 
@@ -424,7 +430,7 @@ class CounterServerTest < ::Test::Unit::TestCase
       assert_equal @now, Fluent::EventTime.new(*store['last_reset_at'])
 
       # time is passed greater than reset_interval
-      Timecop.travel(@travel_sec)
+      travel(@travel_sec)
       result = @server.send('reset', [@name], @scope, {})
       v = result['data'].first
 

data/test/counter/test_store.rb

@@ -23,6 +23,12 @@ class CounterStoreTest < ::Test::Unit::TestCase
     store[key]
   end
 
+  def travel(sec)
+    # Since Timecop.travel() causes test failures on Windows/AppVeyor by inducing
+    # rounding errors to Time.now, we need to use Timecop.freeze() instead.
+    Timecop.freeze(Time.now + sec)
+  end
+
   sub_test_case 'init' do
     setup do
       @reset_interval = 10
@@ -142,7 +148,7 @@ class CounterStoreTest < ::Test::Unit::TestCase
     test 'increment or decrement a value in the counter' do |value|
       key = Fluent::Counter::Store.gen_key(@scope, @name)
       @store.init(key, @init_data)
-      Timecop.travel(@travel_sec)
+      travel(@travel_sec)
       v = @store.inc(key, { 'value' => value })
 
       assert_equal value, v['total']
@@ -198,7 +204,7 @@ class CounterStoreTest < ::Test::Unit::TestCase
     end
 
     test 'reset a value in the counter' do
-      Timecop.travel(@travel_sec)
+      travel(@travel_sec)
 
       v = @store.reset(@key)
       assert_equal @travel_sec, v['elapsed_time']
@@ -222,7 +228,7 @@ class CounterStoreTest < ::Test::Unit::TestCase
 
     test 'reset a value after `reset_interval` passed' do
       first_travel_sec = 5
-      Timecop.travel(first_travel_sec) # jump time less than reset_interval
+      travel(first_travel_sec) # jump time less than reset_interval
       v = @store.reset(@key)
 
       assert_equal false, v['success']
@@ -232,7 +238,7 @@ class CounterStoreTest < ::Test::Unit::TestCase
       assert_equal @now, Fluent::EventTime.new(*store['last_reset_at'])
 
       # time is passed greater than reset_interval
-      Timecop.travel(@travel_sec)
+      travel(@travel_sec)
       v = @store.reset(@key)
       assert_true v['success']
       assert_equal @travel_sec + first_travel_sec, v['elapsed_time']

data/test/plugin/test_in_http.rb

@@ -162,6 +162,29 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal_event_time time, d.events[1][1]
   end
 
+  def test_multi_json_with_nonexistent_time_key
+    d = create_driver(CONFIG + %[
+      <parse>
+        time_key missing
+      </parse>
+    ])
+    time = event_time("2011-01-02 13:14:15 UTC")
+    time_i = time.to_i
+    time_f = time.to_f
+
+    records = [{"a" => 1, 'time' => time_i},{"a" => 2, 'time' => time_f}]
+    tag = "tag1"
+    res_codes = []
+    d.run(expect_records: 2, timeout: 5) do
+      res = post("/#{tag}", {"json" => records.to_json})
+      res_codes << res.code
+    end
+    assert_equal ["200"], res_codes
+    assert_equal 2, d.events.size
+    assert_not_equal time_i, d.events[0][1].sec # current time is used because "missing" field doesn't exist
+    assert_not_equal time_i, d.events[1][1].sec
+  end
+
   def test_json_with_add_remote_addr
     d = create_driver(CONFIG + "add_remote_addr true")
     time = event_time("2011-01-02 13:14:15 UTC")
@@ -347,6 +370,38 @@ class HttpInputTest < Test::Unit::TestCase
     assert include_http_header?(d.events[1][2])
   end
 
+  def test_multi_json_with_custom_parser
+    d = create_driver(CONFIG + %[
+        <parse>
+          @type json
+          keep_time_key true
+          time_key foo
+          time_format %iso8601
+        </parse>
+    ])
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    time_s = Time.at(time).iso8601
+
+    records = [{"foo"=>time_s,"bar"=>"test1"},{"foo"=>time_s,"bar"=>"test2"}]
+    tag = "tag1"
+    res_codes = []
+
+    d.run(expect_records: 2, timeout: 5) do
+      res = post("/#{tag}", records.to_json, {"Content-Type"=>"application/octet-stream"})
+      res_codes << res.code
+    end
+    assert_equal ["200"], res_codes
+
+    assert_equal "tag1", d.events[0][0]
+    assert_equal_event_time time, d.events[0][1]
+    assert_equal d.events[0][2], records[0]
+
+    assert_equal "tag1", d.events[1][0]
+    assert_equal_event_time time, d.events[1][1]
+    assert_equal d.events[1][2], records[1]
+  end
+
   def test_application_json
     d = create_driver
     time = event_time("2011-01-02 13:14:15 UTC")
@@ -549,6 +604,54 @@ class HttpInputTest < Test::Unit::TestCase
     assert_equal_event_time time, d.events[1][1]
   end
 
+  def test_content_encoding_gzip
+    d = create_driver
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    events = [
+      ["tag1", time, {"a"=>1}],
+      ["tag2", time, {"a"=>2}],
+    ]
+    res_codes = []
+    res_headers = []
+
+    d.run do
+      events.each do |tag, time, record|
+        header = {'Content-Type'=>'application/json', 'Content-Encoding'=>'gzip'}
+        res = post("/#{tag}?time=#{time}", compress_gzip(record.to_json), header)
+        res_codes << res.code
+      end
+    end
+    assert_equal ["200", "200"], res_codes
+    assert_equal events, d.events
+    assert_equal_event_time time, d.events[0][1]
+    assert_equal_event_time time, d.events[1][1]
+  end
+
+  def test_content_encoding_deflate
+    d = create_driver
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    events = [
+      ["tag1", time, {"a"=>1}],
+      ["tag2", time, {"a"=>2}],
+    ]
+    res_codes = []
+    res_headers = []
+
+    d.run do
+      events.each do |tag, time, record|
+        header = {'Content-Type'=>'application/msgpack', 'Content-Encoding'=>'deflate'}
+        res = post("/#{tag}?time=#{time}", Zlib.deflate(record.to_msgpack), header)
+        res_codes << res.code
+      end
+    end
+    assert_equal ["200", "200"], res_codes
+    assert_equal events, d.events
+    assert_equal_event_time time, d.events[0][1]
+    assert_equal_event_time time, d.events[1][1]
+  end
+
   def test_cors_disallowed
     d = create_driver(CONFIG + "cors_allow_origins [\"http://foo.com\"]")
     assert_equal ["http://foo.com"], d.instance.cors_allow_origins
@@ -639,6 +742,13 @@ class HttpInputTest < Test::Unit::TestCase
     http.request(req)
   end
 
+  def compress_gzip(data)
+    io = StringIO.new
+    io.binmode
+    Zlib::GzipWriter.wrap(io) { |gz| gz.write data }
+    return io.string
+  end
+
   def include_http_header?(record)
     record.keys.find { |header| header.start_with?('HTTP_') }
   end

data/test/plugin/test_out_file.rb

@@ -304,7 +304,11 @@ class FileOutputTest < Test::Unit::TestCase
       assert_equal r4, d.formatted[3]
       assert_equal r5, d.formatted[4]
 
-      read_gunzip = ->(path){ File.open(path){|fio| Zlib::GzipReader.open(fio){|io| io.read } } }
+      read_gunzip = ->(path){
+        File.open(path){ |fio|
+          Zlib::GzipReader.new(StringIO.new(fio.read)).read
+        }
+      }
       assert_equal r1 + r2, read_gunzip.call("#{TMP_DIR}/my.data/a/full.20161003.2345.log.gz")
       assert_equal r3, read_gunzip.call("#{TMP_DIR}/your.data/a/full.20161003.2345.log.gz")
       assert_equal r4, read_gunzip.call("#{TMP_DIR}/my.data/a/full.20161004.0000.log.gz")
@@ -370,7 +374,7 @@ class FileOutputTest < Test::Unit::TestCase
     result = ''
     File.open(path, "rb") { |io|
       loop do
-        gzr = Zlib::GzipReader.new(io)
+        gzr = Zlib::GzipReader.new(StringIO.new(io.read))
         result << gzr.read
         unused = gzr.unused
         gzr.finish

data/test/plugin_helper/test_retry_state.rb

@@ -422,7 +422,7 @@ class RetryStateHelperTest < Test::Unit::TestCase
 
   sub_test_case 'exponential backoff' do
     test 'too big steps(check inf handling)' do
-      s = @d.retry_state_create(:t11, :exponential_backoff, 0.1, 300, randomize: false, forever: true, backoff_base: 2)
+      s = @d.retry_state_create(:t11, :exponential_backoff, 1, 300, randomize: false, forever: true, backoff_base: 2)
       dummy_current_time = s.start
       override_current_time(s, dummy_current_time)
 
@@ -431,7 +431,7 @@ class RetryStateHelperTest < Test::Unit::TestCase
         if i >= 1025
           # With this setting, 1025+ number causes inf in `calc_interval`, so 1024 value is used for next_time
           assert_nothing_raised(FloatDomainError) { s.step }
-          assert_equal (dummy_current_time + 0.1 * (2 ** (1024 - 1))), s.next_time
+          assert_equal (dummy_current_time + (2 ** (1024 - 1))), s.next_time
         else
           s.step
         end

data/test/test_configdsl.rb

@@ -65,13 +65,13 @@ match('aa')
     e0 = root.elements[0]
     assert_equal 'source', e0.name
     assert_equal '', e0.arg
-    assert_equal 'forward', e0['type']
+    assert_equal 'forward', e0['@type']
     assert_equal '24224', e0['port']
 
     e1 = root.elements[1]
     assert_equal 'match', e1.name
     assert_equal 'test.**', e1.arg
-    assert_equal 'forward', e1['type']
+    assert_equal 'forward', e1['@type']
     assert_equal '1s', e1['flush_interval']
     assert_equal 2, e1.elements.size
     e1s0 = e1.elements[0]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -749,7 +749,7 @@ files:
 - test/test_time_formatter.rb
 - test/test_time_parser.rb
 - test/test_unique_id.rb
-homepage: https://fluentd.org/
+homepage: https://www.fluentd.org/
 licenses:
 - Apache-2.0
 metadata: {}