Merge branch 'master' into json-resumable-parser

Author: Watson1978

.github/workflows/test-ruby-head.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm']
         ruby-version: ['head']
     env:
       RUBYOPT: "--disable-frozen_string_literal"

.github/workflows/test.yml

@@ -20,14 +20,26 @@ concurrency:
 permissions: read-all
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 3.2
   test:
+    needs: ruby-versions
     runs-on: ${{ matrix.os }}
     continue-on-error: false
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        ruby-version: ['4.0', '3.4', '3.3', '3.2']
+        os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'windows-11-arm']
+        ruby-version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby-version: head
+          - os: 'windows-11-arm'
+            ruby-version: '3.3'
+          - os: 'windows-11-arm'
+            ruby-version: '3.2'
     env:
       RUBYOPT: "--disable-frozen_string_literal"
     name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
@@ -46,11 +58,14 @@ jobs:
         run: bundle exec rake test TESTOPTS="-v --report-slow-tests --no-show-detail-immediately"
 
   test-windows-service:
+    needs: ruby-versions
     runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['4.0', '3.4', '3.3', '3.2']
+        ruby-version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby-version: head
     name: Windows service (Ruby ${{ matrix.ruby-version }})
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

lib/fluent/engine.rb

@@ -186,7 +186,7 @@ def reload_config(conf, supervisor: false)
 
         ret.all_plugins.each do |plugin|
           if plugin.respond_to?(:reloadable_plugin?) && !plugin.reloadable_plugin?
-            raise Fluent::ConfigError, "Unreloadable plugin plugin: #{Fluent::Plugin.lookup_type_from_class(plugin.class)}, plugin_id: #{plugin.plugin_id}, class_name: #{plugin.class})"
+            raise Fluent::ConfigError, "Unreloadable plugin: #{Fluent::Plugin.lookup_type_from_class(plugin.class)}, plugin_id: #{plugin.plugin_id}, class_name: #{plugin.class})"
           end
         end
 

test/command/test_ctl.rb

@@ -46,6 +46,7 @@ def test_commands(data)
        "reload" => ["reload", "USR2"])
   def test_commands_with_winsvcname(data)
     omit "Only for Windows" unless Fluent.windows?
+    omit "Need ffi 1.17.3 or later but blocked by https://github.com/chef/ffi-win32-extensions/issues/14" if Gem::Version.new(FFI::VERSION) < Gem::Version.new("1.17.3")
 
     command, event_suffix = data
     event_name = "testfluentdwinsvc"

test/test_engine.rb

@@ -194,7 +194,7 @@ def multi_workers_ready?; true; end
       e = assert_raise(Fluent::ConfigError) do
         engine.reload_config(new_conf)
       end
-      assert e.message.match?('Unreloadable plugin plugin: dummy_engine_class_var_test')
+      assert e.message.match?('Unreloadable plugin: dummy_engine_class_var_test')
 
       assert_kind_of DummyEngineTestInput, engine.root_agent.inputs[0]
       assert_kind_of DummyEngineTestOutput, engine.root_agent.outputs[0]