fluentd 1.8.0.rc1 → 1.8.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c1ecaaf9a3cd9d2ff59843b0c6fa388aa9afe180684b0cc0e51045f2509d2a4
-  data.tar.gz: 7c5a881eb1ed5b87b9aa3e74deb792a3d1fc57e85a26b900a10c15a2966d6762
+  metadata.gz: 0c70380cd4a9f0f78150f7332a5e484a9f9523786fabae5c1bda5761cf21617e
+  data.tar.gz: 65e167aa06b31cc5aebce1e8d1bbb61d80e8e1ae9e1690dd58dc799f51683503
 SHA512:
-  metadata.gz: a21f1004723f63ae0ae306e36446ee3324f0d1dce404780bd42e71b7a935a357806482f94c8381ec8e3220aa9d27756b80aa8e05acf7d4a3e59b11dfcedf9387
-  data.tar.gz: d1789835f28d427233aa489032fd389ad890dea347a3fa4bae7ec4e21bb7341395fbabddcd9008ef3bcd6ea7343a6a1a68e20cdda93f3959554df0d09474fc19
+  metadata.gz: f19fccb4e6d84dec936215ef8388d650a5063f30e0456c9aae5f47d2d0f1b73b86f01c95fc7e3d30e939b3d72e4224fcc5c8c1d69f59a0db7fc64b239cd9f8a2
+  data.tar.gz: dd4d743c7d1d73199c35458ba3cb09e1dd6dda5a49b2f30575d6696f573909b642b1e860687a2e6bec8575db14869cfa29039cb472eb75b00abfb944bf368e0a

data/CHANGELOG.md

@@ -11,17 +11,26 @@
   https://github.com/fluent/fluentd/pull/2643
 * record_accessor helper: Make code simple and bit faster
   https://github.com/fluent/fluentd/pull/2660
+* Relax tzinfo dependency to accept v1
+  https://github.com/fluent/fluentd/pull/2673
 * clean up internal classes / code
   https://github.com/fluent/fluentd/pull/2647
   https://github.com/fluent/fluentd/pull/2648
   https://github.com/fluent/fluentd/pull/2653
   https://github.com/fluent/fluentd/pull/2654
   https://github.com/fluent/fluentd/pull/2657
+  https://github.com/fluent/fluentd/pull/2667
 
 ### Bug fixes
 
 * suppress warning
   https://github.com/fluent/fluentd/pull/2652
+* suppress keyword argument warning for ruby2.7
+  https://github.com/fluent/fluentd/pull/2664
+* RPC: Fix debug log text
+  https://github.com/fluent/fluentd/pull/2666
+* time: Properly show class names in error message
+  https://github.com/fluent/fluentd/pull/2671
 
 
 # v1.7

data/fluentd.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |gem|
   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"])
-  gem.add_runtime_dependency("tzinfo", ["~> 2.0"])
+  gem.add_runtime_dependency("tzinfo", [">= 1.0", "< 3.0"])
   gem.add_runtime_dependency("tzinfo-data", ["~> 1.0"])
   gem.add_runtime_dependency("strptime", [">= 0.2.2", "< 1.0.0"])
   gem.add_runtime_dependency("dig_rb", ["~> 1.0.0"])

data/lib/fluent/command/fluentd.rb

@@ -162,7 +162,7 @@ op.on('--conf-encoding ENCODING', "specify configuration file encoding") { |s|
 if Fluent.windows?
   require 'windows/library'
   include Windows::Library
-  
+
   opts.merge!(
     :winsvc_name => 'fluentdwinsvc',
     :winsvc_display_name => 'Fluentd Windows Service',
@@ -184,15 +184,15 @@ if Fluent.windows?
   op.on('--reg-winsvc-fluentdopt OPTION', "specify fluentd option parameters for Windows Service. (Windows only)") {|s|
     opts[:fluentdopt] = s
   }
-  
+
   op.on('--winsvc-name NAME', "The Windows Service name to run as (Windows only)") {|s|
     opts[:winsvc_name] = s
   }
-  
+
   op.on('--winsvc-display-name DISPLAY_NAME', "The Windows Service display name (Windows only)") {|s|
     opts[:winsvc_display_name] = s
   }
-  
+
   op.on('--winsvc-desc DESC', "The Windows Service description (Windows only)") {|s|
     opts[:winsvc_desc] = s
   }
@@ -268,7 +268,7 @@ if winsvcinstmode = opts[:regwinsvc]
       start_service = true
     end
 
-    
+
     Service.create(
       service_name: opts[:winsvc_name],
       host: nil,

data/lib/fluent/config/configure_proxy.rb

@@ -117,9 +117,9 @@ module Fluent
 
         merged = if self.root?
                    options[:root] = true
-                   self.class.new(other.name, options)
+                   self.class.new(other.name, **options)
                  else
-                   self.class.new(@name, options)
+                   self.class.new(@name, **options)
                  end
 
         # configured_in MUST be kept
@@ -172,9 +172,9 @@ module Fluent
 
         merged = if self.root?
                    options[:root] = true
-                   self.class.new(other.name, options)
+                   self.class.new(other.name, **options)
                  else
-                   self.class.new(@name, options)
+                   self.class.new(@name, **options)
                  end
 
         merged.configured_in_section = self.configured_in_section || other.configured_in_section

data/lib/fluent/engine.rb

@@ -22,6 +22,7 @@ require 'fluent/root_agent'
 require 'fluent/time'
 require 'fluent/system_config'
 require 'fluent/plugin'
+require 'fluent/fluent_log_event_router'
 
 module Fluent
   class EngineClass
@@ -30,19 +31,14 @@ module Fluent
 
     def initialize
       @root_agent = nil
-      @default_loop = nil
       @engine_stopped = false
       @_worker_id = nil
 
-      @log_event_router = nil
-      @log_emit_thread = nil
-      @log_event_loop_stop = false
-      @log_event_loop_graceful_stop = false
-      @log_event_queue = []
       @log_event_verbose = false
-
       @suppress_config_dump = false
+      @without_source = false
 
+      @fluent_log_event_router = nil
       @system_config = SystemConfig.new
 
       @dry_run_mode = false
@@ -50,13 +46,7 @@ module Fluent
 
     MAINLOOP_SLEEP_INTERVAL = 0.3
 
-    MATCH_CACHE_SIZE = 1024
-    LOG_EMIT_INTERVAL = 0.1
-
-    attr_reader :root_agent
-    attr_reader :matches, :sources
-    attr_reader :system_config
-
+    attr_reader :root_agent, :system_config
     attr_accessor :dry_run_mode
 
     def init(system_config)
@@ -116,43 +106,14 @@ module Fluent
     end
 
     def configure(conf)
-      # plugins / configuration dumps
-      Gem::Specification.find_all.select{|x| x.name =~ /^fluent(d|-(plugin|mixin)-.*)$/}.each do |spec|
-        $log.info :worker0, "gem '#{spec.name}' version '#{spec.version}'"
-      end
-
       @root_agent.configure(conf)
 
-      begin
-        log_event_agent = @root_agent.find_label(Fluent::Log::LOG_EVENT_LABEL)
-        log_event_router = log_event_agent.event_router
-
-        # suppress mismatched tags only for <label @FLUENT_LOG> label.
-        # it's not suppressed in default event router for non-log-event events
-        log_event_router.suppress_missing_match!
+      @fleunt_log_event_router = FluentLogEventRouter.build(@root_agent)
 
-        @log_event_router = log_event_router
-
-        unmatched_tags = Fluent::Log.event_tags.select{|t| !@log_event_router.match?(t) }
-        unless unmatched_tags.empty?
-          $log.warn "match for some tags of log events are not defined (to be ignored)", tags: unmatched_tags
-        end
-      rescue ArgumentError # ArgumentError "#{label_name} label not found"
-        # use default event router if <label @FLUENT_LOG> is missing in configuration
-        log_event_router = @root_agent.event_router
-
-        if Fluent::Log.event_tags.any?{|t| log_event_router.match?(t) }
-          @log_event_router = log_event_router
-
-          unmatched_tags = Fluent::Log.event_tags.select{|t| !@log_event_router.match?(t) }
-          unless unmatched_tags.empty?
-            $log.warn "match for some tags of log events are not defined (to be ignored)", tags: unmatched_tags
-          end
-        end
+      if @fleunt_log_event_router.emittable?
+        $log.enable_event(true)
       end
 
-      $log.enable_event(true) if @log_event_router
-
       unless @suppress_config_dump
         $log.info :supervisor, "using configuration file: #{conf.to_s.rstrip}"
       end
@@ -183,39 +144,12 @@ module Fluent
       Fluent::EventTime.now
     end
 
-    def log_event_loop
-      $log.disable_events(Thread.current)
-
-      while sleep(LOG_EMIT_INTERVAL)
-        break if @log_event_loop_stop
-        break if @log_event_loop_graceful_stop && @log_event_queue.empty?
-        next if @log_event_queue.empty?
-
-        # NOTE: thead-safe of slice! depends on GVL
-        events = @log_event_queue.slice!(0..-1)
-        next if events.empty?
-
-        events.each {|tag,time,record|
-          begin
-            @log_event_router.emit(tag, time, record)
-          rescue => e
-            # This $log.error doesn't emit log events, because of `$log.disable_events(Thread.current)` above
-            $log.error "failed to emit fluentd's log event", tag: tag, event: record, error: e
-          end
-        }
-      end
-    end
-
     def run
       begin
         $log.info "starting fluentd worker", pid: Process.pid, ppid: Process.ppid, worker: worker_id
         start
 
-        if @log_event_router
-          $log.enable_event(true)
-          @log_emit_thread = Thread.new(&method(:log_event_loop))
-          @log_emit_thread.abort_on_exception = true
-        end
+        @fleunt_log_event_router.start
 
         $log.info "fluentd worker is now running", worker: worker_id
         sleep MAINLOOP_SLEEP_INTERVAL until @engine_stopped
@@ -229,19 +163,12 @@ module Fluent
 
       unless @log_event_verbose
         $log.enable_event(false)
-        if @log_emit_thread
-          # to make sure to emit all log events into router, before shutting down
-          @log_event_loop_graceful_stop = true
-          @log_emit_thread.join
-          @log_emit_thread = nil
-        end
+        @fleunt_log_event_router.graceful_stop
       end
       $log.info "shutting down fluentd worker", worker: worker_id
       shutdown
-      if @log_emit_thread
-        @log_event_loop_stop = true
-        @log_emit_thread.join
-      end
+
+      @fleunt_log_event_router.stop
     end
 
     def stop
@@ -250,8 +177,7 @@ module Fluent
     end
 
     def push_log_event(tag, time, record)
-      return if @log_emit_thread.nil?
-      @log_event_queue.push([tag, time, record])
+      @fleunt_log_event_router.emit_event([tag, time, record])
     end
 
     def worker_id

data/lib/fluent/fluent_log_event_router.rb

@@ -0,0 +1,137 @@
+#
+# 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/log'
+
+module Fluent
+  # DO NOT write any logic here
+  class NullFluentLogEventRouter
+    def start; end
+
+    def stop; end
+
+    def graceful_stop; end
+
+    def emit_event(_event); end
+
+    def emittable?
+      self.class != NullFluentLogEventRouter
+    end
+  end
+
+  # This class is for handling fluentd's inner log
+  # e.g. <label @FLUNT_LOG> section and <match fluent.**> section
+  class FluentLogEventRouter < NullFluentLogEventRouter
+    # @param root_agent [Fluent::RootAgent]
+    def self.build(root_agent)
+      log_event_router = nil
+
+      begin
+        log_event_agent = root_agent.find_label(Fluent::Log::LOG_EVENT_LABEL)
+        log_event_router = log_event_agent.event_router
+
+        # suppress mismatched tags only for <label @FLUENT_LOG> label.
+        # it's not suppressed in default event router for non-log-event events
+        log_event_router.suppress_missing_match!
+
+        log_event_router = log_event_router
+
+        unmatched_tags = Fluent::Log.event_tags.select { |t| !log_event_router.match?(t) }
+        unless unmatched_tags.empty?
+          $log.warn "match for some tags of log events are not defined (to be ignored)", tags: unmatched_tags
+        end
+
+      rescue ArgumentError # ArgumentError "#{label_name} label not found"
+        # use default event router if <label @FLUENT_LOG> is missing in configuration
+        root_log_event_router = root_agent.event_router
+
+        if Fluent::Log.event_tags.any? { |t| root_log_event_router.match?(t) }
+          log_event_router = root_log_event_router
+
+          unmatched_tags = Fluent::Log.event_tags.select { |t| !log_event_router.match?(t) }
+          unless unmatched_tags.empty?
+            $log.warn "match for some tags of log events are not defined (to be ignored)", tags: unmatched_tags
+          end
+        end
+      end
+
+      if log_event_router
+        FluentLogEventRouter.new(log_event_router)
+      else
+        $log.debug('No fluent logger for internal event')
+        NullFluentLogEventRouter.new
+      end
+    end
+
+    STOP = :stop
+    GRACEFUL_STOP = :graceful_stop
+
+    # @param event_router [Fluent::EventRouter]
+    def initialize(event_router)
+      @event_router = event_router
+      @thread = nil
+      @graceful_stop = false
+      @event_queue = Queue.new
+    end
+
+    def start
+      @thread = Thread.new do
+        $log.disable_events(Thread.current)
+
+        loop do
+          event = @event_queue.pop
+
+          case event
+          when GRACEFUL_STOP
+            @graceful_stop = true
+          when STOP
+            break
+          else
+            begin
+              tag, time, record = event
+              @event_router.emit(tag, time, record)
+            rescue => e
+              # This $log.error doesn't emit log events, because of `$log.disable_events(Thread.current)` above
+              $log.error "failed to emit fluentd's log event", tag: tag, event: record, error: e
+            end
+          end
+
+          if @graceful_stop && @event_queue.empty?
+            break
+          end
+        end
+      end
+
+      @thread.abort_on_exception = true
+    end
+
+    def stop
+      @event_queue.push(STOP)
+      # there is no problem calling Thread#join multiple times.
+      @thread && @thread.join
+    end
+
+    def graceful_stop
+      # to make sure to emit all log events into router, before shutting down
+      @event_queue.push(GRACEFUL_STOP)
+      @thread && @thread.join
+    end
+
+    def emit_event(event)
+      @event_queue.push(event)
+    end
+  end
+end

data/lib/fluent/plugin/buffer/chunk.rb

@@ -202,7 +202,7 @@ module Fluent
             if kwargs[:compressed] == :gzip
               super
             else
-              super(kwargs) do |chunk_io|
+              super(**kwargs) do |chunk_io|
                 output_io = if chunk_io.is_a?(StringIO)
                               StringIO.new
                             else

data/lib/fluent/plugin/formatter_csv.rb

@@ -56,7 +56,7 @@ module Fluent
       end
 
       def format(tag, time, record)
-        csv = (@cache[Thread.current] ||= CSV.new("".force_encoding(Encoding::ASCII_8BIT), @generate_opts))
+        csv = (@cache[Thread.current] ||= CSV.new("".force_encoding(Encoding::ASCII_8BIT), **@generate_opts))
         line = (csv << record).string.dup
         # Need manual cleanup because CSV writer doesn't provide such method.
         csv.rewind
@@ -65,7 +65,7 @@ module Fluent
       end
 
       def format_with_nested_fields(tag, time, record)
-        csv = (@cache[Thread.current] ||= CSV.new("".force_encoding(Encoding::ASCII_8BIT), @generate_opts))
+        csv = (@cache[Thread.current] ||= CSV.new("".force_encoding(Encoding::ASCII_8BIT), **@generate_opts))
         values = @accessors.map { |a| a.call(record) }
         line = (csv << values).string.dup
         # Need manual cleanup because CSV writer doesn't provide such method.

data/lib/fluent/plugin_helper/child_process.rb

@@ -267,19 +267,19 @@ module Fluent
         end
 
         if mode.include?(:write)
-          writeio.set_encoding(external_encoding, internal_encoding, encoding_options)
+          writeio.set_encoding(external_encoding, internal_encoding, **encoding_options)
           writeio_in_use = true
         else
           writeio.reopen(IO::NULL) if writeio
         end
         if mode.include?(:read) || mode.include?(:read_with_stderr)
-          readio.set_encoding(external_encoding, internal_encoding, encoding_options)
+          readio.set_encoding(external_encoding, internal_encoding, **encoding_options)
           readio_in_use = true
         else
           readio.reopen(IO::NULL) if readio
         end
         if mode.include?(:stderr)
-          stderrio.set_encoding(external_encoding, internal_encoding, encoding_options)
+          stderrio.set_encoding(external_encoding, internal_encoding, **encoding_options)
           stderrio_in_use = true
         else
           stderrio.reopen(IO::NULL) if stderrio && stderr == :discard

data/lib/fluent/plugin_helper/extract.rb

@@ -55,7 +55,7 @@ module Fluent
           config_param :time_type, :enum, list: [:float, :unixtime, :string], default: :float
 
           Fluent::TimeMixin::TIME_PARAMETERS.each do |name, type, opts|
-            config_param name, type, opts
+            config_param(name, type, **opts)
           end
         end
       end

data/lib/fluent/plugin_helper/inject.rb

@@ -79,7 +79,7 @@ module Fluent
           config_param :time_type, :enum, list: [:float, :unixtime, :string], default: :float
 
           Fluent::TimeMixin::TIME_PARAMETERS.each do |name, type, opts|
-            config_param name, type, opts
+            config_param(name, type, **opts)
           end
         end
       end

data/lib/fluent/plugin_helper/server.rb

@@ -690,9 +690,9 @@ module Fluent
           end
 
           if RUBY_VERSION.to_f >= 2.3
-            NONBLOCK_ARG = {exception: false}
+            NONBLOCK_ARG = { exception: false }
             def try_handshake
-              @_handler_socket.accept_nonblock(NONBLOCK_ARG)
+              @_handler_socket.accept_nonblock(**NONBLOCK_ARG)
             end
           else
             def try_handshake

data/lib/fluent/supervisor.rb

@@ -121,7 +121,7 @@ module Fluent
       }
 
       @rpc_server.mount_proc('/api/config.getDump') { |req, res|
-        $log.debug "fluentd RPC got /api/config.dump request"
+        $log.debug "fluentd RPC got /api/config.getDump request"
         $log.info "get dump in-memory config via HTTP"
         res.body = supervisor_get_dump_config_handler
         [nil, nil, res]
@@ -586,7 +586,7 @@ module Fluent
         Fluent::Engine.dry_run_mode = true
         change_privilege
         MessagePackFactory.init
-        init_engine
+        init_engine(supervisor: true)
         run_configure
       rescue Fluent::ConfigError => e
         $log.error "config error", file: @config_path, error: e
@@ -794,7 +794,7 @@ module Fluent
       ServerEngine::Privilege.change(@chuser, @chgroup)
     end
 
-    def init_engine
+    def init_engine(supervisor: false)
       Fluent::Engine.init(@system_config)
 
       @libs.each {|lib|
@@ -807,6 +807,13 @@ module Fluent
           Fluent::Engine.add_plugin_dir(dir)
         end
       }
+
+      if supervisor
+        # plugins / configuration dumps
+        Gem::Specification.find_all.select { |x| x.name =~ /^fluent(d|-(plugin|mixin)-.*)$/ }.each do |spec|
+          $log.info("gem '#{spec.name}' version '#{spec.version}'")
+        end
+      end
     end
 
     def run_configure

data/lib/fluent/test/driver/base_owned.rb

@@ -53,13 +53,26 @@ module Fluent
           @section_name = ''
         end
 
-        def configure(conf, syntax: :v1)
+        def configure(conf)
           if conf.is_a?(Fluent::Config::Element)
             @config = conf
           elsif conf.is_a?(Hash)
             @config = Fluent::Config::Element.new(@section_name, "", Hash[conf.map{|k,v| [k.to_s, v]}], [])
           else
-            @config = Fluent::Config.parse(conf, @section_name, "", syntax: syntax)
+            @config = Fluent::Config.parse(conf, @section_name, "", syntax: :v1)
+          end
+          @instance.configure(@config)
+          self
+        end
+
+        # this is special method for v0 and should be deleted
+        def configure_v0(conf)
+          if conf.is_a?(Fluent::Config::Element)
+            @config = conf
+          elsif conf.is_a?(Hash)
+            @config = Fluent::Config::Element.new(@section_name, "", Hash[conf.map{|k,v| [k.to_s, v]}], [])
+          else
+            @config = Fluent::Config.parse(conf, @section_name, "", syntax: :v0)
           end
           @instance.configure(@config)
           self

data/lib/fluent/time.rb

@@ -147,7 +147,7 @@ module Fluent
     module TimeParameters
       include Fluent::Configurable
       TIME_FULL_PARAMETERS.each do |name, type, opts|
-        config_param name, type, opts
+        config_param(name, type, **opts)
       end
 
       def configure(conf)
@@ -292,7 +292,7 @@ module Fluent
 
     def parse_unixtime(value)
       unless value.is_a?(String) || value.is_a?(Numeric)
-        raise TimeParseError, "value must be a string or a number: #{value}(value.class)"
+        raise TimeParseError, "value must be a string or a number: #{value}(#{value.class})"
       end
 
       if @cache1_key == value
@@ -323,7 +323,7 @@ module Fluent
     ## parse_by_to_r  (msec): 28.232856 sec
     def parse_float(value)
       unless value.is_a?(String) || value.is_a?(Numeric)
-        raise TimeParseError, "value must be a string or a number: #{value}(value.class)"
+        raise TimeParseError, "value must be a string or a number: #{value}(#{value.class})"
       end
 
       if @cache1_key == value

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.8.0.rc1'
+  VERSION = '1.8.0.rc2'
 
 end

data/test/counter/test_client.rb

@@ -128,7 +128,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     test 'raise an error when @scope is nil' do
       @client.instance_variable_set(:@scope, nil)
       assert_raise 'Call `establish` method to get a `scope` before calling this method' do
-        @client.init(name: 'key1', reset_interval: 10).get
+        params = { name: 'key1', reset_interval: 10 }
+        @client.init(params).get
       end
     end
 
@@ -151,7 +152,8 @@ class CounterClientTest < ::Test::Unit::TestCase
       ]
     )
     test 'return an error object' do |(param, expected_error)|
-      @client.init(:name => 'key1', :reset_interval => 10).get
+      params = { name: 'key1', reset_interval: 10 }
+      @client.init(params).get
       response = @client.init(param).get
       errors = response.errors.first
 
@@ -164,7 +166,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     end
 
     test 'return an existing value when passed key already exists and ignore option is true' do
-      res1 = @client.init(name: 'key1', reset_interval: 10).get
+      params = { name: 'key1', reset_interval: 10 }
+      res1 = @client.init(params).get
       res2 = nil
       assert_nothing_raised do
         res2 = @client.init({ name: 'key1', reset_interval: 10 }, options: { ignore: true }).get
@@ -312,7 +315,8 @@ class CounterClientTest < ::Test::Unit::TestCase
     test 'raise an error when @scope is nil' do
       @client.instance_variable_set(:@scope, nil)
       assert_raise 'Call `establish` method to get a `scope` before calling this method' do
-        @client.inc(name: 'name', value: 1).get
+        params = { name: 'name', value: 1 }
+        @client.inc(params).get
       end
     end
 

data/test/test_fluent_log_event_router.rb

@@ -0,0 +1,99 @@
+require_relative 'helper'
+require 'fluent/fluent_log_event_router'
+require 'fluent/root_agent'
+require 'fluent/system_config'
+
+class FluentLogEventRouterTest < ::Test::Unit::TestCase
+  # @param config [String]
+  def build_config(config)
+    Fluent::Config.parse(config, 'fluent_log_event', '', syntax: :v1)
+  end
+
+  sub_test_case 'NullFluentLogEventRouter does nothing' do
+    test 'emittable? returns false but others does nothing' do
+      null_event_router = Fluent::NullFluentLogEventRouter.new
+      null_event_router.start
+      null_event_router.stop
+      null_event_router.graceful_stop
+      null_event_router.emit_event(nil)
+      assert_false null_event_router.emittable?
+    end
+  end
+
+  sub_test_case '#build' do
+    test 'NullFluentLogEventRouter if root_agent have not internal logger' do
+      root_agent = Fluent::RootAgent.new(log: $log, system_config: Fluent::SystemConfig.new)
+      root_agent.configure(build_config(''))
+
+      d = Fluent::FluentLogEventRouter.build(root_agent)
+      assert_equal Fluent::NullFluentLogEventRouter, d.class
+    end
+
+    test 'FluentLogEventRouter if <match fluent.*> exists in config' do
+      root_agent = Fluent::RootAgent.new(log: $log, system_config: Fluent::SystemConfig.new)
+      root_agent.configure(build_config(<<-CONFIG))
+        <match fluent.*>
+          @type null
+        </match>
+      CONFIG
+
+      d = Fluent::FluentLogEventRouter.build(root_agent)
+      assert_equal Fluent::FluentLogEventRouter, d.class
+    end
+
+    test 'FluentLogEventRouter if <label @FLUENT_LOG> exists in config' do
+      root_agent = Fluent::RootAgent.new(log: $log, system_config: Fluent::SystemConfig.new)
+      root_agent.configure(build_config(<<-CONFIG))
+       <label @FLUENT_LOG>
+         <match *>
+           @type null
+         </match>
+        </label>
+      CONFIG
+
+      d = Fluent::FluentLogEventRouter.build(root_agent)
+      assert_equal Fluent::FluentLogEventRouter, d.class
+    end
+  end
+
+  test 'when calling graceful_stop, it flushes all events' do
+    event_router = []
+    stub(event_router).emit do |tag, time, record|
+      event_router.push([tag, time, record])
+    end
+
+    d = Fluent::FluentLogEventRouter.new(event_router)
+
+    t = Time.now
+    msg = ['tag', t, { 'key' => 'value' }]
+    d.emit_event(msg)
+    d.graceful_stop
+    d.emit_event(msg)
+    d.start
+
+    d.graceful_stop # to call join
+    assert_equal 2, event_router.size
+    assert_equal msg, event_router[0]
+    assert_equal msg, event_router[1]
+  end
+
+  test 'when calling stop, it ignores existing events' do
+    event_router = []
+    stub(event_router).emit do |tag, time, record|
+      event_router.push([tag, time, record])
+    end
+
+    d = Fluent::FluentLogEventRouter.new(event_router)
+
+    t = Time.now
+    msg = ['tag', t, { 'key' => 'value' }]
+    d.emit_event(msg)
+    d.stop
+    d.emit_event(msg)
+    d.start
+
+    d.stop # to call join
+    assert_equal 1, event_router.size
+    assert_equal msg, event_router[0]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.8.0.rc1
+  version: 1.8.0.rc2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -122,16 +122,22 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -457,6 +463,7 @@ files:
 - lib/fluent/event.rb
 - lib/fluent/event_router.rb
 - lib/fluent/filter.rb
+- lib/fluent/fluent_log_event_router.rb
 - lib/fluent/formatter.rb
 - lib/fluent/input.rb
 - lib/fluent/label.rb
@@ -797,6 +804,7 @@ files:
 - test/test_event_router.rb
 - test/test_event_time.rb
 - test/test_filter.rb
+- test/test_fluent_log_event_router.rb
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb
@@ -999,6 +1007,7 @@ test_files:
 - test/test_event_router.rb
 - test/test_event_time.rb
 - test/test_filter.rb
+- test/test_fluent_log_event_router.rb
 - test/test_formatter.rb
 - test/test_input.rb
 - test/test_log.rb