Bump default Ruby version to 3.1.3. (#407)

* Pull in the latest fluent-plugin-detect-exceptions.
* Update build Dockerfiles to pull in Ruby 3.1.3.
* Bump minor version.

Gemfile

@@ -10,7 +10,7 @@ gem 'omnibus-software', :github => 'chef/omnibus-software'
 gem 'kubeclient', '4.10.1'
 
 gem 'ohai', '>17.7'
-gem 'chef-cleanroom', '1.0.1'
+gem 'chef-cleanroom', '1.0.5'
 
 # Use open_uri_redirections to allow HTTPS -> HTTP redirections in omnibus
 gem 'open_uri_redirections', '0.2.1'
@@ -20,6 +20,6 @@ gem 'test-kitchen',    '~> 2.4'
 gem 'kitchen-vagrant', '~> 1.6'
 
 group :test do
-  gem 'rake', '~> 10.1.0'
+  gem 'rake', '~> 13.0.6'
   gem 'serverspec', '~> 2.18.0'
 end

build/x86_64_amzn-2016.09/Dockerfile

@@ -25,5 +25,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  && yum -y clean all

build/x86_64_centos6/Dockerfile

@@ -44,5 +44,5 @@ RUN yum -y install \
  # RVM requires running in a login shell.
  # Force RVM to link in a newer openssl version.
  && /bin/bash -l -c 'sed -i "/openssl_version/s/1.0.1i/1.0.1n/" $rvm_path/config/db && rvm pkg install openssl' \
- && /bin/bash -l -c 'rvm requirements && rvm install 2.7.6 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update' \
+ && /bin/bash -l -c 'rvm requirements && rvm install 3.1.3 --with-openssl-dir=$rvm_path/usr && gem install bundler --no-document && gem update' \
  && yum -y clean all

build/x86_64_centos7/Dockerfile

@@ -25,5 +25,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  && yum -y clean all

build/x86_64_centos8/Dockerfile

@@ -32,5 +32,5 @@ RUN yum -y install \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  && yum -y clean all

build/x86_64_debian/Dockerfile

@@ -24,5 +24,5 @@ RUN apt-get -y update \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  && apt-get -y clean

build/x86_64_sles12/Dockerfile

@@ -29,7 +29,7 @@ RUN zypper modifyrepo -d 'OSS Update' \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  # Pretend we're on SLES 12.
  && /bin/sed -i -e 's/VERSION = 42.3/VERSION = 12/' /etc/SuSE-release \
  && /bin/sed -i -e 's/VERSION="42.3"/VERSION="12-SP3"/' -e 's/VERSION_ID="42.3"/VERSION_ID="12.3"/' /etc/os-release \

build/x86_64_sles15/Dockerfile

@@ -24,7 +24,7 @@ RUN zypper -n refresh \
  && /bin/bash get-rvm-io.sh stable \
  && rm -f get-rvm-io.sh \
  # RVM requires running in a login shell.
- && /bin/bash -l -c "rvm requirements && rvm install 2.7.6 && gem install bundler --no-document && gem update" \
+ && /bin/bash -l -c "rvm requirements && rvm install 3.1.3 && gem install bundler --no-document && gem update" \
  # Pretend we're on SLES 15.
  && /bin/sed -i -e 's/VERSION="15.1"/VERSION="15-SP1"/' /etc/os-release \
  && zypper -n clean

config/projects/google-fluentd.rb

@@ -8,13 +8,13 @@
 description "Google Fluentd: A data collector for Google Cloud Logging"
 
 install_dir     "/opt/google-fluentd"
-build_version   "1.9.13"
+build_version   "1.10.0"
 build_iteration 1
 
 # creates required build directories
 dependency "preparation"
 
-override :ruby, :version => '2.7.6'
+override :ruby, :version => '3.1.3'
 override :zlib, :version => '1.2.8'
 override :rubygems, :version => '3.0.0'
 override :postgresql, :version => '9.6.24'

config/software/ruby.rb

@@ -32,7 +32,7 @@
 #   config/software/td-agent-cleanup.rb
 #   config/software/td-agent-files.rb
 #   config/software/td-agent-ui.rb
-default_version "2.7.6"
+default_version "3.1.3"
 
 fips_enabled = (project.overrides[:fips] && project.overrides[:fips][:enabled]) || false
 
@@ -50,6 +50,16 @@
 dependency "libiconv"
 
 # The SHA256 checksums below are for the *.tar.gz packages from https://www.ruby-lang.org/en/downloads/releases.
+version("3.1.3")      { source sha256: "5ea498a35f4cd15875200a52dde42b6eb179e1264e17d78732c3a57cd1c6ab9e" }
+version("3.1.2")      { source sha256: "61843112389f02b735428b53bb64cf988ad9fb81858b8248e22e57336f24a83e" }
+version("3.1.1")      { source sha256: "fe6e4782de97443978ddba8ba4be38d222aa24dc3e3f02a6a8e7701c0eeb619d" }
+version("3.0.5")      { source sha256: "9afc6380a027a4fe1ae1a3e2eccb6b497b9c5ac0631c12ca56f9b7beb4848776" }
+version("3.0.4")      { source sha256: "70b47c207af04bce9acea262308fb42893d3e244f39a4abc586920a1c723722b" }
+version("3.0.3")      { source sha256: "3586861cb2df56970287f0fd83f274bd92058872d830d15570b36def7f1a92ac" }
+version("3.0.2")      { source sha256: "5085dee0ad9f06996a8acec7ebea4a8735e6fac22f22e2d98c3f2bc3bef7e6f1" }
+version("3.0.1")      { source sha256: "369825db2199f6aeef16b408df6a04ebaddb664fb9af0ec8c686b0ce7ab77727" }
+
+version("2.7.7")      { source sha256: "e10127db691d7ff36402cfe88f418c8d025a3f1eea92044b162dd72f0b8c7b90" }
 version("2.7.6")      { source sha256: "e7203b0cc09442ed2c08936d483f8ac140ec1c72e37bb5c401646b7866cb5d10" }
 
 version("2.6.10")     { source sha256: "0dc609f263d49c4176d5725deefc337273676395985b5e017789373e8cadf16e" }

config/software/td-agent-cleanup.rb

@@ -6,7 +6,7 @@
 build do
   block do
     project_name = project.name
-    gem_dir_version = "2.7.0"
+    gem_dir_version = "3.1.0"
 
     # remove unnecessary files
     FileUtils.rm_f(Dir.glob("/opt/#{project_name}/embedded/lib/ruby/gems/#{gem_dir_version}/cache/*.gem"))

config/software/td-agent-files.rb

@@ -14,7 +14,7 @@
     install_path = project.install_dir # for ERB
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
-    gem_dir_version = "2.7.0"
+    gem_dir_version = "3.1.0"
     use_systemd = ohai["os"] == "linux" && ohai["platform_family"] == "suse"
 
     template = ->(*parts) { File.join('templates', *parts) }

config/software/td-agent-ui.rb

@@ -14,7 +14,7 @@
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
     project_name_snake_upcase = project_name_snake.upcase
-    gem_dir_version = "2.7.0"
+    gem_dir_version = "3.1.0"
 
     template = ->(*parts) { File.join('templates', *parts) }
     generate_from_template = ->(dst, src, erb_binding, opts={}) {

config/software/td.rb

@@ -13,7 +13,7 @@
     project_name = project.name # for ERB
     project_name_snake = project.name.gsub('-', '_') # for variable names in ERB
     project_name_snake_upcase = project_name_snake.upcase
-    gem_dir_version = "2.7.0"
+    gem_dir_version = "3.1.0"
 
     template = ->(*parts) { File.join('templates', *parts) }
     generate_from_template = ->(dst, src, erb_binding, opts={}) {

core_gems.rb

@@ -1,7 +1,7 @@
 dir 'core_gems'
-download "json", "2.1.0"
+download "json", "2.6.3"
 download "msgpack", "1.3.2"
-download "cool.io", "1.6.0"
+download "cool.io", "1.7.1"
 download "http_parser.rb", "0.6.0"
 download "yajl-ruby", "1.3.1"
 download "sigdump", "0.2.4"
@@ -11,6 +11,6 @@
 download "tzinfo-data", "1.2016.5"
 unless windows?
   # Gems that don't need to be fetched explicitly on Windows.
-  fetch "google-protobuf", "3.20.0"
-  fetch "grpc", "1.45.0"
+  fetch "google-protobuf", "3.22.1"
+  fetch "grpc", "1.52.0"
 end

plugin_gems.rb

@@ -14,7 +14,7 @@
 download "fluent-plugin-webhdfs", "1.2.3"
 download "fluent-plugin-rewrite-tag-filter", "2.2.0"
 download "fluent-plugin-google-cloud", "0.12.11"
-download "fluent-plugin-detect-exceptions", "0.0.12"
+download "fluent-plugin-detect-exceptions", "0.0.15"
 # Keep this version compatible with
 # https://github.com/fluent/fluent-plugin-prometheus/blob/master/fluent-plugin-prometheus.gemspec
 download "prometheus-client", "0.9.0"

windows-installer/generate_sdl_agent_exe.ps1

@@ -62,7 +62,7 @@ $NSIS_UNZU_ZIP = $BASE_INSTALLER_DIR + "\NSISunzU.zip"
 
 
 # Links for each installer.
-$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-2.7.6-1/rubyinstaller-devkit-2.7.6-1-x86.exe"
+$RUBY_INSTALLER_LINK = "https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.3-1/rubyinstaller-devkit-3.1.3-1-x86.exe"
 $NSIS_INSTALLER_LINK = "http://downloads.sourceforge.net/project/nsis/NSIS%203/3.0/nsis-3.0-setup.exe"
 $NSIS_UNZU_INSTALLER_LINK = "http://nsis.sourceforge.net/mediawiki/images/5/5a/NSISunzU.zip"