fluentd 1.16.1-x64-mingw32 → 1.16.3-x64-mingw32

data/test/plugin/test_output_as_buffered.rb

@@ -510,7 +510,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]') }.size == 0 }
+      assert{ logs.count{|log| log.include?('[warn]') } == 0 }
     end
 
     test 'a warning reported with 4 chunk keys' do
@@ -522,7 +522,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       @i.after_start
       assert_equal ['key1', 'key2', 'key3', 'key4'], @i.chunk_keys
 
-      assert{ logs.select{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') }.size == 1 }
+      assert{ logs.count{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') } == 1 }
     end
 
     test 'a warning reported with 4 chunk keys including "tag"' do
@@ -531,7 +531,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start # this calls `log.reset`... capturing logs about configure must be done before this line
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') }.size == 1 }
+      assert{ logs.count{|log| log.include?('[warn]: many chunk keys specified, and it may cause too many chunks on your system.') } == 1 }
     end
 
     test 'time key is not included for warned chunk keys' do
@@ -540,7 +540,7 @@ class BufferedOutputTest < Test::Unit::TestCase
       logs = @i.log.out.logs.dup
       @i.start
       @i.after_start
-      assert{ logs.select{|log| log.include?('[warn]') }.size == 0 }
+      assert{ logs.count{|log| log.include?('[warn]') } == 0 }
     end
   end
 
@@ -968,8 +968,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       waiting(4){ sleep 0.1 until ary.size == 3 }
 
       assert_equal 3, ary.size
-      assert_equal 2, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 1, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 2, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 1, ary.count{|e| e[0] == "test.tag.2" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:04 +0900') )
 
@@ -985,8 +985,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 1 && @i.write_count == 2 }
 
       assert_equal 9, ary.size
-      assert_equal 7, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 2, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 7, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 2, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1224,8 +1224,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:09 +0900') )
 
@@ -1249,8 +1249,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.write_count == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1315,8 +1315,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       @i.stop
       @i.before_shutdown
@@ -1330,8 +1330,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.buffer.queue.size == 0 && @i.write_count == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1435,8 +1435,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
       assert ary[0...5].all?{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
 
       Timecop.freeze( Time.parse('2016-04-13 14:04:09 +0900') )
@@ -1465,11 +1465,11 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.write_count == 4 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
-      assert_equal 6, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }.size
-      assert_equal 3, ary.select{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }.size
-      assert_equal 2, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
+      assert_equal 6, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
+      assert_equal 3, ary.count{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }
+      assert_equal 2, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1525,8 +1525,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       @i.stop
       @i.before_shutdown
@@ -1540,11 +1540,11 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.stage.size == 0 && @i.buffer.queue.size == 0 && @i.write_count == 4 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
-      assert_equal 6, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }.size
-      assert_equal 3, ary.select{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }.size
-      assert_equal 2, ary.select{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
+      assert_equal 6, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "a" }
+      assert_equal 3, ary.count{|e| e[2]["name"] == "yyy" && e[2]["service"] == "a" }
+      assert_equal 2, ary.count{|e| e[2]["name"] == "xxx" && e[2]["service"] == "b" }
 
       assert metachecks.all?{|e| e }
     end
@@ -1683,8 +1683,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1716,8 +1716,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.dequeued.size == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 3, chunks.size
       assert chunks.all?{|c| !c.empty? }
@@ -1802,8 +1802,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1835,8 +1835,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.buffer.dequeued.size == 3 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 3, chunks.size
       assert chunks.all?{|c| !c.empty? }
@@ -1892,8 +1892,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       assert{ @i.write_count == 7 }
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
       assert{ chunks.size == 3 }
       assert{ chunks.all?{|c| !c.empty? } }
 
@@ -1963,8 +1963,8 @@ class BufferedOutputTest < Test::Unit::TestCase
 
       # events fulfills a chunk (and queued immediately)
       assert_equal 5, ary.size
-      assert_equal 5, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 0, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 5, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 0, ary.count{|e| e[0] == "test.tag.2" }
 
       assert_equal 1, chunks.size
       assert !chunks.first.empty?
@@ -1999,8 +1999,8 @@ class BufferedOutputTest < Test::Unit::TestCase
       assert{ @i.rollback_count == 0 }
 
       assert_equal 11, ary.size
-      assert_equal 8, ary.select{|e| e[0] == "test.tag.1" }.size
-      assert_equal 3, ary.select{|e| e[0] == "test.tag.2" }.size
+      assert_equal 8, ary.count{|e| e[0] == "test.tag.1" }
+      assert_equal 3, ary.count{|e| e[0] == "test.tag.2" }
 
       assert{ chunks.size == 3 }
       assert{ chunks.all?{|c| !c.empty? } }

data/test/plugin/test_output_as_buffered_retries.rb

@@ -93,7 +93,7 @@ class BufferedOutputRetryTest < Test::Unit::TestCase
   end
   def get_log_time(msg, logs)
     log_time = nil
-    log = logs.select{|l| l.include?(msg) }.first
+    log = logs.find{|l| l.include?(msg) }
     if log && /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} [-+]\d{4}) \[error\]/ =~ log
       log_time = Time.parse($1)
     end

data/test/plugin/test_output_as_buffered_secondary.rb

@@ -634,8 +634,8 @@ class BufferedOutputSecondaryTest < Test::Unit::TestCase
 
       assert @i.retry
       logs = @i.log.out.logs
-      waiting(4){ sleep 0.1 until logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
-      assert{ logs.select{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") }.size == 2 }
+      waiting(4){ sleep 0.1 until logs.count{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") } == 2 }
+      assert{ logs.count{|l| l.include?("[warn]: failed to flush the buffer chunk, timeout to commit.") } == 2 }
     end
 
     test 'retry_wait for secondary is same with one for primary' do

data/test/plugin_helper/test_child_process.rb

@@ -559,7 +559,7 @@ class ChildProcessTest < Test::Unit::TestCase
   unless Fluent.windows?
     test 'can specify subprocess name' do
       io = IO.popen([["cat", "caaaaaaaaaaat"], '-'])
-      process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.select{|line| line.include?("caaaaaaaaaaat") }.size > 0)
+      process_naming_enabled = (open("|ps opid,cmd"){|_io| _io.readlines }.count{|line| line.include?("caaaaaaaaaaat") } > 0)
       Process.kill(:TERM, io.pid) rescue nil
       io.close rescue nil
 
@@ -584,7 +584,7 @@ class ChildProcessTest < Test::Unit::TestCase
         m.lock
         pid = pids.first
         # 16357 sleeeeeeeeeper -e sleep 10; puts "hello"
-        assert{ proc_lines.select{|line| line =~ /^\s*#{pid}\s/ }.first.strip.split(/\s+/)[1] == "sleeeeeeeeeper" }
+        assert{ proc_lines.find{|line| line =~ /^\s*#{pid}\s/ }.strip.split(/\s+/)[1] == "sleeeeeeeeeper" }
         @d.stop; @d.shutdown; @d.close; @d.terminate
       end
     end

data/test/plugin_helper/test_server.rb

@@ -1329,7 +1329,7 @@ class ServerPluginHelperTest < Test::Unit::TestCase
           # OpenSSL 1.1.1: "TLSv1.2"
           if tls_version == "TLSv1/SSLv3" || tls_version == "TLSv1.2"
             matched = true
-            unless cipher_name.match(/#{conf.ciphers}/)
+            unless cipher_name.match?(/#{conf.ciphers}/)
               matched = false
               break
             end

data/test/test_log.rb

@@ -472,6 +472,43 @@ class LogTest < Test::Unit::TestCase
       ]
       assert_equal(expected, log.out.logs)
     end
+
+    def test_reject_on_max_size
+      ignore_same_log_interval = 10
+
+      logger = Fluent::Log.new(
+        ServerEngine::DaemonLogger.new(@log_device, log_level: ServerEngine::DaemonLogger::INFO),
+        ignore_same_log_interval: ignore_same_log_interval,
+      )
+
+      # Output unique log every second.
+      Fluent::Log::IGNORE_SAME_LOG_MAX_CACHE_SIZE.times do |i|
+        logger.info "Test #{i}"
+        Timecop.freeze(@timestamp + i)
+      end
+      logger.info "Over max size!"
+
+      # The newest cache and the latest caches in `ignore_same_log_interval` should exist.
+      assert { Thread.current[:last_same_log].size == ignore_same_log_interval + 1 }
+    end
+
+    def test_clear_on_max_size
+      ignore_same_log_interval = 10
+
+      logger = Fluent::Log.new(
+        ServerEngine::DaemonLogger.new(@log_device, log_level: ServerEngine::DaemonLogger::INFO),
+        ignore_same_log_interval: ignore_same_log_interval,
+      )
+
+      # Output unique log at the same time.
+      Fluent::Log::IGNORE_SAME_LOG_MAX_CACHE_SIZE.times do |i|
+        logger.info "Test #{i}"
+      end
+      logger.info "Over max size!"
+
+      # Can't reject old logs, so all cache should be cleared and only the newest should exist.
+      assert { Thread.current[:last_same_log].size == 1 }
+    end
   end
 
   def test_dup
@@ -660,7 +697,7 @@ class LogTest < Test::Unit::TestCase
     log.reopen!
     log.info message
 
-    assert { path.read.lines.select{ |line| line.include?(message) }.size == 2 }
+    assert { path.read.lines.count{ |line| line.include?(message) } == 2 }
     # Assert reopening the same file.
     # Especially, on Windows, the filepath is fixed for each process with rotate,
     # so we need to care about this.

data/test/test_msgpack_factory.rb

@@ -15,4 +15,36 @@ class MessagePackFactoryTest < Test::Unit::TestCase
     assert mp.msgpack_factory
     assert mp.msgpack_factory
   end
+
+  sub_test_case 'thread_local_msgpack_packer' do
+    test 'packer is cached' do
+      packer1 = Fluent::MessagePackFactory.thread_local_msgpack_packer
+      packer2 = Fluent::MessagePackFactory.thread_local_msgpack_packer
+      assert_equal packer1, packer2
+    end
+  end
+
+  sub_test_case 'thread_local_msgpack_unpacker' do
+    test 'unpacker is cached' do
+      unpacker1 = Fluent::MessagePackFactory.thread_local_msgpack_unpacker
+      unpacker2 = Fluent::MessagePackFactory.thread_local_msgpack_unpacker
+      assert_equal unpacker1, unpacker2
+    end
+
+    # We need to reset the buffer every time so that received incomplete data
+    # must not affect data from other senders.
+    test 'reset the internal buffer of unpacker every time' do
+      unpacker1 = Fluent::MessagePackFactory.thread_local_msgpack_unpacker
+      unpacker1.feed_each("\xA6foo") do |result|
+        flunk("This callback must not be called since the data is uncomplete.")
+      end
+
+      records = []
+      unpacker2 = Fluent::MessagePackFactory.thread_local_msgpack_unpacker
+      unpacker2.feed_each("\xA3foo") do |result|
+        records.append(result)
+      end
+      assert_equal ["foo"], records
+    end
+  end
 end

data/test/test_supervisor.rb

@@ -621,6 +621,19 @@ class SupervisorTest < ::Test::Unit::TestCase
       assert_equal 10, $log.out.instance_variable_get(:@shift_size)
     end
 
+    def test_can_start_with_rotate_but_no_log_path
+      config_path = "#{@tmp_dir}/empty.conf"
+      write_config config_path, ""
+
+      sv = Fluent::Supervisor.new(
+        config_path: config_path,
+        log_rotate_age: 5,
+      )
+      sv.__send__(:setup_global_logger)
+
+      assert_true $log.stdout?
+    end
+
     sub_test_case "system log rotation" do
       def parse_text(text)
         basepath = File.expand_path(File.dirname(__FILE__) + '/../../')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.3
 platform: x64-mingw32
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-17 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,14 +124,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -1014,7 +1014,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector