Update fluent-package and fluentd versions in test cases

awslabs · Feb 29, 2024 · df46092 · df46092
1 parent fac107f
commit df46092
Show file tree

Hide file tree

Showing 19 changed files with 160 additions and 22 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,21 +4,21 @@ on: [ push, pull_request ]
 
 # Test with supported td-agent versions
 # https://docs.fluentd.org/quickstart/support#change-logs
-# https://docs.treasuredata.com/display/public/PD/The+td-agent+Change+Log
 # https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         include:
-          - gemfile: gemfiles/Gemfile.fluentd-1.15.3 # Latest Fluentd / https://www.fluentd.org/download
-            ruby-version: 3.2.0 # Latest supported Ruby / https://www.ruby-lang.org/en/downloads
           - gemfile: gemfiles/Gemfile.fluentd-0.14.22 # Oldest supported Fluentd
-            ruby-version: 2.6.10 # Oldest supported Ruby
-          # - gemfile: gemfiles/Gemfile.td-agent-3.1.0
-          #   ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.0/config/projects/td-agent3.rb#L20
+            ruby-version: 2.4.2 # Oldest supported Ruby
+          - gemfile: gemfiles/Gemfile.fluentd-1.16.3 # Latest Fluentd / https://www.fluentd.org/download
+            ruby-version: 3.3.0 # Latest supported Ruby / https://www.ruby-lang.org/en/downloads
+          - gemfile: gemfiles/Gemfile.td-agent-3.1.0 # Oldest supported td-agent
+            ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.0/config/projects/td-agent3.rb#L20
           # - gemfile: gemfiles/Gemfile.td-agent-3.1.1
           #   ruby-version: 2.4.2 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.1.1/config/projects/td-agent3.rb#L17
           # - gemfile: gemfiles/Gemfile.td-agent-3.2.0
@@ -41,10 +41,10 @@ jobs:
           #   ruby-version: 2.4.9 # https://github.com/treasure-data/omnibus-td-agent/commit/da5cb39ec5396f652cd30bad5bb8ef4ec19071a9#diff-f73e763ace61e7c4bf48bf94bd6e295bc2cfd1ce5f9e38a4d19e266353e37498R22
           # - gemfile: gemfiles/Gemfile.td-agent-3.7.1
           #   ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.7.1/config/projects/td-agent3.rb#L22
-          - gemfile: gemfiles/Gemfile.td-agent-3.8.0 # Latest official release of td-agent v3
-            ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.8.0/config/projects/td-agent3.rb#L22
-          # - gemfile: gemfiles/Gemfile.td-agent-3.8.1 # Maintenance release of td-agent v3
-          #   ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/pull/273/files#diff-f73e763ace61e7c4bf48bf94bd6e295bc2cfd1ce5f9e38a4d19e266353e37498R22
+          # - gemfile: gemfiles/Gemfile.td-agent-3.8.0
+          #   ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/blob/v3.8.0/config/projects/td-agent3.rb#L22
+          - gemfile: gemfiles/Gemfile.td-agent-3.8.1 # Latest release of td-agent v3
+            ruby-version: 2.4.10 # https://github.com/treasure-data/omnibus-td-agent/pull/273/files#diff-f73e763ace61e7c4bf48bf94bd6e295bc2cfd1ce5f9e38a4d19e266353e37498R22
           # - gemfile: gemfiles/Gemfile.td-agent-4.0.0
           #   ruby-version: 2.7.1 # https://github.com/fluent/fluent-package-builder/blob/41b3436d43c21e48a9cf34c58ae640f0e3dfb44c/td-agent/config.rb#L16
           - gemfile: gemfiles/Gemfile.td-agent-4.0.1
@@ -67,6 +67,18 @@ jobs:
           #   ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/config.rb#L23
           - gemfile: gemfiles/Gemfile.td-agent-4.4.2
             ruby-version: 2.7.6 # https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/config.rb#L23
+          # - gemfile: gemfiles/Gemfile.td-agent-4.5.0
+          #   ruby-version: 2.7.8 # https://github.com/fluent/fluent-package-builder/blob/v4.5.0/td-agent/config.rb#L19
+          # - gemfile: gemfiles/Gemfile.td-agent-4.5.1
+          #   ruby-version: 2.7.8 # https://github.com/fluent/fluent-package-builder/blob/v4.5.1/td-agent/config.rb#L19
+          - gemfile: gemfiles/Gemfile.td-agent-4.5.2 # Latest release of td-agent v4
+            ruby-version: 2.7.8 # https://github.com/fluent/fluent-package-builder/blob/v4.5.2/td-agent/config.rb#L19
+          # - gemfile: gemfiles/Gemfile.fluent-package-5.0.0
+          #   ruby-version: 3.2.2 # https://github.com/fluent/fluent-package-builder/blob/v5.0.0/fluent-package/config.rb#L26
+          # - gemfile: gemfiles/Gemfile.fluent-package-5.0.1
+          #   ruby-version: 3.2.2 # https://github.com/fluent/fluent-package-builder/blob/v5.0.1/fluent-package/config.rb#L26
+          - gemfile: gemfiles/Gemfile.fluent-package-5.0.2
+            ruby-version: 3.2.2 # https://github.com/fluent/fluent-package-builder/blob/v5.0.2/fluent-package/config.rb#L26
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}

diff --git a/gemfiles/Gemfile.fluent-package-5.0.0 b/gemfiles/Gemfile.fluent-package-5.0.0
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for fluent-package v5.0.0
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.0/fluent-package/config.rb#L10
+gem "fluentd", "1.16.2"
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.0/fluent-package/Gemfile#L49-L59
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.1.0"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.785.0"
+gem "aws-sdk-core", "3.178.0"
+gem "aws-sdk-kms", "1.71.0"
+gem "aws-sdk-sqs", "1.61.0"
+gem "aws-sigv4", "1.6.0"
+gem "aws-sdk-s3", "1.129.0"
+gem "fluent-plugin-s3", "1.7.2"
diff --git a/gemfiles/Gemfile.fluent-package-5.0.1 b/gemfiles/Gemfile.fluent-package-5.0.1
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for fluent-package v5.0.1
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.1/fluent-package/config.rb#L10
+gem "fluentd", "1.16.2"
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.1/fluent-package/Gemfile#L49-L59
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.1.0"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.785.0"
+gem "aws-sdk-core", "3.178.0"
+gem "aws-sdk-kms", "1.71.0"
+gem "aws-sdk-sqs", "1.61.0"
+gem "aws-sigv4", "1.6.0"
+gem "aws-sdk-s3", "1.129.0"
+gem "fluent-plugin-s3", "1.7.2"
diff --git a/gemfiles/Gemfile.fluent-package-5.0.2 b/gemfiles/Gemfile.fluent-package-5.0.2
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for fluent-package v5.0.2
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.2/fluent-package/config.rb#L10
+gem "fluentd", "1.16.3"
+# https://github.com/fluent/fluent-package-builder/blob/v5.0.2/fluent-package/Gemfile#L49-L59
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.1.0"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.785.0"
+gem "aws-sdk-core", "3.178.0"
+gem "aws-sdk-kms", "1.71.0"
+gem "aws-sdk-sqs", "1.61.0"
+gem "aws-sigv4", "1.6.0"
+gem "aws-sdk-s3", "1.129.0"
+gem "fluent-plugin-s3", "1.7.2"
diff --git a/gemfiles/Gemfile.fluentd-1.15.3 → gemfiles/Gemfile.fluentd-1.16.3 b/gemfiles/Gemfile.fluentd-1.15.3 → gemfiles/Gemfile.fluentd-1.16.3
@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
 gemspec path: ".."
 
-gem "fluentd", "1.15.3"
+gem "fluentd", "1.16.3"
diff --git a/gemfiles/Gemfile.td-agent-4.0.0 b/gemfiles/Gemfile.td-agent-4.0.0
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.0.0
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/41b3436d43c21e48a9cf34c58ae640f0e3dfb44c/td-agent/config.rb#L4
 gem "fluentd", "1.11.1"
 # https://github.com/fluent/fluent-package-builder/blob/8a8721c2a0b05bc487fb81a04aa079c8bb4e47fb/gemfiles/linux/Gemfile#L31

diff --git a/gemfiles/Gemfile.td-agent-4.0.1 b/gemfiles/Gemfile.td-agent-4.0.1
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.0.1
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.0.1/td-agent/config.rb#L4
 gem "fluentd", "1.11.2"
 # https://github.com/fluent/fluent-package-builder/blob/v4.0.1/gemfiles/linux/Gemfile#L35-L42

diff --git a/gemfiles/Gemfile.td-agent-4.1.0 b/gemfiles/Gemfile.td-agent-4.1.0
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.1.0
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.1.0/td-agent/config.rb#L4
 gem "fluentd", "1.12.1"
 # https://github.com/fluent/fluent-package-builder/blob/v4.1.0/td-agent/Gemfile#L32-L42

diff --git a/gemfiles/Gemfile.td-agent-4.1.1 b/gemfiles/Gemfile.td-agent-4.1.1
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.1.1
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.1.1/td-agent/config.rb#L4
 gem "fluentd", "1.12.3"
 # https://github.com/fluent/fluent-package-builder/blob/v4.1.1/td-agent/Gemfile#L32-L42

diff --git a/gemfiles/Gemfile.td-agent-4.2.0 b/gemfiles/Gemfile.td-agent-4.2.0
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.2.0
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.2.0/td-agent/config.rb#L4
 gem "fluentd", "1.13.3"
 # https://github.com/fluent/fluent-package-builder/blob/v4.2.0/td-agent/Gemfile#L42-L52

diff --git a/gemfiles/Gemfile.td-agent-4.3.0 b/gemfiles/Gemfile.td-agent-4.3.0
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.3.0
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.0/td-agent/config.rb#L4
 gem "fluentd", "1.14.3"
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.0/td-agent/Gemfile#L43-L53

diff --git a/gemfiles/Gemfile.td-agent-4.3.1 b/gemfiles/Gemfile.td-agent-4.3.1
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.3.1
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.1/td-agent/config.rb#L4
 gem "fluentd", "1.14.6"
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.1/td-agent/Gemfile#L44-L54

diff --git a/gemfiles/Gemfile.td-agent-4.3.2 b/gemfiles/Gemfile.td-agent-4.3.2
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.3.2
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.2/td-agent/config.rb#L4
 gem "fluentd", "1.14.6"
 # https://github.com/fluent/fluent-package-builder/blob/v4.3.2/td-agent/Gemfile#L45-L55

diff --git a/gemfiles/Gemfile.td-agent-4.4.0 b/gemfiles/Gemfile.td-agent-4.4.0
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.4.0
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.0/td-agent/config.rb#L4
 gem "fluentd", "1.15.1"
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.0/td-agent/Gemfile#L45-L55

diff --git a/gemfiles/Gemfile.td-agent-4.4.1 b/gemfiles/Gemfile.td-agent-4.4.1
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.4.1
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/config.rb#L4
 gem "fluentd", "1.15.2"
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.1/td-agent/Gemfile#L45-L55

diff --git a/gemfiles/Gemfile.td-agent-4.4.2 b/gemfiles/Gemfile.td-agent-4.4.2
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec path: ".."
 
 # Specify related gems for td-agent v4.4.2
-# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG.md
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/config.rb#L4
 gem "fluentd", "1.15.3"
 # https://github.com/fluent/fluent-package-builder/blob/v4.4.2/td-agent/Gemfile#L45-L55

diff --git a/gemfiles/Gemfile.td-agent-4.5.0 b/gemfiles/Gemfile.td-agent-4.5.0
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.5.0
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.0/td-agent/config.rb#L4
+gem "fluentd", "1.16.1"
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.0/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.0"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.752.0"
+gem "aws-sdk-core", "3.171.0"
+gem "aws-sdk-kms", "1.63.0"
+gem "aws-sdk-sqs", "1.53.0"
+gem "aws-sigv4", "1.5.2"
+gem "aws-sdk-s3", "1.121.0"
+gem "fluent-plugin-s3", "1.7.2"
diff --git a/gemfiles/Gemfile.td-agent-4.5.1 b/gemfiles/Gemfile.td-agent-4.5.1
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.5.1
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.1/td-agent/config.rb#L4
+gem "fluentd", "1.16.2"
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.1/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.1.0"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.785.0"
+gem "aws-sdk-core", "3.178.0"
+gem "aws-sdk-kms", "1.71.0"
+gem "aws-sdk-sqs", "1.61.0"
+gem "aws-sigv4", "1.6.0"
+gem "aws-sdk-s3", "1.129.0"
+gem "fluent-plugin-s3", "1.7.2"
diff --git a/gemfiles/Gemfile.td-agent-4.5.2 b/gemfiles/Gemfile.td-agent-4.5.2
@@ -0,0 +1,21 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in fluent-plugin-kinesis.gemspec
+gemspec path: ".."
+
+# Specify related gems for td-agent v4.5.2
+# https://github.com/fluent/fluent-package-builder/blob/master/CHANGELOG-v4.md
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.2/td-agent/config.rb#L4
+gem "fluentd", "1.16.3"
+# https://github.com/fluent/fluent-package-builder/blob/v4.5.2/td-agent/Gemfile#L45-L55
+gem "prometheus-client", "2.1.0"
+gem "fluent-plugin-prometheus", "2.1.0"
+gem "fluent-plugin-prometheus_pushgateway", "0.1.1"
+gem "jmespath", "1.6.2"
+gem "aws-partitions", "1.785.0"
+gem "aws-sdk-core", "3.178.0"
+gem "aws-sdk-kms", "1.71.0"
+gem "aws-sdk-sqs", "1.61.0"
+gem "aws-sigv4", "1.6.0"
+gem "aws-sdk-s3", "1.129.0"
+gem "fluent-plugin-s3", "1.7.2"