1536622 - updating to be compatible with Rails 7.1

config/database.yml

@@ -10,7 +10,6 @@
   ).inject({}) do |memo, conf|
     k, v = conf
     memo[k.sub(Regexp.new("^surrogate_key_logging_"),'')] = v if k.starts_with?("surrogate_key_logging_")
-
     memo
   end.to_yaml
 %>

lib/surrogate_key_logging.rb

@@ -85,7 +85,6 @@ def add_param_to_filter(attr, *parents)
   end
 
   require 'active_support/parameter_filter'
-  ::ActiveSupport::ParameterFilter::CompiledFilter.send(:prepend, ActiveSupport)
   KeyStore.eager_load!
   ::Rails::Application::Configuration.send(:include, Configuration)
   require 'surrogate_key_logging/engine'

lib/surrogate_key_logging/action_dispatch/params_filter.rb

@@ -11,7 +11,7 @@ def call(params, req = nil)
       end
 
       attr_reader :params, :req
-      
+
       def initialize(params, req = nil)
         @params = params
         @req = req
@@ -28,7 +28,7 @@ def filterable_params
 
       def params_filter
         return @params_filter if @params_filter
-        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup
+        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup || []
         attrs += filterable_params
         @params_filter = SurrogateKeyLogging.filter_for_attributes(attrs)
       end

lib/surrogate_key_logging/action_dispatch/query_string_filter.rb

@@ -11,7 +11,7 @@ def call(qs, req = nil)
       end
 
       attr_reader :qs, :req
-      
+
       def initialize(qs, req = nil)
         @qs = qs
         @req = req
@@ -24,11 +24,11 @@ def path_params
           {}
         end
       end
-  
+
       def controller_class
         @controller_class = req.controller_class_for(path_params[:controller])
       end
-  
+
       def filterable_params
         @filterable_params ||= if controller_class.respond_to?(:surrogate_params)
           surrogate_params = controller_class.surrogate_params
@@ -40,13 +40,13 @@ def filterable_params
 
       def params_filter
         return @params_filter if @params_filter
-        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup
+        attrs = SurrogateKeyLogging.parameter_filter.instance_variable_get(:@filters).dup || []
         attrs += filterable_params
         @params_filter = SurrogateKeyLogging.filter_for_attributes(attrs)
       end
 
       def filtered
-        @filtered ||= qs.gsub(::ActionDispatch::Request::PAIR_RE) do |_|
+        @filtered ||= qs.gsub(%r{(#{"[^&;=]+"})=(#{"[^&;=]+"})}) do |_|
           params_filter.filter(::Regexp.last_match(1) => ::Regexp.last_match(2)).first.join('=')
         end
       end

lib/surrogate_key_logging/active_record/log_subscriber.rb

@@ -5,7 +5,7 @@ module ActiveRecord
     class LogSubscriber < ::ActiveRecord::LogSubscriber
 
       def sql(event) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-        self.class.runtime += event.duration
+        ActiveSupport::Notifications.instrument("sql.active_record", duration: event.duration)
         return unless logger.debug?
 
         payload = event.payload
@@ -35,7 +35,7 @@ def sql(event) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity,
         end
 
         name = colorize_payload_name(name, payload[:name])
-        sql  = color(sql, sql_color(sql), true) if colorize_logging
+        sql  = color(sql, sql_color(sql), bold: true) if colorize_logging
 
         debug "  #{name}  #{sql}#{binds}"
       end