fluentd 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767485d0b4b0b514e2bf2e26817b54b53e33d44fafd47ba8d86ce195ef274986
-  data.tar.gz: 525aa18805c114a792655dcd13ede2ed4c9370177d42efd8d33e8c9d1cce7d17
+  metadata.gz: af4e72332c4c1128c66e129579a50d0edd10b2bbeae16d805ed57f13cf425ae2
+  data.tar.gz: de907aa30f8d0352a871b8fb6cc938ffdffef7012910dbb99cc3986b69b6929e
 SHA512:
-  metadata.gz: 7c6fe1fd468386c622ba02031e8dc24fe1d3d14666ae2bf195e3f34576cc0cbd50fa9e81519e747e101fcf2450cd51288b9e1b221df09dcb1fc7d7a5614b28ec
-  data.tar.gz: 7d17bb661cb80b6fcaf0348b0b5883ebc3a70b7c2a087091f586d7e83fe5b5805c18b785510a1689a81e17d20187126b53890e33c80ccc9addb26374befc5c0b
+  metadata.gz: 908bc3de0f3d959d520e91cd62e6191f9b16c333769b8d1965fd7d0a8bdb585ad203d86fd5061b5d0e45cf7db33e81c2f44dd3f45cb81ee6c28dc287838f349f
+  data.tar.gz: c3e4b97d24ffb3f699d6d0d8003ae8bdcb1b83b2d0c983ae725f98024935cbc39742016efdbd106387cd8b0880dcc57ca837bde0820a568a301a8937337638b6

data/CHANGELOG.md

@@ -1,5 +1,25 @@
 # v1.15
 
+## Release v1.15.2 - 2022/08/22
+
+### Enhancement
+
+* Add a new system configuration `enable_jit`
+  https://github.com/fluent/fluentd/pull/3857
+
+### Bug Fix
+
+* out_file: Fix append mode with `--daemon` flag
+  https://github.com/fluent/fluentd/pull/3864
+* child_process: Plug file descriptor leak
+  https://github.com/fluent/fluentd/pull/3844
+
+### Misc
+
+* Drop win32-api gem to support Ruby 3.2
+  https://github.com/fluent/fluentd/pull/3849
+  https://github.com/fluent/fluentd/pull/3866
+
 ## Release v1.15.1 - 2022/07/27
 
 ### Bug Fix

data/fluentd.gemspec

@@ -34,12 +34,9 @@ Gem::Specification.new do |gem|
   fake_platform = ENV['GEM_BUILD_FAKE_PLATFORM'].to_s
   gem.platform = fake_platform unless fake_platform.empty?
   if /mswin|mingw/ =~ fake_platform || (/mswin|mingw/ =~ RUBY_PLATFORM && fake_platform.empty?)
-    gem.add_runtime_dependency("win32-api", [">= 1.10", "< 2.0.0"])
     gem.add_runtime_dependency("win32-service", ["~> 2.3.0"])
     gem.add_runtime_dependency("win32-ipc", ["~> 0.7.0"])
     gem.add_runtime_dependency("win32-event", ["~> 0.6.3"])
-    gem.add_runtime_dependency("windows-api", ["~> 0.4.5"])
-    gem.add_runtime_dependency("windows-pr", ["~> 1.2.6"])
     gem.add_runtime_dependency("certstore_c", ["~> 0.1.7"])
   end
 

data/lib/fluent/command/fluentd.rb

@@ -189,9 +189,6 @@ op.on('--disable-shared-socket', "Don't open shared socket for multiple workers"
 }
 
 if Fluent.windows?
-  require 'windows/library'
-  include Windows::Library
-
   opts.merge!(
     :winsvc_name => 'fluentdwinsvc',
     :winsvc_display_name => 'Fluentd Windows Service',
@@ -292,9 +289,7 @@ if winsvcinstmode = opts[:regwinsvc]
   case winsvcinstmode
   when 'i'
     binary_path = File.join(File.dirname(__FILE__), "..")
-    ruby_path = "\0" * 256
-    GetModuleFileName.call(0,ruby_path,256)
-    ruby_path = ruby_path.rstrip.gsub(/\\/, '/')
+    ruby_path = ServerEngine.ruby_bin_path
     start_type = Service::DEMAND_START
     if opts[:regwinsvcautostart]
       start_type = Service::AUTO_START

data/lib/fluent/plugin/file_wrapper.rb

@@ -14,6 +14,8 @@
 #    limitations under the License.
 #
 
+require 'fluent/win32api'
+
 module Fluent
   module FileWrapper
     def self.open(path, mode='r')
@@ -36,19 +38,16 @@ module Fluent
   end
 
   class WindowsFile
-    require 'windows/file'
-    require 'windows/handle'
-
     include File::Constants
-    include Windows::File
-    include Windows::Handle
 
     attr_reader :io
 
+    INVALID_HANDLE_VALUE = -1
+
     def initialize(path, mode='r')
       @path = path
       @io = File.open(path, mode2flags(mode))
-      @file_handle = _get_osfhandle(@io.to_i)
+      @file_handle = Win32API._get_osfhandle(@io.to_i)
       @io.instance_variable_set(:@file_index, self.ino)
       def @io.ino
         @file_index
@@ -68,7 +67,7 @@ module Fluent
     def ino
       by_handle_file_information = '\0'*(4+8+8+8+4+4+4+4+4+4)   #72bytes
 
-      unless GetFileInformationByHandle.call(@file_handle, by_handle_file_information)
+      unless Win32API.GetFileInformationByHandle(@file_handle, by_handle_file_information)
         return 0
       end
 
@@ -122,7 +121,7 @@ module Fluent
       bufsize = 1024
       buf = '\0' * bufsize
 
-      unless GetFileInformationByHandleEx.call(@file_handle, file_standard_info, buf, bufsize)
+      unless Win32API.GetFileInformationByHandleEx(@file_handle, file_standard_info, buf, bufsize)
         return false
       end
 

data/lib/fluent/plugin_helper/child_process.rb

@@ -346,6 +346,9 @@ module Fluent
           if cb
             cb.call(process_info.exit_status) rescue nil
           end
+          process_info.readio&.close rescue nil
+          process_info.writeio&.close rescue nil
+          process_info.stderrio&.close rescue nil
         end
         thread[:_fluentd_plugin_helper_child_process_running] = true
         thread[:_fluentd_plugin_helper_child_process_pid] = pid

data/lib/fluent/supervisor.rb

@@ -32,12 +32,6 @@ require 'fluent/variable_store'
 require 'serverengine'
 
 if Fluent.windows?
-  require 'windows/library'
-  require 'windows/synchronize'
-  require 'windows/system_info'
-  include Windows::Library
-  include Windows::Synchronize
-  include Windows::SystemInfo
   require 'win32/ipc'
   require 'win32/event'
 end
@@ -50,6 +44,9 @@ module Fluent
       @rpc_server = nil
       @counter = nil
 
+      @fluentd_lock_dir = Dir.mktmpdir("fluentd-lock-")
+      ENV['FLUENTD_LOCK_DIR'] = @fluentd_lock_dir
+
       if config[:rpc_endpoint]
         @rpc_endpoint = config[:rpc_endpoint]
         @enable_get_dump = config[:enable_get_dump]
@@ -79,9 +76,15 @@ module Fluent
       stop_windows_event_thread if Fluent.windows?
       stop_rpc_server if @rpc_endpoint
       stop_counter_server if @counter
+      cleanup_lock_dir
       Fluent::Supervisor.cleanup_resources
     end
 
+    def cleanup_lock_dir
+      FileUtils.rm(Dir.glob(File.join(@fluentd_lock_dir, "fluentd-*.lock")))
+      FileUtils.rmdir(@fluentd_lock_dir)
+    end
+
     def run_rpc_server
       @rpc_server = RPC::Server.new(@rpc_endpoint, $log)
 
@@ -235,7 +238,8 @@ module Fluent
         end
         begin
           loop do
-            ipc_idx = ipc.wait_any(events.map {|e| e[:win32_event]}, Windows::Synchronize::INFINITE)
+            infinite = 0xFFFFFFFF
+            ipc_idx = ipc.wait_any(events.map {|e| e[:win32_event]}, infinite)
             event_idx = ipc_idx - 1
 
             if event_idx >= 0 && event_idx < events.length
@@ -876,10 +880,7 @@ module Fluent
         Fluent::Supervisor.load_config(@config_path, params)
       }
 
-      Dir.mktmpdir("fluentd-lock-") do |lock_dir|
-        ENV['FLUENTD_LOCK_DIR'] = lock_dir
-        se.run
-      end
+      se.run
     end
 
     def install_main_process_signal_handlers
@@ -1104,6 +1105,11 @@ module Fluent
         fluentd_spawn_cmd << '-Eascii-8bit:ascii-8bit'
       end
 
+      if @system_config.enable_jit
+        $log.info "enable Ruby JIT for workers (--jit)"
+        fluentd_spawn_cmd << '--jit'
+      end
+
       # Adding `-h` so that it can avoid ruby's command blocking
       # e.g. `ruby -Eascii-8bit:ascii-8bit` will block. but `ruby -Eascii-8bit:ascii-8bit -h` won't.
       _, e, s = Open3.capture3(*fluentd_spawn_cmd, "-h")

data/lib/fluent/system_config.rb

@@ -28,7 +28,7 @@ module Fluent
       :without_source, :rpc_endpoint, :enable_get_dump, :process_name,
       :file_permission, :dir_permission, :counter_server, :counter_client,
       :strict_config_value, :enable_msgpack_time_support, :disable_shared_socket,
-      :metrics, :enable_input_metrics, :enable_size_metrics
+      :metrics, :enable_input_metrics, :enable_size_metrics, :enable_jit
     ]
 
     config_param :workers,   :integer, default: 1
@@ -50,6 +50,7 @@ module Fluent
     config_param :disable_shared_socket, :bool, default: nil
     config_param :enable_input_metrics, :bool, default: nil
     config_param :enable_size_metrics, :bool, default: nil
+    config_param :enable_jit, :bool, default: false
     config_param :file_permission, default: nil do |v|
       v.to_i(8)
     end

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '1.15.1'
+  VERSION = '1.15.2'
 
 end

data/lib/fluent/win32api.rb

@@ -0,0 +1,38 @@
+#
+# 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/env'
+
+module Fluent
+  module Win32API
+    require 'fiddle/import'
+    require 'fiddle/types'
+    extend Fiddle::Importer
+
+    if RUBY_PLATFORM.split('-')[-1] == "ucrt"
+      MSVCRT_DLL = 'ucrtbase.dll'
+    else
+      MSVCRT_DLL = 'msvcrt.dll'
+    end
+
+    dlload MSVCRT_DLL, "kernel32.dll"
+    include Fiddle::Win32Types
+
+    extern "intptr_t _get_osfhandle(int)"
+    extern "BOOL GetFileInformationByHandle(HANDLE, void *)"
+    extern "BOOL GetFileInformationByHandleEx(HANDLE, int, void *, DWORD)"
+  end if Fluent.windows?
+end

data/lib/fluent/winsvc.rb

@@ -17,14 +17,12 @@
 begin
 
   require 'optparse'
-  require 'windows/debug'
-  require 'Windows/Library'
   require 'win32/daemon'
   require 'win32/event'
+  require 'win32/registry'
+  require 'serverengine'
 
   include Win32
-  include Windows::Library
-  include Windows::Debug
 
   op = OptionParser.new
   opts = {service_name: nil}
@@ -37,16 +35,13 @@ begin
   end 
 
   def read_fluentdopt(service_name)
-    require 'win32/Registry'
     Win32::Registry::HKEY_LOCAL_MACHINE.open("SYSTEM\\CurrentControlSet\\Services\\#{service_name}") do |reg|
       reg.read("fluentdopt")[1] rescue ""
     end
   end
 
   def service_main_start(service_name)
-    ruby_path = 0.chr * 260
-    GetModuleFileName.call(0, ruby_path,260)
-    ruby_path = ruby_path.rstrip.gsub(/\\/, '/')
+    ruby_path = ServerEngine.ruby_bin_path
     rubybin_dir = ruby_path[0, ruby_path.rindex("/")]
     opt = read_fluentdopt(service_name)
     Process.spawn("\"#{rubybin_dir}/ruby.exe\" \"#{rubybin_dir}/fluentd\" #{opt} -x #{service_name}")

data/test/config/test_system_config.rb

@@ -84,6 +84,7 @@ module Fluent::Config
       assert_nil(sc.enable_input_metrics)
       assert_nil(sc.enable_size_metrics)
       assert_nil(sc.enable_msgpack_time_support)
+      assert(!sc.enable_jit)
       assert_equal(:text, sc.log.format)
       assert_equal('%Y-%m-%d %H:%M:%S %z', sc.log.time_format)
     end
@@ -102,6 +103,7 @@ module Fluent::Config
       'enable_msgpack_time_support' => ['enable_msgpack_time_support', true],
       'enable_input_metrics' => ['enable_input_metrics', true],
       'enable_size_metrics' => ['enable_size_metrics', true],
+      'enable_jit' => ['enable_jit', true],
     )
     test "accepts parameters" do |(k, v)|
       conf = parse_text(<<-EOS)

data/test/plugin/test_file_wrapper.rb

@@ -2,11 +2,6 @@ require_relative '../helper'
 require 'fluent/plugin/file_wrapper'
 
 class FileWrapperTest < Test::Unit::TestCase
-  require 'windows/file'
-  require 'windows/error'
-  include Windows::File
-  include Windows::Error
-
   TMP_DIR = File.dirname(__FILE__) + "/../tmp/file_wrapper#{ENV['TEST_ENV_NUMBER']}"
 
   def setup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 1.15.1
+  version: 1.15.2
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-27 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -705,6 +705,7 @@ files:
 - lib/fluent/unique_id.rb
 - lib/fluent/variable_store.rb
 - lib/fluent/version.rb
+- lib/fluent/win32api.rb
 - lib/fluent/winsvc.rb
 - templates/new_gem/Gemfile
 - templates/new_gem/README.md.erb
@@ -965,7 +966,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.17
 signing_key: 
 specification_version: 4
 summary: Fluentd event collector