Release 5.2.0 (#766)

* Bump version to 5.2.0 * Update bundled ruby version * Update bundled ruby gems * Update lock file * Bump version to container toolchains in Windows Dockerfile * Add comment about nokogiri * Add v5.2.0 changelog entry Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com> Co-authored-by: Shizuo Fujita <fujita@clear-code.com> Co-authored-by: Daijiro Fukuda <fukuda@clear-code.com>
fluent · Dec 13, 2024 · d4eec9c · d4eec9c
1 parent 7dec774
commit d4eec9c
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 57 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,86 @@
 
 About the past changelog entries, see [old CHANGELOG](CHANGELOG-v4.md) instead.
 
+## Release v5.2.0 - 2024/12/14
+
+### News
+
+* Update bundled Ruby to 3.2.6
+* Update bundled Fluentd to v1.18.0
+* Update bundled gems
+* deb rpm: Fixed to not execute v4 restart migration process unexpectedly.
+* msi: set GEM_HOME/GEM_PATH in fluentd.bat
+* Support upgrade fluentd service with zero downtime.
+  Note that you can use this feature when upgrade to the next version of fluent-package.
+* fluentd.service: Remove GEM_HOME/GEM_PATH env vars because they are unnecessary. 
+* deb: suppress service restart by needrestart.
+  The package places `/etc/needrestart/conf.d/50-fluent-package.conf`.
+This is standard version of Fluentd distribution package.
+If you want LTS version, stick to use v5.0.x.
+
+### Core component
+
+* ruby v3.2.6 (update)
+* jemalloc v3.6.0
+* OpenSSL 3.1.0 Windows
+* OpenSSL 3.0.8 macOS
+* fluentd v1.18.0 (update)
+
+### Core gems
+
+* async-http v0.64.2
+* bundler v2.3.26
+* cool.io v1.8.1
+* http_parser.rb v0.8.0
+* msgpack v1.7.3 (update)
+* oj v3.16.7 (update)
+* serverengine v2.4.0 (update)
+* sigdump v0.2.5
+* tzinfo v2.0.6
+* tzinfo-data v1.2024.2 (update)
+* yajl-ruby v1.4.3
+
+### Bundled plugins and gems
+
+* aws-partitions v1.957.0
+* aws-sdk-core v3.201.2
+* aws-sdk-kms v1.88.0
+* aws-sdk-s3 v1.156.0
+* aws-sdk-sqs v1.80.0
+* aws-sigv4 v1.8.0
+* elasticsearch v8.14.0
+* fluent-diagtool v1.0.5
+* fluent-plugin-calyptia-monitoring v0.1.3
+* fluent-plugin-elasticsearch v5.4.3
+* fluent-plugin-flowcounter-simple 0.1.0
+* fluent-plugin-kafka v0.19.3
+* fluent-plugin-metrics-cmetrics v0.1.2
+* fluent-plugin-opensearch v1.1.4
+* fluent-plugin-prometheus v2.1.0
+* fluent-plugin-prometheus_pushgateway v0.1.1
+* fluent-plugin-record-modifier v2.2.0
+* fluent-plugin-rewrite-tag-filter v2.4.0
+* fluent-plugin-s3 v1.8.1 (update)
+* fluent-plugin-sd-dns 0.1.0
+* fluent-plugin-systemd v1.1.0 (update)
+* fluent-plugin-td v1.2.0
+* fluent-plugin-utmpx v0.5.0
+* fluent-plugin-webhdfs v1.6.0
+* mini_portile2 v2.8.2
+* prometheus-client v4.1.0
+* rdkafka v0.16.1
+* ruby-kafka v1.5.0
+* systemd-journal v2.0.0 (update)
+* td-client v1.0.8
+* webhdfs v0.11.0
+
+On Windows
+
+* fluent-plugin-parser-winevt_xml v0.2.7
+* fluent-plugin-windows-exporter v1.0.0
+* winevt_c v0.11.1 (update)
+* nokogiri v1.16.8 (update)
+
 ## Release v5.1.0 - 2024/07/29
 
 ### News

diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile
@@ -14,14 +14,14 @@ gem "sigdump", "0.2.5"
 gem "http_parser.rb", "0.8.0"
 gem "yajl-ruby", "1.4.3"
 gem "serverengine", '2.4.0'
-gem "msgpack", "1.7.2"
-gem "oj", "3.16.4"
+gem "msgpack", "1.7.3"
+gem "oj", "3.16.7"
 gem "tzinfo", "2.0.6"
-gem "tzinfo-data", "1.2024.1"
+gem "tzinfo-data", "1.2024.2"
 gem "async", "1.32.1"
 # async-http 0.65.0 or later does not support async 1.x
 gem "async-http", "0.64.2"
-gem "webrick", "1.8.1"
+gem "webrick", "1.9.1"
 
 if ENV["INSTALL_GEM_FROM_LOCAL_REPO"]
   # During build process, pre-built fluentd gem will be installed
@@ -62,7 +62,7 @@ gem "aws-sdk-kms", "1.88.0"
 gem "aws-sdk-sqs", "1.80.0"
 gem "aws-sigv4", "1.8.0"
 gem "aws-sdk-s3", "1.156.0"
-gem "fluent-plugin-s3", "1.7.2"
+gem "fluent-plugin-s3", "1.8.1"
 gem "httpclient", "2.8.3"
 gem "fluent-diagtool", "1.0.5"
 # td doesn't support td-client 2.0.0 or later yet
@@ -85,19 +85,20 @@ gem "fluent-plugin-opensearch", "1.1.4"
 windows_platforms = [:mingw, :x64_mingw] # :mswin
 gem "ffi", "1.17.0", platforms: windows_platforms
 gem "ffi-win32-extensions", "1.0.4", platforms: windows_platforms
-gem "nokogiri", "1.16.7", platforms: windows_platforms
+# keep nokogiri 1.16.x because winevt_xml requires < 1.17
+gem "nokogiri", "1.16.8", platforms: windows_platforms
 gem "win32-event", "0.6.3", platforms: windows_platforms
 gem "win32-ipc", "0.7.0", platforms: windows_platforms
 # Use officially released version when PR was merged and released.
 #gem "win32-service", "2.3.2", platforms: windows_platforms
-gem "winevt_c", "0.11.0", platforms: windows_platforms
+gem "winevt_c", "0.11.1", platforms: windows_platforms
 gem "win32-eventlog", "0.6.7", platforms: windows_platforms
 gem "fluent-plugin-parser-winevt_xml", "0.2.7", platforms: windows_platforms
 gem "fluent-plugin-windows-eventlog", "0.9.0", platforms: windows_platforms
 gem "fluent-plugin-windows-exporter", "1.0.0", platforms: windows_platforms
 
 not_windows_platforms = [:ruby]
 gem "rdkafka", "0.16.1", platforms: not_windows_platforms
-gem "systemd-journal", "1.4.2", platforms: not_windows_platforms
-gem "fluent-plugin-systemd", "1.0.5", platforms: not_windows_platforms
+gem "systemd-journal", "2.0.0", platforms: not_windows_platforms
+gem "fluent-plugin-systemd", "1.1.0", platforms: not_windows_platforms
 gem "fluent-plugin-utmpx", "0.5.0", platforms: not_windows_platforms
diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
     cmetrics (0.3.3)
       mini_portile2 (~> 2.7)
     concurrent-ruby (1.3.4)
-    console (1.29.0)
+    console (1.29.2)
       fiber-annotation
       fiber-local (~> 1.1)
       json
@@ -100,7 +100,7 @@ GEM
     elasticsearch-api (8.14.0)
       multi_json
     excon (1.2.2)
-    faraday (2.12.1)
+    faraday (2.12.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -169,15 +169,15 @@ GEM
     fluent-plugin-rewrite-tag-filter (2.4.0)
       fluent-config-regexp-type
       fluentd (>= 0.14.2, < 2)
-    fluent-plugin-s3 (1.7.2)
+    fluent-plugin-s3 (1.8.1)
       aws-sdk-s3 (~> 1.60)
       aws-sdk-sqs (~> 1.23)
       fluentd (>= 0.14.22, < 2)
     fluent-plugin-sd-dns (0.1.0)
       fluentd (>= 1.8)
-    fluent-plugin-systemd (1.0.5)
+    fluent-plugin-systemd (1.1.0)
       fluentd (>= 0.14.11, < 2)
-      systemd-journal (~> 1.4.2)
+      systemd-journal (~> 2.0.0)
     fluent-plugin-td (1.2.0)
       fluentd (>= 0.14.13, < 2)
       td-client (>= 1.0.8)
@@ -198,25 +198,27 @@ GEM
     http_parser.rb (0.8.0)
     httpclient (2.8.3)
     jmespath (1.6.2)
-    json (2.8.2)
+    json (2.9.0)
     linux-utmpx (0.3.0)
       bindata (~> 2.4.8)
-    logger (1.6.1)
+    logger (1.6.2)
     ltsv (0.1.2)
     mini_portile2 (2.8.7)
-    msgpack (1.7.2)
+    msgpack (1.7.3)
     multi_json (1.15.0)
-    net-http (0.5.0)
+    net-http (0.6.0)
       uri
     nio4r (2.7.4)
-    nokogiri (1.16.7)
+    nokogiri (1.16.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.4)
+    oj (3.16.7)
       bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
+    ostruct (0.6.1)
     parallel (1.20.1)
     prometheus-client (2.1.0)
     protocol-hpack (1.5.1)
@@ -244,7 +246,7 @@ GEM
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
-    systemd-journal (1.4.2)
+    systemd-journal (2.0.0)
       ffi (~> 1.9)
     td (0.17.1)
       hirb (>= 0.4.5)
@@ -268,19 +270,19 @@ GEM
     traces (0.14.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2024.1)
+    tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     uri (1.0.2)
     webhdfs (0.11.0)
       addressable
-    webrick (1.8.1)
+    webrick (1.9.1)
     win32-event (0.6.3)
       win32-ipc (>= 0.6.0)
     win32-eventlog (0.6.7)
       ffi
     win32-ipc (0.7.0)
       ffi
-    winevt_c (0.11.0)
+    winevt_c (0.11.1)
     yajl-ruby (1.4.3)
     zip-zip (0.3)
       rubyzip (>= 1.0.0)
@@ -319,9 +321,9 @@ DEPENDENCIES
   fluent-plugin-prometheus_pushgateway (= 0.1.1)
   fluent-plugin-record-modifier (= 2.2.0)
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
-  fluent-plugin-s3 (= 1.7.2)
+  fluent-plugin-s3 (= 1.8.1)
   fluent-plugin-sd-dns (= 0.1.0)
-  fluent-plugin-systemd (= 1.0.5)
+  fluent-plugin-systemd (= 1.1.0)
   fluent-plugin-td (= 1.2.0)
   fluent-plugin-utmpx (= 0.5.0)
   fluent-plugin-webhdfs (= 1.6.0)
@@ -332,28 +334,28 @@ DEPENDENCIES
   httpclient (= 2.8.3)
   jmespath (= 1.6.2)
   mini_portile2 (= 2.8.7)
-  msgpack (= 1.7.2)
-  nokogiri (= 1.16.7)
-  oj (= 3.16.4)
+  msgpack (= 1.7.3)
+  nokogiri (= 1.16.8)
+  oj (= 3.16.7)
   opensearch-ruby (= 3.4.0)
   prometheus-client (= 2.1.0)
   rake
   rdkafka (= 0.16.1)
   ruby-kafka (= 1.5.0)
   serverengine (= 2.4.0)
   sigdump (= 0.2.5)
-  systemd-journal (= 1.4.2)
+  systemd-journal (= 2.0.0)
   td (= 0.17.1)
   td-client (= 1.0.8)
   tzinfo (= 2.0.6)
-  tzinfo-data (= 1.2024.1)
+  tzinfo-data (= 1.2024.2)
   webhdfs (= 0.11.0)
-  webrick (= 1.8.1)
+  webrick (= 1.9.1)
   win32-event (= 0.6.3)
   win32-eventlog (= 0.6.7)
   win32-ipc (= 0.7.0)
   win32-service!
-  winevt_c (= 0.11.0)
+  winevt_c (= 0.11.1)
   yajl-ruby (= 1.4.3)
 
 BUNDLED WITH

diff --git a/fluent-package/bump-version-v6.patch b/fluent-package/bump-version-v6.patch
@@ -1,7 +1,7 @@
-From 887c36b60822995aa889fea6a181f00975cdfff7 Mon Sep 17 00:00:00 2001
+From 22ef9f8d96e796933b490bf1bf8c41425e6d621e Mon Sep 17 00:00:00 2001
 From: Kentaro Hayashi <hayashi@clear-code.com>
-Date: Thu, 17 Oct 2024 19:45:02 +0900
-Subject: [PATCH 1/2] bump version
+Date: Wed, 11 Dec 2024 22:55:30 +0900
+Subject: [PATCH] bump version to 6.0.0
 
 Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
 ---
@@ -11,12 +11,12 @@ Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
  3 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/fluent-package/config.rb b/fluent-package/config.rb
-index a9e13bc..e61bca4 100644
+index 8219301..7d4fec7 100644
 --- a/fluent-package/config.rb
 +++ b/fluent-package/config.rb
 @@ -1,5 +1,5 @@
  PACKAGE_NAME = "fluent-package"
--PACKAGE_VERSION = "5.1.0"
+-PACKAGE_VERSION = "5.2.0"
 +PACKAGE_VERSION = "6.0.0"
 
  # Keep internal path (/opt/td-agent) for package name migration
@@ -25,39 +25,39 @@ index a9e13bc..e61bca4 100644
  BUNDLER_VERSION= "2.3.27"
 
  # https://www.ruby-lang.org/en/downloads/ (tar.gz)
--BUNDLED_RUBY_VERSION = "3.2.5"
--BUNDLED_RUBY_SOURCE_SHA256SUM = "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16"
-+BUNDLED_RUBY_VERSION = "3.3.5"
-+BUNDLED_RUBY_SOURCE_SHA256SUM = "3781a3504222c2f26cb4b9eb9c1a12dbf4944d366ce24a9ff8cf99ecbce75196"
+-BUNDLED_RUBY_VERSION = "3.2.6"
+-BUNDLED_RUBY_SOURCE_SHA256SUM = "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370"
++BUNDLED_RUBY_VERSION = "3.3.6"
++BUNDLED_RUBY_SOURCE_SHA256SUM = "8dc48fffaf270f86f1019053f28e51e4da4cce32a36760a0603a9aee67d7fd8d"
 
  BUNDLED_RUBY_PATCHES = [
    # An example entry:
 diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog
-index f24ec3e..0089f56 100644
+index 0a73dbb..2614fac 100644
 --- a/fluent-package/debian/changelog
 +++ b/fluent-package/debian/changelog
 @@ -1,3 +1,9 @@
 +fluent-package (6.0.0-1) unstable; urgency=low
 +
 +  * New upstream release.
 +
-+ -- Kentaro Hayashi <kenhys@xdump.org>  Tue, 8 Oct 2024 07:47:29 -0000
++ -- Kentaro Hayashi <hayashi@clear-code.com>  Fri, 29 Aug 2025 13:55:06 -0000
 +
- fluent-package (5.1.0-1) unstable; urgency=low
+ fluent-package (5.2.0-1) unstable; urgency=low
 
    * New upstream release.
 diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in
-index 4833f8e..da9da8c 100644
+index 45f0519..240f30c 100644
 --- a/fluent-package/yum/fluent-package.spec.in
 +++ b/fluent-package/yum/fluent-package.spec.in
-@@ -478,6 +478,9 @@ fi
+@@ -439,6 +439,9 @@ fi
  # NOTE: %{_tmpfilesdir} is available since CentOS 7
  %attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@
  %changelog
-+* Mon Oct 7 2024 Kentaro Hayashi <kenhys@xdump.org> - 6.0.0-1
-+- New upstream release. (Dummy)
++* Fri Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
++- New upstream release.
 +
- * Mon Jul 29 2024 Kentaro Hayashi <kenhys@xdump.org> - 5.1.0-1
+ * Sat Dec 14 2024 Kentaro Hayashi <hayashi@clear-code.com> - 5.2.0-1
  - New upstream release.
 
 -- 

diff --git a/fluent-package/config.rb b/fluent-package/config.rb
@@ -1,5 +1,5 @@
 PACKAGE_NAME = "fluent-package"
-PACKAGE_VERSION = "5.1.0"
+PACKAGE_VERSION = "5.2.0"
 
 # Keep internal path (/opt/td-agent) for package name migration
 SERVICE_NAME = "fluentd"
@@ -23,17 +23,17 @@
 BUNDLER_VERSION= "2.3.27"
 
 # https://www.ruby-lang.org/en/downloads/ (tar.gz)
-BUNDLED_RUBY_VERSION = "3.2.5"
-BUNDLED_RUBY_SOURCE_SHA256SUM = "ef0610b498f60fb5cfd77b51adb3c10f4ca8ed9a17cb87c61e5bea314ac34a16"
+BUNDLED_RUBY_VERSION = "3.2.6"
+BUNDLED_RUBY_SOURCE_SHA256SUM = "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370"
 
 BUNDLED_RUBY_PATCHES = [
   # An example entry:
   # ["ruby-3.0/0001-ruby-resolv-Fix-confusion-of-received-response-messa.patch",   ["= 3.0.1"]],
 ]
 
 # https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.5-1"
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "3e17f7e60834cfac4b2aae13677c19d3222b52bee328c3c22629246c00cd543c"
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.6-1"
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "549616f2964301616fd713e5590f024b63b28d6cc5e5033c87eff32e0d1fa2d2"
 
 # Files under rubyinstaller/ are patches for RubyInstaller's binary package.
 # Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.