semian 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d24779fb714aedf9f83b9ea263d7a7bd0387bc487dbc2313fed0fa265be33b92
-  data.tar.gz: a505d6861420fe42f5f366184b73bdeb6aa8f3b4c5ee2a95ceb224f4a6770286
+  metadata.gz: 47d9f8254a2231b2ca3210ff09331ace5bd23f86bfe0f178a95e64187d3f1203
+  data.tar.gz: 644bcb5a30040499af851b17a9cb46c7a2a4fe0a3896cfd7052bc39e115fb4bc
 SHA512:
-  metadata.gz: 0e24a1414fb44190bde478cc02cf4c2f12dde3b73673446dee2225ee0155951be5121dbf077da05ce8d1746485f8ce2914b46a191ba09f05297f70177713d15f
-  data.tar.gz: d7e41a294ec3819216b4e5762b0ea98ca545002c528e64c291e606c0e1901b847c3d6ee31a4b927c2402b0249fed38faa5b46ecdbb5a4ae9e2ef767fa34702f7
+  metadata.gz: b3d5769728bd70009178ad78d1b397b5a067e2482578e0916ae76963870cc9808499a49cd5a22f6a3ffa254cbb203f5dec37584352815cb9ba32a8a281432468
+  data.tar.gz: 7ea88141334bed5ecf490f25bd3b8d98759de50f38824af6f0af70619f0688eeacea05c80181a079fb3563d887fc1d1dbc6840893eb4a8c78e729a1c4b498b94

data/README.md

@@ -1,5 +1,4 @@
-## Semian ![Build Status](https://github.com/Shopify/semian/actions/workflows/main.yml/badge.svg)
-
+## Semian ![Build Status](https://github.com/Shopify/semian/actions/workflows/test.yml/badge.svg)
 
 ![](http://i.imgur.com/7Vn2ibF.png)
 
@@ -255,10 +254,40 @@ The `semian_options` passed apply to that resource. Semian creates the `semian_i
 from the `name` to look up and store changes in the circuit breaker and bulkhead states
 and associate successes, failures, errors with the protected resource.
 
-We only require that:
-* the `semian_configuration` be **set only once** over the lifetime of the library
-* the output of the `proc` be the same over time, that is, the configuration produced by
-  each pair of `host`, `port` is **the same each time** the callback is invoked.
+We only require that the `semian_configuration` be **set only once** over the lifetime of
+the library.
+
+If you need to return different values for the same pair of `host`/`port` value, you **must**
+include the `dynamic: true` option. Returning different values for the same `host`/`port` values
+without setting the `dynamic` option can lead to undesirable behavior.
+
+A common example for dynamic options is the use of a thread local variable, such as
+`ActiveSupport::CurrentAttributes`, for requests to a service acting as a proxy.
+
+```ruby
+SEMIAN_PARAMETERS = {
+  # ...
+  dynamic: true,
+}
+
+class CurrentSemianSubResource < ActiveSupport::Attributes
+ attribute :name
+end
+
+Semian::NetHTTP.semian_configuration = proc do |host, port|
+  name = "#{host}_#{port}"
+  if (sub_resource_name = CurrentSemianSubResource.name)
+    name << "_#{name}"
+  end
+  SEMIAN_PARAMETERS.merge(name: name)
+end
+
+# Two requests to example.com can use two different semian resources,
+# as long as `CurrentSemianSubResource.name` is set accordingly:
+# CurrentSemianSubResource.set(name: "sub_resource_1") { Net::HTTP.get_response(URI("http://example.com")) }
+# and:
+# CurrentSemianSubResource.set(name: "sub_resource_2") { Net::HTTP.get_response(URI("http://example.com")) }
+```
 
 For most purposes, `"#{host}_#{port}"` is a good default `name`. Custom `name` formats
 can be useful to grouping related subdomains as one resource, so that they all

data/lib/semian/activerecord_trilogy_adapter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "semian/adapter"
-require "activerecord-trilogy-adapter"
+require "active_record"
 require "active_record/connection_adapters/trilogy_adapter"
 
 module ActiveRecord
@@ -47,15 +47,16 @@ module Semian
       super
     end
 
-    def execute(sql, name = nil, async: false, allow_retry: false)
+    def execute(sql, *)
       if query_allowlisted?(sql)
-        super(sql, name, async: async, allow_retry: allow_retry)
+        super
       else
         acquire_semian_resource(adapter: :trilogy_adapter, scope: :execute) do
-          super(sql, name, async: async, allow_retry: allow_retry)
+          super
         end
       end
     end
+    ruby2_keywords :execute
 
     def active?
       acquire_semian_resource(adapter: :trilogy_adapter, scope: :ping) do

data/lib/semian/adapter.rb

@@ -9,19 +9,25 @@ module Semian
     end
 
     def semian_resource
-      @semian_resource ||= case semian_options
+      return @semian_resource if @semian_resource
+
+      case semian_options
       when false
-        UnprotectedResource.new(semian_identifier)
+        @semian_resource = UnprotectedResource.new(semian_identifier)
       when nil
         Semian.logger.info("Semian is not configured for #{self.class.name}: #{semian_identifier}")
-        UnprotectedResource.new(semian_identifier)
+        @semian_resource = UnprotectedResource.new(semian_identifier)
       else
         options = semian_options.dup
         options.delete(:name)
         options[:consumer] = self
         options[:exceptions] ||= []
         options[:exceptions] += resource_exceptions
-        ::Semian.retrieve_or_register(semian_identifier, **options)
+        resource = ::Semian.retrieve_or_register(semian_identifier, **options)
+
+        @semian_resource = resource unless options.fetch(:dynamic, false)
+
+        resource
       end
     end
 
@@ -53,7 +59,11 @@ module Semian
       return @semian_options if defined? @semian_options
 
       options = raw_semian_options
-      @semian_options = options && options.map { |k, v| [k.to_sym, v] }.to_h
+
+      symbolized_options = options && options.transform_keys(&:to_sym) # rubocop:disable Style/SafeNavigation
+      symbolized_options.tap do
+        @semian_options = symbolized_options if !symbolized_options || !symbolized_options.fetch(:dynamic, false)
+      end
     end
 
     def raw_semian_options

data/lib/semian/net_http.rb

@@ -91,16 +91,20 @@ module Semian
     end
 
     def connect
-      return super if disabled?
+      with_cleared_dynamic_options do
+        return super if disabled?
 
-      acquire_semian_resource(adapter: :http, scope: :connection) { super }
+        acquire_semian_resource(adapter: :http, scope: :connection) { super }
+      end
     end
 
     def transport_request(*)
-      return super if disabled?
+      with_cleared_dynamic_options do
+        return super if disabled?
 
-      acquire_semian_resource(adapter: :http, scope: :query) do
-        handle_error_responses(super)
+        acquire_semian_resource(adapter: :http, scope: :query) do
+          handle_error_responses(super)
+        end
       end
     end
 
@@ -125,6 +129,24 @@ module Semian
       end
       result
     end
+
+    def with_cleared_dynamic_options
+      unless @resource_acquisition_in_progress
+        @resource_acquisition_in_progress = true
+        resource_acquisition_started = true
+      end
+
+      yield
+    ensure
+      if resource_acquisition_started
+        if @raw_semian_options&.fetch(:dynamic, false)
+          # Clear @raw_semian_options if the resource was flagged as dynamic.
+          @raw_semian_options = nil
+        end
+
+        @resource_acquisition_in_progress = false
+      end
+    end
   end
 end
 

data/lib/semian/redis/v5.rb

@@ -6,6 +6,14 @@ class Redis
   BaseConnectionError.include(::Semian::AdapterError)
   OutOfMemoryError.include(::Semian::AdapterError)
 
+  class ReadOnlyError < Redis::BaseConnectionError
+    # A ReadOnlyError is a fast failure and we don't want to track these errors so that we can reconnect
+    # to the new primary ASAP
+    def marks_semian_circuits?
+      false
+    end
+  end
+
   class SemianError < BaseConnectionError
     def initialize(semian_identifier, *args)
       super(*args)

data/lib/semian/redis.rb

@@ -32,6 +32,14 @@ class Redis
     end
   end
 
+  class ReadOnlyError < Redis::CommandError
+    # A ReadOnlyError is a fast failure and we don't want to track these errors so that we can reconnect
+    # to the new primary ASAP
+    def marks_semian_circuits?
+      false
+    end
+  end
+
   ResourceBusyError = Class.new(SemianError)
   CircuitOpenError = Class.new(SemianError)
   ResolveError = Class.new(SemianError)

data/lib/semian/redis_client.rb

@@ -14,6 +14,14 @@ class RedisClient
 
   OutOfMemoryError.include(::Semian::AdapterError)
 
+  class ReadOnlyError < RedisClient::ConnectionError
+    # A ReadOnlyError is a fast failure and we don't want to track these errors so that we can reconnect
+    # to the new primary ASAP
+    def marks_semian_circuits?
+      false
+    end
+  end
+
   class SemianError < ConnectionError
     def initialize(semian_identifier, *args)
       super(*args)

data/lib/semian/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Semian
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: semian
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Scott Francis
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies: []
 description: |2
       A Ruby C extention that is used to control access to shared resources
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.12
 signing_key: 
 specification_version: 4
 summary: Bulkheading for Ruby with SysV semaphores