Update Ruby to 3.2

.github/workflows/apt-arm.yml

@@ -10,21 +10,13 @@ jobs:
  fail-fast: false
  matrix:
  label:
- - Debian GNU/Linux buster arm64
  - Debian GNU/Linux bullseye arm64
- - Ubuntu Bionic arm64
  - Ubuntu Focal arm64
  - Ubuntu Jammy arm64
  include:
- - label: Debian GNU/Linux buster arm64
- rake-job: debian-buster
- test-docker-image: arm64v8/debian:buster
  - label: Debian GNU/Linux bullseye arm64
  rake-job: debian-bullseye
  test-docker-image: arm64v8/debian:bullseye
- - label: Ubuntu Bionic arm64
- rake-job: ubuntu-bionic
- test-docker-image: arm64v8/ubuntu:bionic
  - label: Ubuntu Focal arm64
  rake-job: ubuntu-focal
  rake-options: LINTIAN=no

.github/workflows/apt.yml

@@ -10,21 +10,13 @@ jobs:
  fail-fast: false
  matrix:
  label:
- - Debian GNU/Linux buster amd64
  - Debian GNU/Linux bullseye amd64
- - Ubuntu Bionic amd64
  - Ubuntu Focal amd64
  - Ubuntu Jammy amd64
  include:
- - label: Debian GNU/Linux buster amd64
- rake-job: debian-buster
- test-docker-image: debian:buster
  - label: Debian GNU/Linux bullseye amd64
  rake-job: debian-bullseye
  test-docker-image: debian:bullseye
- - label: Ubuntu Bionic amd64
- rake-job: ubuntu-bionic
- test-docker-image: ubuntu:bionic
  - label: Ubuntu Focal amd64
  rake-job: ubuntu-focal
  test-docker-image: ubuntu:focal

.github/workflows/macos.yml

@@ -14,6 +14,9 @@ jobs:
  - name: Install cmake
  run: |
  brew install cmake
+ - name: Install Rust
+ run: |
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
  - name: Install gems
  run: |
  gem install bundler builder
@@ -22,7 +25,7 @@ jobs:
  sudo mkdir /opt/td-agent
  sudo chown $(whoami) /opt/td-agent
  rm -rf td-agent/staging
- rake dmg:selfbuild
+ rake dmg:selfbuild PATH="$HOME/.cargo/bin:$PATH"
  - name: Upload td-agent dmg
  uses: actions/upload-artifact@master
  with:

README.md

@@ -56,6 +56,7 @@ Then restart Windows.
  * [Builder](https://rubygems.org/gems/builder) gem
  * Git
  * [CMake](https://cmake.org/)
+ * [Rust](https://www.rust-lang.org/) to enable Ruby's YJIT feature
 
 ## How to build .rpm package
 

td-agent/Gemfile

@@ -74,14 +74,14 @@ gem "fluent-plugin-opensearch", "1.0.8"
 windows_platforms = [:mingw, :x64_mingw] # :mswin
 gem "ffi", "1.15.5", platforms: windows_platforms
 gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms
-gem "nokogiri", "1.13.9", platforms: windows_platforms
+gem "nokogiri", "1.14.0", platforms: windows_platforms
 gem "win32-event", "0.6.3", platforms: windows_platforms
 gem "win32-ipc", "0.7.0", platforms: windows_platforms
 gem "win32-service", "2.3.2", platforms: windows_platforms
 gem "winevt_c", "0.10.1", platforms: windows_platforms
 gem "win32-eventlog", "0.6.7", platforms: windows_platforms
-gem "fluent-plugin-parser-winevt_xml", "0.2.4", platforms: windows_platforms
-gem "fluent-plugin-windows-eventlog", "0.8.2", platforms: windows_platforms
+gem "fluent-plugin-parser-winevt_xml", "0.2.5", platforms: windows_platforms
+gem "fluent-plugin-windows-eventlog", "0.8.3", platforms: windows_platforms
 gem "fluent-plugin-windows-exporter", "1.0.0", platforms: windows_platforms
 
 not_windows_platforms = [:ruby]

td-agent/Gemfile.lock

@@ -37,7 +37,7 @@ GEM
  protocol-http1 (~> 0.14.0)
  protocol-http2 (~> 0.14.0)
  traces (>= 0.4.0)
- async-io (1.34.0)
+ async-io (1.34.1)
  async
  async-pool (0.3.12)
  async (>= 1.25)
@@ -80,8 +80,8 @@ GEM
  elasticsearch-api (= 8.4.0)
  elasticsearch-api (8.4.0)
  multi_json
- excon (0.93.1)
- faraday (1.10.2)
+ excon (0.97.1)
+ faraday (1.10.3)
  faraday-em_http (~> 1.0)
  faraday-em_synchrony (~> 1.0)
  faraday-excon (~> 1.1)
@@ -112,7 +112,7 @@ GEM
  ffi-win32-extensions (1.0.4)
  ffi
  fiber-local (1.0.0)
- fileutils (1.6.0)
+ fileutils (1.7.0)
  fluent-config-regexp-type (1.0.0)
  fluentd (> 1.0.0, < 2)
  fluent-diagtool (1.0.1)
@@ -144,9 +144,9 @@ GEM
  faraday_middleware-aws-sigv4
  fluentd (>= 0.14.22)
  opensearch-ruby
- fluent-plugin-parser-winevt_xml (0.2.4)
+ fluent-plugin-parser-winevt_xml (0.2.5)
  fluentd (>= 0.14.12, < 2)
- nokogiri (>= 1.12.5, < 1.14)
+ nokogiri (>= 1.12.5, < 1.15)
  fluent-plugin-prometheus (2.0.3)
  fluentd (>= 1.9.1, < 2)
  prometheus-client (>= 2.1.0)
@@ -175,7 +175,7 @@ GEM
  fluent-plugin-webhdfs (1.5.0)
  fluentd (>= 0.14.22)
  webhdfs (>= 0.10.0)
- fluent-plugin-windows-eventlog (0.8.2)
+ fluent-plugin-windows-eventlog (0.8.3)
  fluentd (>= 0.14.12, < 2)
  win32-eventlog
  winevt_c (>= 0.10.1)
@@ -186,7 +186,7 @@ GEM
  http_parser.rb (0.8.0)
  httpclient (2.8.3)
  jmespath (1.6.1)
- json (2.6.2)
+ json (2.6.3)
  linux-utmpx (0.3.0)
  bindata (~> 2.4.8)
  ltsv (0.1.2)
@@ -195,7 +195,7 @@ GEM
  multi_json (1.15.0)
  multipart-post (2.2.3)
  nio4r (2.5.8)
- nokogiri (1.13.9-x64-mingw32)
+ nokogiri (1.14.0-x64-mingw32)
  racc (~> 1.4)
  oj (3.13.17)
  opensearch-api (2.0.2)
@@ -215,8 +215,8 @@ GEM
  protocol-http2 (0.14.2)
  protocol-hpack (~> 1.4)
  protocol-http (~> 0.18)
- public_suffix (5.0.0)
- racc (1.6.0)
+ public_suffix (5.0.1)
+ racc (1.6.2)
  rake (13.0.6)
  rdkafka (0.11.1)
  ffi (~> 1.15)
@@ -251,7 +251,7 @@ GEM
  msgpack (>= 0.5.6, < 2.0)
  td-client (>= 0.8.66, < 2.0)
  timers (4.3.5)
- traces (0.7.0)
+ traces (0.8.0)
  tzinfo (2.0.5)
  concurrent-ruby (~> 1.0)
  tzinfo-data (1.2022.5)
@@ -301,7 +301,7 @@ DEPENDENCIES
  fluent-plugin-kafka (= 0.18.1)
  fluent-plugin-metrics-cmetrics (= 0.1.2)
  fluent-plugin-opensearch (= 1.0.8)
- fluent-plugin-parser-winevt_xml (= 0.2.4)
+ fluent-plugin-parser-winevt_xml (= 0.2.5)
  fluent-plugin-prometheus (= 2.0.3)
  fluent-plugin-prometheus_pushgateway (= 0.1.0)
  fluent-plugin-record-modifier (= 2.1.1)
@@ -312,15 +312,15 @@ DEPENDENCIES
  fluent-plugin-td (= 1.2.0)
  fluent-plugin-utmpx (= 0.5.0)
  fluent-plugin-webhdfs (= 1.5.0)
- fluent-plugin-windows-eventlog (= 0.8.2)
+ fluent-plugin-windows-eventlog (= 0.8.3)
  fluent-plugin-windows-exporter (= 1.0.0)
  fluentd!
  http_parser.rb (= 0.8.0)
  httpclient (= 2.8.3)
  jmespath (= 1.6.1)
  mini_portile2 (= 2.8.0)
  msgpack (= 1.6.0)
- nokogiri (= 1.13.9)
+ nokogiri (= 1.14.0)
  oj (= 3.13.17)
  opensearch-ruby (= 2.0.3)
  prometheus-client (= 2.1.0)