build(deps): bump puma from 6.6.1 to 7.0.4 (#4576)

* deps: bump puma from 6.6.1 to 7.0.4

Bumps [puma](https://github.com/puma/puma) from 6.6.1 to 7.0.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](puma/puma@v6.6.1...v7.0.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-version: 7.0.4
  dependency-type: direct:production
  update-type: version-update:semver-major

* fix platform ref

* use Puma 6 defaults

---------

Co-authored-by: johha <johannes.haass@sap.com>

Author: dependabot[bot]

Gemfile.lock

@@ -387,7 +387,7 @@ GEM
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.1)
+    puma (7.0.4)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (2.2.18)

lib/cloud_controller/runners/puma_runner.rb

@@ -20,6 +20,10 @@ def initialize(config, app, logger, periodic_updater, request_logs)
           conf.bind "tcp://0.0.0.0:#{config.get(:external_port)}"
         end
 
+        # Keep Puma 6 defaults (25/20s) to avoid surprises with Nginx. Puma 7 defaults may be revisited for performance later.
+        conf.max_keep_alive(25)
+        conf.persistent_timeout(20)
+
         conf.workers(config.get(:puma, :workers) || 1) unless config.get(:puma, :automatic_worker_count)
         num_threads = config.get(:puma, :max_threads) || 1
         conf.threads(num_threads, num_threads)
@@ -33,32 +37,33 @@ def initialize(config, app, logger, periodic_updater, request_logs)
         # Reduce the thread shutdown timeout to 10 seconds (4 [force_shutdown_after] + 5 [SHUTDOWN_GRACE_TIME] + 1)
         conf.force_shutdown_after(4)
 
+        # replace PidFormatter as we already have the pid in the Steno log record
+        formatter = Puma::LogWriter::DefaultFormatter.new
+        conf.log_formatter { |str| formatter.call(str) }
+
         conf.app app
         conf.before_fork do
           Sequel::Model.db.disconnect
         end
-        conf.on_worker_boot do
+        conf.before_worker_boot do
           ENV['PROCESS_TYPE'] = 'puma_worker'
           prometheus_updater.update_gauge_metric(:cc_db_connection_pool_timeouts_total, 0, labels: { process_type: 'puma_worker' })
         end
-        conf.on_worker_shutdown do
+        conf.before_worker_shutdown do
           request_logs.log_incomplete_requests if request_logs
         end
       end
 
       log_writer = Puma::LogWriter.new(StenoIO.new(logger, :info), StenoIO.new(logger, :error))
 
-      # replace PidFormatter as we already have the pid in the Steno log record
-      puma_config.options[:log_formatter] = Puma::LogWriter::DefaultFormatter.new
-
       events = Puma::Events.new
-      events.on_booted do
+      events.after_booted do
         prometheus_updater.update_gauge_metric(:cc_db_connection_pool_timeouts_total, 0, labels: { process_type: 'main' })
         Thread.new do
           EM.run { periodic_updater.setup_updates }
         end
       end
-      events.on_stopped do
+      events.after_stopped do
         EM.stop
       end
 

spec/unit/lib/cloud_controller/runners/puma_runner_spec.rb

@@ -153,27 +153,27 @@ module VCAP::CloudController
         subject
 
         expect(Sequel::Model.db).to receive(:disconnect)
-        puma_launcher.config.final_options[:before_fork].first.call
+        puma_launcher.config.final_options[:before_fork].first[:block].call
       end
 
-      it 'logs incomplete requests on worker shutdown' do
+      it 'logs incomplete requests before worker shutdown' do
         subject
 
         expect(request_logs).to receive(:log_incomplete_requests)
-        puma_launcher.config.final_options[:before_worker_shutdown].first.call
+        puma_launcher.config.final_options[:before_worker_shutdown].first[:block].call
       end
 
-      it 'initializes the cc_db_connection_pool_timeouts_total for the worker on worker boot' do
+      it 'initializes the cc_db_connection_pool_timeouts_total for the worker before worker boot' do
         subject
 
         expect(prometheus_updater).to receive(:update_gauge_metric).with(:cc_db_connection_pool_timeouts_total, 0, labels: { process_type: 'puma_worker' })
-        puma_launcher.config.final_options[:before_worker_boot].first.call
+        puma_launcher.config.final_options[:before_worker_boot].first[:block].call
       end
 
       it 'sets environment variable `PROCESS_TYPE` to `puma_worker`' do
         subject
 
-        puma_launcher.config.final_options[:before_worker_boot].first.call
+        puma_launcher.config.final_options[:before_worker_boot].first[:block].call
         expect(ENV.fetch('PROCESS_TYPE')).to eq('puma_worker')
       end
     end
@@ -194,22 +194,22 @@ module VCAP::CloudController
     end
 
     describe 'Events' do
-      describe 'on_booted' do
+      describe 'after_booted' do
         it 'sets up periodic metrics updater with EM and initializes cc_db_connection_pool_timeouts_total for the main process' do
           expect(Thread).to receive(:new).and_yield
           expect(EM).to receive(:run).and_yield
           expect(periodic_updater).to receive(:setup_updates)
           expect(prometheus_updater).to receive(:update_gauge_metric).with(:cc_db_connection_pool_timeouts_total, 0, labels: { process_type: 'main' })
 
-          puma_launcher.events.fire(:on_booted)
+          puma_launcher.events.fire(:after_booted)
         end
       end
 
-      describe 'on_stopped' do
+      describe 'after_stopped' do
         it 'stops EM and logs incomplete requests' do
           expect(EM).to receive(:stop)
 
-          puma_launcher.events.fire(:on_stopped)
+          puma_launcher.events.fire(:after_stopped)
         end
       end
     end