Make recent changes backward compatible

Remove testing of EOL Ruby and Rails versions.

Author: reidmorrison

.github/workflows/ci.yml

@@ -12,37 +12,26 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - rails: "6.0"
-            ruby: "2.7"
-
-          - rails: "6.1"
-            ruby: "2.7"
-          - rails: "6.1"
-            ruby: "3.0"
-          - rails: "6.1"
-            ruby: "3.1"
           - rails: "6.1"
             ruby: "3.2"
 
           - rails: "7.0"
-            ruby: "3.1"
+            ruby: "3.2"
           - rails: "7.0b"
             ruby: "3.2"
 
           - rails: "7.1"
-            ruby: "3.1"
+            ruby: "3.2"
           - rails: "7.1b"
-            ruby: "3.1"
-          - rails: "7.1.1"
             ruby: "3.2"
-          - rails: "7.1"
+          - rails: "7.1.1"
             ruby: "3.2"
 
           - rails: "7.2"
             ruby: "3.3"
 
           - rails: "8.0"
-            ruby: "3.3"
+            ruby: "3.4"
 
     env:
       BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile

.gitignore

@@ -17,3 +17,4 @@ TODO.md
 
 .tool-versions
 test/dummy/db/test.sqlite3
+mise.toml

Appraisals

@@ -1,9 +1,3 @@
-appraise "rails_6.0" do
-  gem "rails", "~> 6.0.0"
-  gem "sidekiq", "~> 4.2"
-  gem "sqlite3", "~> 1.4"
-end
-
 appraise "rails_6.1" do
   gem "rails", "~> 6.1.0"
   gem "sidekiq", "~> 5.2"
@@ -41,6 +35,11 @@ appraise "rails_7.1b" do
 end
 
 appraise "rails_7.2" do
-  gem "rails", "~> 7.2.0.beta2"
+  gem "rails", "~> 7.2.0"
+  gem "sidekiq", "~> 7.2.4"
+end
+
+appraise "rails_8.0" do
+  gem "rails", "~> 8.0.0"
   gem "sidekiq", "~> 7.2.4"
 end

Gemfile

@@ -12,7 +12,7 @@ gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
 
-gem "rails", "~> 7.2.0.beta2"
+gem "rails", "~> 8.0.0"
 gem "sidekiq", "~> 7.2.4"
 gem "sqlite3"
 

gemfiles/rails_6.0.gemfile

@@ -10,7 +10,7 @@ gem "minitest"
 gem "minitest-rails"
 gem "rake"
 gem "sprockets", "< 4.0"
-gem "rails", "~> 7.2.0.beta2"
+gem "rails", "~> 7.2.0"
 gem "sidekiq", "~> 7.2.4"
 gem "sqlite3"
 gem "rubocop"

gemfiles/rails_7.2.gemfile

@@ -36,11 +36,18 @@ def call(env)
 
       def call_app(request, env)
         instrumenter        = ActiveSupport::Notifications.instrumenter
-        handle              = instrumenter.build_handle "request.action_dispatch", request: request
-        instrumenter_finish = lambda {
-          handle.finish
-        }
-        handle.start
+        if (Rails::VERSION::MAJOR == 7 && Rails::VERSION::MINOR >= 1) || Rails::VERSION::MAJOR > 7
+          handle              = instrumenter.build_handle "request.action_dispatch", request: request
+          instrumenter_finish = lambda {
+            handle.finish
+          }
+          handle.start
+        else
+          instrumenter_state  = instrumenter.start "request.action_dispatch", request: request
+          instrumenter_finish = lambda {
+            instrumenter.finish_with_state(instrumenter_state, "request.action_dispatch", request: request)
+          }
+        end
 
         logger.send(self.class.started_request_log_level) { started_request_message(request) }
         status, headers, body = @app.call(env)

lib/rails_semantic_logger/rack/logger.rb

@@ -11,7 +11,7 @@ class Application < Rails::Application
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
     config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3
-    config.active_record.async_query_executor = :global_thread_pool
+    config.active_record.async_query_executor = :global_thread_pool if Rails::VERSION::MAJOR >= 7 && Rails::VERSION::MINOR >= 1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers