From 25010d7d455c7ddfde496d85b0a6f522acc6338d Mon Sep 17 00:00:00 2001
From: Takuro Ashie <ashie@clear-code.com>
Date: Tue, 28 Nov 2023 17:26:53 +0900
Subject: [PATCH] td-agent v4.5.2 (#600)

Signed-off-by: Takuro Ashie <ashie@clear-code.com>
---
 CHANGELOG.md                  |  7 +++++++
 td-agent/Gemfile              |  2 +-
 td-agent/Gemfile.lock         | 30 ++++++++++++++++--------------
 td-agent/config.rb            |  4 ++--
 td-agent/debian/changelog     |  6 ++++++
 td-agent/yum/td-agent.spec.in |  3 +++
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 857528e8f..7ce784eae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Treasure Agent 4 changelog
 
+## Release v4.5.2 - 2023/11/29
+
+### News
+
+* Update fluentd to 1.16.3
+* Update fluent-plugin-kafka to 0.19.2
+
 ## Release v4.5.1 - 2023/08/31
 
 ### News
diff --git a/td-agent/Gemfile b/td-agent/Gemfile
index f4b8ee0d7..a6ee05c75 100644
--- a/td-agent/Gemfile
+++ b/td-agent/Gemfile
@@ -41,7 +41,7 @@ gem "elasticsearch", "8.8.0"
 gem "fluent-plugin-elasticsearch", "5.3.0"
 gem "ruby-kafka", "1.5.0"
 gem "digest-murmurhash", "1.1.1"
-gem "fluent-plugin-kafka", "0.19.0"
+gem "fluent-plugin-kafka", "0.19.2"
 gem "prometheus-client", "2.1.0"
 gem "fluent-plugin-prometheus", "2.1.0"
 gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
diff --git a/td-agent/Gemfile.lock b/td-agent/Gemfile.lock
index 5ddc25f3b..69328235d 100644
--- a/td-agent/Gemfile.lock
+++ b/td-agent/Gemfile.lock
@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/fluent/fluentd
-  revision: d5685ada81ac89a35a79965f1e94bbe5952a5d3a
-  ref: d5685ada81ac89a35a79965f1e94bbe5952a5d3a
+  revision: d3cf2e0f95a0ad88b9897197db6c5152310f114f
+  ref: d3cf2e0f95a0ad88b9897197db6c5152310f114f
   specs:
-    fluentd (1.16.2)
+    fluentd (1.16.3)
       bundler
       certstore_c (~> 0.1.7)
       cool.io (>= 1.4.5, < 2.0.0)
@@ -37,7 +37,7 @@ GEM
       protocol-http1 (~> 0.15.0)
       protocol-http2 (~> 0.15.0)
       traces (>= 0.10.0)
-    async-io (1.35.0)
+    async-io (1.38.0)
       async
     async-pool (0.4.0)
       async (>= 1.25)
@@ -60,6 +60,7 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.2.0)
     bindata (2.4.15)
     certstore_c (0.1.7)
     cmetrics (0.3.3)
@@ -72,7 +73,7 @@ GEM
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     digest-murmurhash (1.1.1)
-    elastic-transport (8.2.2)
+    elastic-transport (8.3.0)
       faraday (< 3)
       multi_json
     elasticsearch (8.8.0)
@@ -80,8 +81,9 @@ GEM
       elasticsearch-api (= 8.8.0)
     elasticsearch-api (8.8.0)
       multi_json
-    excon (0.102.0)
-    faraday (2.7.10)
+    excon (0.104.0)
+    faraday (2.7.12)
+      base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-excon (2.1.0)
@@ -96,7 +98,7 @@ GEM
       ffi
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
-    fileutils (1.7.1)
+    fileutils (1.7.2)
     fluent-config-regexp-type (1.0.0)
       fluentd (> 1.0.0, < 2)
     fluent-diagtool (1.0.1)
@@ -115,7 +117,7 @@ GEM
       fluentd (>= 0.14.22)
     fluent-plugin-flowcounter-simple (0.1.0)
       fluentd (>= 1.0)
-    fluent-plugin-kafka (0.19.0)
+    fluent-plugin-kafka (0.19.2)
       fluentd (>= 0.10.58, < 2)
       ltsv
       ruby-kafka (>= 1.5.0, < 2)
@@ -180,7 +182,7 @@ GEM
     mini_portile2 (2.8.2)
     msgpack (1.7.1)
     multi_json (1.15.0)
-    nio4r (2.5.9)
+    nio4r (2.6.1)
     nokogiri (1.15.3)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -202,9 +204,9 @@ GEM
     protocol-http2 (0.15.1)
       protocol-hpack (~> 1.4)
       protocol-http (~> 0.18)
-    public_suffix (5.0.3)
-    racc (1.7.1)
-    rake (13.0.6)
+    public_suffix (5.0.4)
+    racc (1.7.3)
+    rake (13.1.0)
     rdkafka (0.11.1)
       ffi (~> 1.15)
       mini_portile2 (~> 2.6)
@@ -288,7 +290,7 @@ DEPENDENCIES
   fluent-plugin-calyptia-monitoring (= 0.1.3)
   fluent-plugin-elasticsearch (= 5.3.0)
   fluent-plugin-flowcounter-simple (= 0.1.0)
-  fluent-plugin-kafka (= 0.19.0)
+  fluent-plugin-kafka (= 0.19.2)
   fluent-plugin-metrics-cmetrics (= 0.1.2)
   fluent-plugin-opensearch (= 1.1.3)
   fluent-plugin-parser-winevt_xml (= 0.2.6)
diff --git a/td-agent/config.rb b/td-agent/config.rb
index 1841f8507..abc430ad6 100644
--- a/td-agent/config.rb
+++ b/td-agent/config.rb
@@ -1,7 +1,7 @@
 PACKAGE_NAME = "td-agent"
-PACKAGE_VERSION = "4.5.1"
+PACKAGE_VERSION = "4.5.2"
 
-FLUENTD_REVISION = 'd5685ada81ac89a35a79965f1e94bbe5952a5d3a' # v1.16.2
+FLUENTD_REVISION = 'd3cf2e0f95a0ad88b9897197db6c5152310f114f' # v1.16.3
 FLUENTD_LOCAL_GEM_REPO = "file://" + File.expand_path(File.join(__dir__, "local_gem_repo"))
 
 # https://github.com/jemalloc/jemalloc/releases
diff --git a/td-agent/debian/changelog b/td-agent/debian/changelog
index c64c72e70..fcb0c9423 100644
--- a/td-agent/debian/changelog
+++ b/td-agent/debian/changelog
@@ -1,3 +1,9 @@
+td-agent (4.5.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Takuro Ashie <ashie@clear-code.com>  Wed, 22 Nov 2023 07:43:35 -0000
+
 td-agent (4.5.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/td-agent/yum/td-agent.spec.in b/td-agent/yum/td-agent.spec.in
index 056d1595a..4b2c49185 100644
--- a/td-agent/yum/td-agent.spec.in
+++ b/td-agent/yum/td-agent.spec.in
@@ -261,6 +261,9 @@ fi
 # NOTE: %{_tmpfilesdir} is available since CentOS 7
 %attr(0755,td-agent,td-agent) %dir /tmp/@PACKAGE@
 %changelog
+* Wed Nov 22 2023 Takuro Ashie <ashie@clear-code.com> - 4.5.2-1
+- New upstream release.
+
 * Mon Aug 28 2023 Takuro Ashie <ashie@clear-code.com> - 4.5.1-1
 - New upstream release.