network_resiliency 0.6.4 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46125649099a417a46eaf119d48686bbed8090d4840ee13d607372e93df2df6a
-  data.tar.gz: 5e38386f5e8616d452383d007b97e4e2a4ae0895ad22eddadc8dcda28081da77
+  metadata.gz: 3a117a433190255f909972c26e9e0e9ce40cf9514f5fedd957f5dbdd85579506
+  data.tar.gz: e4f400b0a755df561089df6d5e771e63d1cbc4036ebe34e7588bd8073c11616c
 SHA512:
-  metadata.gz: a995769d78fbdaeff1ca869f277eaf1aafcf46531b0eb9c35b31e9782f9d4ded7c7f88ba50c6c88f95a0e4e356c1b4aa6e11a55a8a7b04a4622e79751174d9d4
-  data.tar.gz: 1e98ffcc20016e723802c9ce6ef2730357d7bf98fb7d86b24a057830f59f2f0fed946c21c0d8a3c4292af9b3013f49f21419e0dba1cbcf40251169c66fe6a4dc
+  metadata.gz: 6b9e8785746b244b51698b4561e377bbb4ea919e6963949e4de017a1ad044a86eb6a92f7ceb9e7903ed4dd44eec998b5512d02045567eb427256c3a7508cf5df
+  data.tar.gz: ad266433a748c586f249b344f28bf77ea2df57f7a75fa56cb7b443eb1cd5a4fd0200b7a043e019568f40a869a9c8a07bd380895e72b9646f65fa75c192632ad7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+###  v0.6.6  (2023-11-29)
+- path normalization
+- http destination ordering
+
+###  v0.6.5  (2023-11-28)
+- per action modes
+
 ###  v0.6.4  (2023-11-27)
 - request normalization context
 

data/Gemfile.lock

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

data/lib/network_resiliency/adapter/http.rb

@@ -104,10 +104,13 @@ module NetworkResiliency
         def transport_request(req, &block)
           return super unless NetworkResiliency.enabled?(:http)
 
+          # strip query params
+          path = URI.parse(req.path).path
+
           destination = [
-            req.method.downcase,
             address,
-            normalize_path(req.path),
+            req.method.downcase,
+            normalize_path(path),
           ].join(":")
 
           idepotent = Net::HTTP::IDEMPOTENT_METHODS_.include?(req.method)

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.6.4"
+  VERSION = "0.6.6"
 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,16 +93,40 @@ 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, **context, &block)
@@ -226,7 +251,7 @@ module NetworkResiliency
     warn "[ERROR] NetworkResiliency: #{e.class}: #{e.message}"
   end
 
-  IP_ADDRESS_REGEX = Regexp.new(/\d{1,3}(\.\d{1,3}){3}/)
+  IP_ADDRESS_REGEX = /\d{1,3}(\.\d{1,3}){3}/
 
   def ignore_destination?(adapter, action, destination)
     # filter raw IP addresses
@@ -236,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)
@@ -282,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.4
+  version: 0.6.6
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-27 00:00:00.000000000 Z
+date: 2023-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug