fluentd 1.14.3-x64-mingw32 → 1.14.6-x64-mingw32

data/test/plugin_helper/test_server.rb

@@ -64,6 +64,24 @@ class ServerPluginHelperTest < Test::Unit::TestCase
       end
       assert d.plugin_id
       assert d.log
+      assert_equal 0, d.transport_config.linger_timeout
+    end
+
+    test 'can change linger_timeout option' do
+      d = Dummy.new
+
+      transport_opts = {
+        'linger_timeout' => 1,
+      }
+      transport_conf = config_element('transport', 'tcp', transport_opts)
+      conf = config_element('source', 'tag.*', {}, [transport_conf])
+
+      assert_nothing_raised do
+        d.configure(conf)
+      end
+      assert d.plugin_id
+      assert d.log
+      assert_equal 1, d.transport_config.linger_timeout
     end
   end
 

data/test/plugin_helper/test_timer.rb

@@ -90,8 +90,8 @@ class TimerTest < Test::Unit::TestCase
     assert{ counter1 >= 4 && counter1 <= 5 }
     assert{ counter2 == 2 }
     msg = "Unexpected error raised. Stopping the timer. title=:t2"
-    assert{ d1.log.out.logs.any?{|line| line.include?("[error]:") && line.include?(msg) && line.include?("abort!!!!!!") } }
-    assert{ d1.log.out.logs.any?{|line| line.include?("[error]:") && line.include?("Timer detached. title=:t2") } }
+    assert(d1.log.out.logs.any?{|line| line.include?("[error]:") && line.include?(msg) && line.include?("abort!!!!!!") })
+    assert(d1.log.out.logs.any?{|line| line.include?("[error]:") && line.include?("Timer detached. title=:t2") })
 
     d1.shutdown; d1.close; d1.terminate
   end

data/test/test_event_router.rb

@@ -326,6 +326,23 @@ class EventRouterTest < ::Test::Unit::TestCase
           event_router.emit('test', Engine.now, 'k' => 'v')
         end
       end
+
+      test 'can pass records modified by filters to handle_emits_error' do
+        filter = Class.new(FluentTestFilter) {
+          def filter_stream(_tag, es); end
+        }.new
+        event_router.add_rule('test', filter)
+        event_router.add_rule('test', error_output)
+
+        time = Engine.now
+        modified_es = OneEventStream.new(time, 'modified_label' => 'modified_value')
+
+        assert_rr do
+          stub(filter).filter_stream { modified_es }
+          mock(emit_handler).handle_emits_error('test', modified_es, is_a(RuntimeError))
+          event_router.emit('test', time, 'pre_label' => 'pre_value')
+        end
+      end
     end
   end
 end

data/test/test_formatter.rb

@@ -349,7 +349,7 @@ module FormatterTest
     include FormatterTest
 
     def test_unknown_format
-      assert_raise ConfigError do
+      assert_raise NotFoundPluginError do
         Fluent::Plugin.new_formatter('unknown')
       end
     end

data/test/test_supervisor.rb

@@ -213,16 +213,22 @@ class SupervisorTest < ::Test::Unit::TestCase
     $log.out.reset if $log && $log.out && $log.out.respond_to?(:reset)
   end
 
-  def test_rpc_server
+  data(:ipv4 => ["0.0.0.0", "127.0.0.1", false],
+       :ipv6 => ["[::]", "[::1]", true],
+       :localhost_ipv4 => ["localhost", "127.0.0.1", false])
+  def test_rpc_server(data)
     omit "Windows cannot handle signals" if Fluent.windows?
 
+    bindaddr, localhost, ipv6 = data
+    omit "IPv6 is not supported on this environment" if ipv6 && !ipv6_enabled?
+
     create_info_dummy_logger
 
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)
     conf_data = <<-EOC
   <system>
-    rpc_endpoint 0.0.0.0:24447
+    rpc_endpoint "#{bindaddr}:24447"
   </system>
     EOC
     conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
@@ -235,7 +241,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     server.run_rpc_server
 
     sv.send(:install_main_process_signal_handlers)
-    response = Net::HTTP.get(URI.parse('http://127.0.0.1:24447/api/plugins.flushBuffers'))
+    response = Net::HTTP.get(URI.parse("http://#{localhost}:24447/api/plugins.flushBuffers"))
     info_msg = '[info]: force flushing buffered events' + "\n"
 
     server.stop_rpc_server
@@ -250,16 +256,45 @@ class SupervisorTest < ::Test::Unit::TestCase
     $log.out.reset if $log.out.is_a?(Fluent::Test::DummyLogDevice)
   end
 
-  def test_rpc_server_windows
+  data(:no_port => ["127.0.0.1"],
+       :invalid_addr => ["*:24447"])
+  def test_invalid_rpc_endpoint(data)
+    endpoint = data[0]
+
+    opts = Fluent::Supervisor.default_options
+    sv = Fluent::Supervisor.new(opts)
+    conf_data = <<-EOC
+  <system>
+    rpc_endpoint "#{endpoint}"
+  </system>
+    EOC
+    conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
+    sys_conf = sv.__send__(:build_system_config, conf)
+
+    server = DummyServer.new
+    server.rpc_endpoint = sys_conf.rpc_endpoint
+
+    assert_raise(Fluent::ConfigError.new("Invalid rpc_endpoint: #{endpoint}")) do
+      server.run_rpc_server
+    end
+  end
+
+  data(:ipv4 => ["0.0.0.0", "127.0.0.1", false],
+       :ipv6 => ["[::]", "[::1]", true],
+       :localhost_ipv4 => ["localhost", "127.0.0.1", true])
+  def test_rpc_server_windows(data)
     omit "Only for windows platform" unless Fluent.windows?
 
+    bindaddr, localhost, ipv6 = data
+    omit "IPv6 is not supported on this environment" if ipv6 && !ipv6_enabled?
+
     create_info_dummy_logger
 
     opts = Fluent::Supervisor.default_options
     sv = Fluent::Supervisor.new(opts)
     conf_data = <<-EOC
   <system>
-    rpc_endpoint 0.0.0.0:24447
+    rpc_endpoint "#{bindaddr}:24447"
   </system>
     EOC
     conf = Fluent::Config.parse(conf_data, "(test)", "(test_dir)", true)
@@ -277,7 +312,7 @@ class SupervisorTest < ::Test::Unit::TestCase
     server.run_rpc_server
 
     mock(server).restart(true) { nil }
-    response = Net::HTTP.get(URI.parse('http://127.0.0.1:24447/api/plugins.flushBuffers'))
+    response = Net::HTTP.get(URI.parse("http://#{localhost}:24447/api/plugins.flushBuffers"))
 
     server.stop_rpc_server
     assert_equal('{"ok":true}', response)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.6
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -94,7 +94,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 2.2.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -428,6 +428,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
@@ -1035,7 +1049,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector