Acquire semian resource for each retry in Active Record adapters

Previously, Active Record adapters would retry queries within the
same acquisition attempt. Now, we wrap individual executions to
ensure each retry is counted as one acquisition request.

Author: gmcgibbon

lib/semian/activerecord_adapter.rb

@@ -54,26 +54,6 @@ def initialize(*options)
       super
     end
 
-    if ActiveRecord.version >= Gem::Version.new("8.2.a")
-      def execute_intent(intent)
-        return super if self.class.query_allowlisted?(intent.processed_sql)
-
-        acquire_semian_resource(adapter: semian_adapter_name, scope: :query) do
-          super
-        end
-      end
-    else
-      def raw_execute(sql, *args, **kwargs, &block)
-        if self.class.query_allowlisted?(sql)
-          super
-        else
-          acquire_semian_resource(adapter: semian_adapter_name, scope: :query) do
-            super(sql, *args, **kwargs, &block)
-          end
-        end
-      end
-    end
-
     def active?
       acquire_semian_resource(adapter: semian_adapter_name, scope: :ping) do
         super
@@ -110,6 +90,26 @@ def connect(*args)
       end
     end
 
+    if ActiveRecord.version >= Gem::Version.new("8.2.a")
+      def perform_query(raw_connection, intent)
+        return super if self.class.query_allowlisted?(intent.processed_sql)
+
+        acquire_semian_resource(adapter: semian_adapter_name, scope: :query) do
+          super
+        end
+      end
+    else
+      def raw_execute(sql, *args, **kwargs, &block)
+        if self.class.query_allowlisted?(sql)
+          super
+        else
+          acquire_semian_resource(adapter: semian_adapter_name, scope: :query) do
+            super(sql, *args, **kwargs, &block)
+          end
+        end
+      end
+    end
+
     def semian_adapter_name
       raise NotImplementedError, "#{self.class} must implement an `semian_adapter_name` method"
     end

test/adapters/activerecord_adapter_shared_tests.rb

@@ -347,6 +347,31 @@ def test_circuit_open_errors_do_not_trigger_the_circuit_breaker
     end
   end
 
+  def test_semian_counts_each_retry_attempt_individually
+    @adapter = new_adapter(
+      connection_retries: 1,
+      semian: SEMIAN_OPTIONS.merge(error_threshold: 3),
+    )
+    @adapter.connect!
+
+    query_acquisition_count = 0
+    subscriber = Semian.subscribe do |event, _resource, scope, _adapter|
+      if event == :success && scope == :query
+        query_acquisition_count += 1
+      end
+    end
+
+    # Close the raw connection to trigger a retryable connection error
+    @adapter.send(:raw_connection).close
+
+    value = @adapter.query_value("SELECT 1;")
+
+    assert_equal(2, value)
+    assert_equal(2, query_acquisition_count)
+  ensure
+    Semian.unsubscribe(subscriber)
+  end
+
   private
 
   def adapter_class