fluentd 0.14.15 → 0.14.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2a4f15bf32737020c69883079694ad81648cff
-  data.tar.gz: 142851ddfb0483e49bc1b71aed6e7e98db295c34
+  metadata.gz: c8ecd747594db63d79cc18e76b0c79869d3d5388
+  data.tar.gz: 8b70682f2c2ce355b8f84aeba9898142abe29d95
 SHA512:
-  metadata.gz: ad5bcad4d26b4cfaa59b7b59c5100cfe0a651206dbadfb0b519369f8b095951bf68f45c8df67dd6954bdb8fc64a714cd4911063f9c5eebb9d963ebd7dd71af4f
-  data.tar.gz: c38a2498db6ea742f50103beca1e9c4f8e19fd1f811e84152a2d7679d0225edb65f1cb7e75975f414ec0ea5343a4ca2f2342f233b55bcd4969bfcf481260ec26
+  metadata.gz: d6ce26c60893a685559442d5aad416fcf4535ceb3324ab359518f70b9cc9ac9582ee53fb5b6fcceff0e0d1db70049afa5370ec90ee69f86f2b8881e4fdeb2aef
+  data.tar.gz: 34bc0fb042d7f97bbfc6bf7e39e0ae673eb09ec49eb8456483688b677fb086dbeef8fdf2a6d01d1685c4ab25ac49f65d1eaadda7dea3cc12dfebc657d373e476

data/.travis.yml

@@ -13,13 +13,13 @@ matrix:
       os: linux
     - rvm: 2.3.3
       os: linux
-    - rvm: 2.4.0
+    - rvm: 2.4.1
       os: linux
     - rvm: ruby-head
       os: linux
     - rvm: 2.1.10
       os: osx
-      osx_image: xcode8.2 # OSX 10.12
+      osx_image: xcode8.3 # OSX 10.12
     # - rvm: 2.2.6
     #   os: osx
     #   osx_image: xcode8.2 # OSX 10.12
@@ -28,17 +28,16 @@ matrix:
     #   osx_image: xcode8.2 # OSX 10.12
     - rvm: 2.4.0
       os: osx
-      osx_image: xcode8.2 # OSX 10.12
+      osx_image: xcode8.3 # OSX 10.12
     - rvm: ruby-head
       os: osx
-      osx_image: xcode 8.2 # OSX 10.12
+      osx_image: xcode 8.3 # OSX 10.12
   allow_failures:
     - rvm: ruby-head
 
 branches:
   only:
     - master
-    - v0.10
     - v0.12
     - v0.14
 

data/ChangeLog

@@ -1,5 +1,25 @@
 # v0.14
 
+## Release v0.14.16 - 2017/05/13
+
+### New features / Enhancements
+
+* config: Allow null byte in double-quoted string
+  https://github.com/fluent/fluentd/pull/1552
+* parser: Support %iso8601 special case for time_format
+  https://github.com/fluent/fluentd/pull/1562
+
+### Bug fixes
+
+* out_forward: Call proper method for each connection type
+  https://github.com/fluent/fluentd/pull/1560
+* in_monitor_agent: check variable buffer is a Buffer instance
+  https://github.com/fluent/fluentd/pull/1556
+* log: Add missing '<<' method to delegators
+  https://github.com/fluent/fluentd/pull/1558
+* command: uninitialized constant Fluent::Engine in fluent-binlog-reader
+  https://github.com/fluent/fluentd/pull/1568
+
 ## Release v0.14.15 - 2017/04/23
 
 ### New features / Enhancements

data/MAINTAINERS.md

@@ -0,0 +1,5 @@
+- Sadayuki Furuhashi <frsyuki@gmail.com>
+- Masahiro Nakagawa <repeatedly@gmail.com>
+- Kiyoto Tamura <me@ktamura.com>
+- Kazuki Ohta <kazuki.ohta@gmail.com>
+- Satoshi "Moris" Tagomori <tagomoris@gmail.com>

data/fluentd.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency("msgpack", [">= 0.7.0", "< 2.0.0"])
   gem.add_runtime_dependency("yajl-ruby", ["~> 1.0"])
-  gem.add_runtime_dependency("cool.io", ["~> 1.4.5"])
+  gem.add_runtime_dependency("cool.io", [">= 1.4.5", "< 2.0.0"])
   gem.add_runtime_dependency("serverengine", [">= 2.0.4", "< 3.0.0"])
   gem.add_runtime_dependency("http_parser.rb", [">= 0.5.1", "< 0.7.0"])
   gem.add_runtime_dependency("sigdump", ["~> 0.2.2"])

data/lib/fluent/command/binlog_reader.rb

@@ -21,6 +21,7 @@ require 'fluent/msgpack_factory'
 require 'fluent/formatter'
 require 'fluent/plugin'
 require 'fluent/config/element'
+require 'fluent/engine'
 
 class FluentBinlogReader
   SUBCOMMAND = %w(cat head formats)

data/lib/fluent/config/literal_parser.rb

@@ -181,6 +181,8 @@ module Fluent
           "\f"
         when "b"
           "\b"
+        when "0"
+          "\0"
         when /[a-zA-Z0-9]/
           parse_error! "unexpected back-slash escape character '#{c}'"
         else  # symbols

data/lib/fluent/log.rb

@@ -472,7 +472,7 @@ module Fluent
     extend Forwardable
     def_delegators '@logger', :enable_color?, :enable_debug, :enable_event,
       :disable_events, :log_event_enabled, :log_event_enamed=, :time_format, :time_format=,
-      :event, :caller_line, :puts, :write, :flush, :reset, :out, :out=,
+      :event, :caller_line, :puts, :write, :<<, :flush, :reset, :out, :out=,
       :optional_header, :optional_header=, :optional_attrs, :optional_attrs=
   end
 

data/lib/fluent/plugin/in_forward.rb

@@ -211,7 +211,7 @@ module Fluent::Plugin
           options = on_message(msg, chunk_size, conn)
           if options && r = response(options)
             log.trace "sent response to fluent socket", address: conn.remote_addr, response: r
-            conn.on_write_complete{ conn.close } if @deny_keepalive
+            conn.on(:write_complete) { |c| c.close } if @deny_keepalive
             send_data.call(serializer, r)
           else
             if @deny_keepalive

data/lib/fluent/plugin/in_monitor_agent.rb

@@ -278,8 +278,8 @@ module Fluent::Plugin
 
     MONITOR_INFO = {
       'output_plugin' => ->(){ is_a?(::Fluent::Plugin::Output) },
-      'buffer_queue_length' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil?; @buffer.queue.size },
-      'buffer_total_queued_size' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil?; @buffer.stage_size },
+      'buffer_queue_length' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.queue.size },
+      'buffer_total_queued_size' => ->(){ throw(:skip) unless instance_variable_defined?(:@buffer) && !@buffer.nil? && @buffer.is_a?(::Fluent::Plugin::Buffer); @buffer.stage_size },
       'retry_count' => ->(){ instance_variable_defined?(:@num_errors) ? @num_errors : nil },
     }
 

data/lib/fluent/plugin/out_forward.rb

@@ -420,7 +420,7 @@ module Fluent::Plugin
     # return chunk id to be committed
     def read_ack_from_sock(sock, unpacker)
       begin
-        raw_data = sock.recv(@read_length)
+        raw_data = sock.instance_of?(Fluent::PluginHelper::Socket::WrappedSocket::TLS) ? sock.readpartial(@read_length) : sock.recv(@read_length)
       rescue Errno::ECONNRESET
         raw_data = ""
       end

data/lib/fluent/time.rb

@@ -208,6 +208,7 @@ module Fluent
       @parse = case
                when format_with_timezone && strptime then ->(v){ Fluent::EventTime.from_time(strptime.exec(v)) }
                when format_with_timezone             then ->(v){ Fluent::EventTime.from_time(Time.strptime(v, format)) }
+               when format == '%iso8601'             then ->(v){ Fluent::EventTime.from_time(Time.iso8601(v)) }
                when strptime then ->(v){ t = strptime.exec(v);         Fluent::EventTime.new(t.to_i + offset_diff, t.nsec) }
                when format   then ->(v){ t = Time.strptime(v, format); Fluent::EventTime.new(t.to_i + offset_diff, t.nsec) }
                else ->(v){ Fluent::EventTime.parse(v) }

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.14.15'
+  VERSION = '0.14.16'
 
 end

data/test/config/test_literal_parser.rb

@@ -105,8 +105,8 @@ module Fluent::Config
       test('"\\.t"') { assert_text_parsed_as(".t", '"\\.t"') }
       test('"\\$t"') { assert_text_parsed_as("$t", '"\\$t"') }
       test('"\\"') { assert_text_parsed_as("#t", '"\\#t"') }
+      test('"\\0"') { assert_text_parsed_as("\0", '"\\0"') }
       test('"\\z"') { assert_parse_error('"\\z"') }  # unknown escaped character
-      test('"\\0"') { assert_parse_error('"\\0"') }  # unknown escaped character
       test('"\\1"') { assert_parse_error('"\\1"') }  # unknown escaped character
       test('"t') { assert_parse_error('"t') }  # non-terminated quoted character
       test("\"t\nt\"") { assert_text_parsed_as("t\nt", "\"t\nt\"" ) } # multiline string

data/test/plugin/test_in_monitor_agent.rb

@@ -513,4 +513,58 @@ plugin_id:test_filter\tplugin_category:filter\ttype:test_filter\toutput_plugin:f
       assert_equal("200", get("http://127.0.0.1:#{port}/api/plugins").code)
     end
   end
+
+  sub_test_case "check NoMethodError does not happen" do
+    class FluentTestBufferVariableOutput < ::Fluent::Plugin::Output
+      ::Fluent::Plugin.register_output('test_out_buffer_variable', self)
+      def configure(conf)
+        super
+        @buffer = []
+      end
+
+      def write(chunk)
+      end
+    end
+    class FluentTestBufferVariableFilter < ::Fluent::Plugin::Filter
+      ::Fluent::Plugin.register_filter("test_filter_buffer_variable", self)
+      def initialize
+        super
+        @buffer = {}
+      end
+      def filter(tag, time, record)
+        record
+      end
+    end
+
+    setup do
+      conf = <<-EOC
+<match **>
+  @type test_out_buffer_variable
+  @id test_out_buffer_variable
+</match>
+<filter **>
+  @type test_filter_buffer_variable
+  @id test_filter_buffer_variable
+</filter>
+EOC
+      @ra = Fluent::RootAgent.new(log: $log)
+      stub(Fluent::Engine).root_agent { @ra }
+      @ra = configure_ra(@ra, conf)
+    end
+
+    test "plugins have a variable named buffer does not throws NoMethodError" do
+      port = unused_port
+      d = create_driver("
+  @type monitor_agent
+  bind '127.0.0.1'
+  port #{port}
+  include_config no
+")
+      d.instance.start
+
+      assert_equal("200", get("http://127.0.0.1:#{port}/api/plugins.json").code)
+      assert{ d.logs.none?{|log| log.include?("NoMethodError") } }
+      assert_equal(false, d.instance.instance_variable_get(:@first_warn))
+    end
+  end
 end

data/test/plugin/test_out_forward.rb

@@ -430,6 +430,51 @@ EOL
     assert_empty d.instance.exceptions
   end
 
+  data('ack true' => true,
+       'ack false' => false)
+  test 'TLS transport and ack parameter combination' do |ack|
+    omit "TLS and 'ack false' always fails on AppVeyor. Need to debug" if Fluent.windows? && !ack
+
+    input_conf = TARGET_CONFIG + %[
+                   <transport tls>
+                     insecure true
+                   </transport>
+                 ]
+    target_input_driver = create_target_input_driver(conf: input_conf)
+
+    output_conf = %[
+      send_timeout 5
+      require_ack_response #{ack}
+      transport tls
+      tls_insecure_mode true
+      <server>
+        host #{TARGET_HOST}
+        port #{TARGET_PORT}
+      </server>
+      <buffer>
+        #flush_mode immediate
+        flush_interval 0s
+        flush_at_shutdown false # suppress errors in d.instance_shutdown
+      </buffer>
+    ]
+    @d = d = create_driver(output_conf)
+
+    time = event_time("2011-01-02 13:14:15 UTC")
+    records = [{"a" => 1}, {"a" => 2}]
+    target_input_driver.run(expect_records: 2, timeout: 3) do
+      d.run(default_tag: 'test', wait_flush_completion: false, shutdown: false) do
+        records.each do |record|
+          d.feed(time, record)
+        end
+      end
+    end
+
+    events = target_input_driver.events
+    assert{ events != [] }
+    assert_equal(['test', time, records[0]], events[0])
+    assert_equal(['test', time, records[1]], events[1])
+  end
+
   test 'a destination node not supporting responses by just ignoring' do
     target_input_driver = create_target_input_driver(response_stub: ->(_option) { nil }, disconnect: false)
 

data/test/test_log.rb

@@ -722,6 +722,8 @@ class PluginLoggerTest < Test::Unit::TestCase
 
     def test_write_alias
       assert(@log.respond_to?(:<<))
+      mock(@log.out).write("log")
+      @log << "log"
     end
 
     def test_out

data/test/test_time_parser.rb

@@ -34,6 +34,18 @@ class TimeParserTest < ::Test::Unit::TestCase
     assert_equal_event_time(time, parser.parse('28/Feb/2013:12:00:00:123456789 +0900'))
   end
 
+  def test_parse_iso8601
+    parser = Fluent::TimeParser.new('%iso8601')
+
+    assert(parser.parse('2017-01-01T12:00:00+09:00').is_a?(Fluent::EventTime))
+
+    time = event_time('2017-01-01T12:00:00+09:00')
+    assert_equal(time, parser.parse('2017-01-01T12:00:00+09:00'))
+
+    time_with_msec = event_time('2017-01-01T12:00:00.123+09:00')
+    assert_equal(time_with_msec, parser.parse('2017-01-01T12:00:00.123+09:00'))
+  end
+
   def test_parse_with_invalid_argument
     parser = Fluent::TimeParser.new
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.14.15
+  version: 0.14.16
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-24 00:00:00.000000000 Z
+date: 2017-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -48,16 +48,22 @@ dependencies:
   name: cool.io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: serverengine
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +309,7 @@ files:
 - COPYING
 - ChangeLog
 - Gemfile
+- MAINTAINERS.md
 - README.md
 - Rakefile
 - Vagrantfile