From 1daab7884bc9a5c878a002b56b9e225d54c60093 Mon Sep 17 00:00:00 2001
From: Daijiro Fukuda <fukuda@clear-code.com>
Date: Thu, 31 Oct 2024 15:47:48 +0900
Subject: [PATCH] use Fluentd for the feature (#700)

Use this to test this feature.

* https://github.com/fluent/fluentd/pull/4624

Signed-off-by: Daijiro Fukuda <fukuda@clear-code.com>
---
 fluent-package/Gemfile      |  2 +-
 fluent-package/Gemfile.lock | 12 +++++++-----
 fluent-package/config.rb    |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fluent-package/Gemfile b/fluent-package/Gemfile
index a41627727..4d621697c 100644
--- a/fluent-package/Gemfile
+++ b/fluent-package/Gemfile
@@ -13,7 +13,7 @@ gem "cool.io", "1.8.1",  platforms: no_fat_gem
 gem "sigdump", "0.2.5"
 gem "http_parser.rb", "0.8.0"
 gem "yajl-ruby", "1.4.3"
-gem "serverengine", '2.3.2'
+gem "serverengine", '2.4.0'
 gem "msgpack", "1.7.2"
 gem "oj", "3.16.4"
 gem "tzinfo", "2.0.6"
diff --git a/fluent-package/Gemfile.lock b/fluent-package/Gemfile.lock
index 757347779..a7007ab60 100644
--- a/fluent-package/Gemfile.lock
+++ b/fluent-package/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
 
 GIT
   remote: https://github.com/fluent/fluentd
-  revision: e763c0761c44d9734b6aa374371387a2e8406522
-  ref: e763c0761c44d9734b6aa374371387a2e8406522
+  revision: f8755d09b747d054302c0e12a3b0962a11f1045e
+  ref: f8755d09b747d054302c0e12a3b0962a11f1045e
   specs:
-    fluentd (1.17.0)
+    fluentd (1.17.1)
       base64 (~> 0.2)
       bundler
       certstore_c (~> 0.1.7)
@@ -236,7 +236,9 @@ GEM
       digest-crc
     ruby-progressbar (1.13.0)
     rubyzip (1.3.0)
-    serverengine (2.3.2)
+    serverengine (2.4.0)
+      base64 (~> 0.1)
+      logger (~> 1.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.5)
     strptime (0.2.5)
@@ -337,7 +339,7 @@ DEPENDENCIES
   rake
   rdkafka (= 0.16.1)
   ruby-kafka (= 1.5.0)
-  serverengine (= 2.3.2)
+  serverengine (= 2.4.0)
   sigdump (= 0.2.5)
   systemd-journal (= 1.4.2)
   td (= 0.17.1)
diff --git a/fluent-package/config.rb b/fluent-package/config.rb
index a9e13bc7a..ce3ef8dd5 100644
--- a/fluent-package/config.rb
+++ b/fluent-package/config.rb
@@ -7,7 +7,7 @@
 PACKAGE_DIR = "fluent"
 COMPAT_PACKAGE_DIR = COMPAT_SERVICE_NAME
 
-FLUENTD_REVISION = 'e763c0761c44d9734b6aa374371387a2e8406522' # v1.17.0
+FLUENTD_REVISION = 'f8755d09b747d054302c0e12a3b0962a11f1045e' # test no-downtime (TODO fix later)
 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo"))
 
 # https://github.com/jemalloc/jemalloc/releases