Add adapter-agnostic modules for semian errors

lib/semian.rb

@@ -155,6 +155,14 @@ def to_s
     end
   end
 
+  module AdapterResourceBusyError
+    include AdapterError
+  end
+
+  module AdapterCircuitOpenError
+    include AdapterError
+  end
+
   attr_accessor :logger
 
   self.logger = Logger.new($stderr)

lib/semian/activerecord_postgresql_adapter.rb

@@ -15,8 +15,8 @@ def initialize(semian_identifier, *args)
         end
       end
 
-      ResourceBusyError = Class.new(SemianError)
-      CircuitOpenError = Class.new(SemianError)
+      ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+      CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
     end
   end
 end

lib/semian/activerecord_trilogy_adapter.rb

@@ -15,8 +15,8 @@ def initialize(semian_identifier, *args)
         end
       end
 
-      ResourceBusyError = Class.new(SemianError)
-      CircuitOpenError = Class.new(SemianError)
+      ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+      CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
     end
   end
 end

lib/semian/grpc.rb

@@ -18,8 +18,8 @@ def initialize(semian_identifier, *args)
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
 end
 
 module Semian

lib/semian/mysql2.rb

@@ -13,8 +13,8 @@ def initialize(semian_identifier, *args)
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
 end
 
 module Semian

lib/semian/net_http.rb

@@ -13,8 +13,8 @@ def initialize(semian_identifier, *args)
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
 end
 
 module Semian

lib/semian/redis.rb

@@ -50,8 +50,8 @@ def marks_semian_circuits?
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
   ResolveError = Class.new(SemianError)
 
   alias_method :_original_initialize, :initialize

lib/semian/redis/v5.rb

@@ -31,8 +31,8 @@ def initialize(semian_identifier, *args)
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
 
   Client::ERROR_MAPPING.merge!(
     RedisClient::CircuitOpenError => Redis::CircuitOpenError,

lib/semian/redis_client.rb

@@ -40,8 +40,8 @@ def initialize(semian_identifier, *args)
     end
   end
 
-  ResourceBusyError = Class.new(SemianError)
-  CircuitOpenError = Class.new(SemianError)
+  ResourceBusyError = Class.new(SemianError) { include ::Semian::AdapterResourceBusyError }
+  CircuitOpenError = Class.new(SemianError) { include ::Semian::AdapterCircuitOpenError }
 
   module SemianConfig
     def initialize(semian: nil, **kwargs)

test/error_modules_test.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "test_helper"
+require "semian/activerecord_trilogy_adapter"
+require "semian/activerecord_postgresql_adapter"
+require "semian/net_http"
+require "semian/grpc"
+require "semian/redis"
+require "semian/redis_client"
+require "semian/mysql2"
+
+class ErrorModulesTest < Minitest::Test
+  ERRORS = [
+    ActiveRecord::ConnectionAdapters::TrilogyAdapter,
+    ActiveRecord::ConnectionAdapters::PostgreSQLAdapter,
+    Net,
+    GRPC,
+    Redis,
+    RedisClient,
+    Mysql2,
+  ].map { |mod| [mod.const_get(:ResourceBusyError), mod.const_get(:CircuitOpenError)] }
+
+  def test_adapter_errors_rescue
+    ERRORS.each do |busy_error, circuit_error|
+      assert_kind_of(busy_error.new, Semian::AdapterResourceBusyError)
+      assert_kind_of(circuit_error.new, Semian::AdapterCircuitOpenError)
+    end
+  end
+
+  def test_markers_do_not_match_unrelated_activerecord_errors
+    [ActiveRecord::RecordNotFound, ActiveRecord::StatementInvalid, ActiveRecord::AdapterTimeout].each do |record_error|
+      error = record_error.new
+
+      refute_kind_of(error.is_a?(Semian::AdapterResourceBusyError))
+      refute_kind_of(error.is_a?(Semian::AdapterCircuitOpenError))
+    end
+  end
+end