fluentd 1.16.11 → 1.17.0

data/test/test_supervisor.rb

@@ -214,9 +214,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_cont_in_main_process_signal_handlers
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     sv = Fluent::Supervisor.new({})
     sv.send(:install_main_process_signal_handlers)
 
@@ -232,9 +229,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_term_cont_in_main_process_signal_handlers
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     create_debug_dummy_logger
 
     sv = Fluent::Supervisor.new({})
@@ -302,9 +296,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_cont_in_supervisor_signal_handler
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     server = DummyServer.new
     server.install_supervisor_signal_handlers
 
@@ -320,9 +311,6 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_term_cont_in_supervisor_signal_handler
     omit "Windows cannot handle signals" if Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
     server = DummyServer.new
     server.install_supervisor_signal_handlers
 
@@ -353,7 +341,6 @@ class SupervisorTest < ::Test::Unit::TestCase
       event = Win32::Event.open("TestFluentdEvent")
       event.set
       event.close
-      sleep 1.0 # Wait for dumping
     ensure
       server.stop_windows_event_thread
     end
@@ -380,7 +367,6 @@ class SupervisorTest < ::Test::Unit::TestCase
       event = Win32::Event.open("TestFluentdEvent_USR1")
       event.set
       event.close
-      sleep 1.0 # Wait for dumping
     ensure
       server.stop_windows_event_thread
     end
@@ -404,31 +390,34 @@ class SupervisorTest < ::Test::Unit::TestCase
   def test_supervisor_event_dump_windows
     omit "Only for Windows, alternative to UNIX signals" unless Fluent.windows?
 
-    # https://github.com/fluent/fluentd/issues/4063
-    GC.start
-
-    ENV['SIGDUMP_PATH'] = @tmp_dir + "/sigdump.log"
-
     server = DummyServer.new
     def server.config
       {:signame => "TestFluentdEvent"}
     end
     server.install_windows_event_handler
 
-    begin
-      sleep 0.1 # Wait for starting windows event thread
-      event = Win32::Event.open("TestFluentdEvent_CONT")
-      event.set
-      event.close
-      sleep 1.0 # Wait for dumping
-    ensure
-      server.stop_windows_event_thread
+    assert_rr do
+      # Have to use mock because `Sigdump.dump` seems to be somehow incompatible with RR.
+      # The `mock(server).restart(true) { nil }` line in `test_rpc_server_windows` cause the next error.
+      # Failure: test_supervisor_event_dump_windows(SupervisorTest):
+      #   class()
+      #   Called 0 times.
+      #   Expected 1 times.
+      # .../Ruby26-x64/lib/ruby/gems/2.6.0/gems/sigdump-0.2.4/lib/sigdump.rb:74:in `block in dump_object_count'
+      #     73: ObjectSpace.each_object {|o|
+      #     74:   c = o.class <-- HERE!
+      mock(Sigdump).dump(anything)
+
+      begin
+        sleep 0.1 # Wait for starting windows event thread
+        event = Win32::Event.open("TestFluentdEvent_CONT")
+        event.set
+        event.close
+        sleep 1.0 # Wait for dumping
+      ensure
+        server.stop_windows_event_thread
+      end
     end
-
-    result_filepaths = Dir.glob("#{@tmp_dir}/*")
-    assert {result_filepaths.length > 0}
-  ensure
-    ENV.delete('SIGDUMP_PATH')
   end
 
   data(:ipv4 => ["0.0.0.0", "127.0.0.1", false],

data/test/test_tls.rb

@@ -9,7 +9,7 @@ class UniqueIdTest < Test::Unit::TestCase
   TEST_TLS1_2_CASES = {
     'New TLS v1.2' => :'TLS1_2',
     'Old TLS v1.2' => :'TLSv1_2'
-  }
+  } 
   TEST_TLS_CASES = TEST_TLS1_1_CASES.merge(TEST_TLS1_2_CASES)
 
   sub_test_case 'constants' do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.16.11
+  version: 1.17.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,20 +200,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.24'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -255,20 +242,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -343,16 +316,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -429,6 +402,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.50.0
+- !ruby/object:Gem::Dependency
+  name: aws-sigv4
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.191'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.191'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: 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.
 email:
@@ -448,12 +463,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".deepsource.toml"
+- ".github/DISCUSSION_TEMPLATE/q-a-japanese.yml"
+- ".github/DISCUSSION_TEMPLATE/q-a.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.yml"
 - ".github/ISSUE_TEMPLATE/config.yml"
 - ".github/ISSUE_TEMPLATE/feature_request.yml"
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".github/workflows/stale-actions.yml"
+- ".github/workflows/test-ruby-head.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ADOPTERS.md
@@ -825,6 +843,10 @@ files:
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/foo/bar2
 - test/plugin/data/log/test.log
+- test/plugin/data/log_numeric/01.log
+- test/plugin/data/log_numeric/02.log
+- test/plugin/data/log_numeric/12.log
+- test/plugin/data/log_numeric/14.log
 - test/plugin/data/sd_file/config
 - test/plugin/data/sd_file/config.json
 - test/plugin/data/sd_file/config.yaml
@@ -909,6 +931,7 @@ files:
 - test/plugin/test_parser_csv.rb
 - test/plugin/test_parser_json.rb
 - test/plugin/test_parser_labeled_tsv.rb
+- test/plugin/test_parser_msgpack.rb
 - test/plugin/test_parser_multiline.rb
 - test/plugin/test_parser_nginx.rb
 - test/plugin/test_parser_none.rb
@@ -972,7 +995,6 @@ files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
-- test/scripts/windows_service_test.ps1
 - test/test_capability.rb
 - test/test_clock.rb
 - test/test_config.rb
@@ -1011,6 +1033,7 @@ homepage: https://www.fluentd.org/
 licenses:
 - Apache-2.0
 metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -1018,14 +1041,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.4.13
+signing_key: 
 specification_version: 4
 summary: Fluentd event collector
 test_files:
@@ -1067,6 +1091,10 @@ test_files:
 - test/plugin/data/log/foo/bar.log
 - test/plugin/data/log/foo/bar2
 - test/plugin/data/log/test.log
+- test/plugin/data/log_numeric/01.log
+- test/plugin/data/log_numeric/02.log
+- test/plugin/data/log_numeric/12.log
+- test/plugin/data/log_numeric/14.log
 - test/plugin/data/sd_file/config
 - test/plugin/data/sd_file/config.json
 - test/plugin/data/sd_file/config.yaml
@@ -1151,6 +1179,7 @@ test_files:
 - test/plugin/test_parser_csv.rb
 - test/plugin/test_parser_json.rb
 - test/plugin/test_parser_labeled_tsv.rb
+- test/plugin/test_parser_msgpack.rb
 - test/plugin/test_parser_multiline.rb
 - test/plugin/test_parser_nginx.rb
 - test/plugin/test_parser_none.rb
@@ -1214,7 +1243,6 @@ test_files:
 - test/scripts/fluent/plugin/out_test.rb
 - test/scripts/fluent/plugin/out_test2.rb
 - test/scripts/fluent/plugin/parser_known.rb
-- test/scripts/windows_service_test.ps1
 - test/test_capability.rb
 - test/test_clock.rb
 - test/test_config.rb

data/test/scripts/windows_service_test.ps1

@@ -1,73 +0,0 @@
-$ErrorActionPreference = "Stop"
-Set-PSDebug -Trace 1
-
-$default_conf_path = (Resolve-Path fluent.conf).Path
-$current_path = (Get-Location).Path
-$log_path = "$current_path/fluentd.log"
-
-ruby bin/fluentd --reg-winsvc i --reg-winsvc-fluentdopt "-c '$default_conf_path' -o '$log_path'"
-
-# Test: must not start automatically
-if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
-    Write-Error "The service should not start automatically."
-}
-
-Start-Service fluentdwinsvc
-Start-Sleep 30
-
-# Test: the service should be running after started
-if ((Get-Service fluentdwinsvc).Status -ne "Running") {
-    Write-Error "The service should be running after started."
-}
-
-# Test: no warn/error/fatal logs
-Get-ChildItem "*.log" | %{
-    Get-Content $_
-    if (Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch -Quiet) {
-        Select-String -Path $_ -Pattern "[warn]", "[error]", "[fatal]" -SimpleMatch
-        Write-Error "There are abnormal level logs in ${_}:"
-    }
-}
-
-Stop-Service fluentdwinsvc
-Start-Sleep 10 # Somehow it is possible that some processes stay alive for a while. (This could be not good behavior...)
-
-# Test: status after stopped
-if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
-    Write-Error "The service should be in 'Stopped' status after stopped."
-}
-# Test: all Ruby processes should stop
-$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
-if ($ruby_processes.Count -ne 0) {
-    Write-Output $ruby_processes
-    Write-Error "All Ruby processes should stop."
-}
-
-# Test: service should stop when the supervisor fails to launch
-# https://github.com/fluent/fluentd/pull/4909
-$test_setting = @'
-<source>
-  @type sample
-  @id DUPLICATED_ID
-  tag test
-</source>
-<match test>
-  @type stdout
-  @id DUPLICATED_ID
-</match>
-'@
-Add-Content -Path "duplicated_id.conf" -Encoding UTF8 -Value $test_setting
-ruby bin/fluentd --reg-winsvc-fluentdopt "-c '$current_path/duplicated_id.conf' -o '$log_path'"
-Start-Service fluentdwinsvc
-Start-Sleep 30
-if ((Get-Service fluentdwinsvc).Status -ne "Stopped") {
-    Write-Error "The service should be in 'Stopped' status when the supervisor fails to launch."
-}
-$ruby_processes = Get-Process -name ruby -ErrorAction SilentlyContinue
-if ($ruby_processes.Count -ne 0) {
-    Write-Output $ruby_processes
-    Write-Error "All Ruby processes should stop."
-}
-
-ruby bin/fluentd --reg-winsvc u
-Remove-Item $log_path