network_resiliency 0.6.3 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8052be9b61b7e5b4a1106fb70275a788ad70ac19369064863ba9e14a266f7271
-  data.tar.gz: 71c787616cd4d2da2e33cb49b9a41891940215afd978bb33d1efdeb6be6e0d88
+  metadata.gz: dda4e9b4c53597112ab927754e837d83a1e214afe622a4f0dc8ea85ee6aa3c9b
+  data.tar.gz: 572f76610038089107a2709e8ccdebf68ee9495bb1d6a93d13391257000cb108
 SHA512:
-  metadata.gz: 5140b18fff31f7dd33da2cdc158b89c1e7e573f85ada027fea92adfe9f7a43cf2ac64889269cae102409e7d62aa89183ef11ba803e9c1e91d2d00478e0d9d7fd
-  data.tar.gz: 4bcba60c3a1d0737f5765f8043939f9a6557bd0946afc18b266d418749abf7f8b3f7cb3b9bbc68b7dc92ff8d28b21750927a91331d882f1b1afefc967ddfaa48
+  metadata.gz: 91d8f1f41e57faa483d8ec1e18211a60d00a87b5355d2c930481eee04f074b2199ca2bbcf22c91353764708949ed870bdd3be31b59caf56646ac2be15c14bc93
+  data.tar.gz: 6272a3c665309e2e90f66e0ba578799b027372faf9e7a15c7bc9c7dda2112fa427b70cfd4bb11558b01161bd579f0bff1436da66898508396d692cf966bb91c5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+###  v0.6.5  (2023-11-28)
+- per action modes
+
+###  v0.6.4  (2023-11-27)
+- request normalization context
+
 ###  v0.6.3  (2023-11-27)
 - custom request normalization
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    network_resiliency (0.6.3)
+    network_resiliency (0.6.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/network_resiliency/adapter/http.rb

@@ -20,7 +20,7 @@ module NetworkResiliency
 
       refine Net::HTTP do
         def normalize_path(path)
-          NetworkResiliency.normalize_request(:http, path).gsub(
+          NetworkResiliency.normalize_request(:http, path, host: address).gsub(
             Regexp.union(
               NetworkResiliency::Adapter::HTTP::ID_REGEX,
               NetworkResiliency::Adapter::HTTP::UUID_REGEX,

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.6.3"
+  VERSION = "0.6.5"
 end

data/lib/network_resiliency.rb

@@ -15,6 +15,7 @@ module NetworkResiliency
     autoload :Postgres, "network_resiliency/adapter/postgres"
   end
 
+  ACTIONS = [ :connect, :request ].freeze
   ADAPTERS = [ :http, :faraday, :redis, :mysql, :postgres ].freeze
   MODE = [ :observe, :resilient ].freeze
   RESILIENCY_SIZE_THRESHOLD = 1_000
@@ -92,19 +93,43 @@ module NetworkResiliency
     Process.clock_gettime(Process::CLOCK_MONOTONIC) * 1_000
   end
 
-  def mode
-    @mode || :observe
+  def mode(action)
+    unless ACTIONS.include?(action)
+      raise ArgumentError, "invalid NetworkResiliency action: #{action}"
+    end
+
+    (@mode && @mode[action]) || :observe
   end
 
   def mode=(mode)
-    unless MODE.include?(mode)
-      raise ArgumentError, "invalid NetworkResiliency mode: #{mode}"
+    @mode = {}
+
+    if mode.is_a?(Hash)
+      invalid = mode.keys - ACTIONS
+
+      unless invalid.empty?
+        raise ArgumentError, "invalid actions for mode: #{invalid}"
+      end
+
+      mode.each do |action, mode|
+        unless MODE.include?(mode)
+          raise ArgumentError, "invalid NetworkResiliency mode for #{action}: #{mode}"
+        end
+
+        @mode[action] = mode
+      end
+    else
+      unless MODE.include?(mode)
+        raise ArgumentError, "invalid NetworkResiliency mode: #{mode}"
+      end
+
+      ACTIONS.each { |action| @mode[action] = mode }
     end
 
-    @mode = mode
+    @mode.freeze
   end
 
-  def normalize_request(adapter, request = nil, &block)
+  def normalize_request(adapter, request = nil, **context, &block)
     unless ADAPTERS.include?(adapter)
       raise ArgumentError, "invalid adapter: #{adapter}"
     end
@@ -113,13 +138,17 @@ module NetworkResiliency
       raise ArgumentError, "specify request or block, but not both"
     end
 
+    if request.nil? && !context.empty?
+      raise ArgumentError, "can not speficy context without request"
+    end
+
     @normalize_request ||= {}
     @normalize_request[adapter] ||= []
     @normalize_request[adapter] << block if block_given?
 
     if request
       @normalize_request[adapter].reduce(request) do |req, block|
-        block.call(req)
+        block.call(req, **context)
       end
     else
       @normalize_request[adapter]
@@ -232,7 +261,7 @@ module NetworkResiliency
   def timeouts_for(adapter:, action:, destination:, max: nil, units: :ms)
     default = [ max ]
 
-    return default if NetworkResiliency.mode == :observe
+    return default if NetworkResiliency.mode(action.to_sym) == :observe
 
     key = [ adapter, action, destination ].join(":")
     stats = StatsEngine.get(key)
@@ -278,7 +307,7 @@ module NetworkResiliency
     else
       timeouts << p99
 
-      # timeouts << p99 * 10 if NetworkResiliency.mode == :resolute
+      # timeouts << p99 * 10 if NetworkResiliency.mode(action) == :resolute
 
       # unbounded second attempt
       timeouts << nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_resiliency
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.5
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug