network_resiliency 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94a624ababefe0045c52a57be145826d8072f8367d494afdef4892eb81af066
-  data.tar.gz: dc1412ead0b212c14d1707236cb76b5d19935ab6d9562cee01ef6a761c70bcb5
+  metadata.gz: 8052be9b61b7e5b4a1106fb70275a788ad70ac19369064863ba9e14a266f7271
+  data.tar.gz: 71c787616cd4d2da2e33cb49b9a41891940215afd978bb33d1efdeb6be6e0d88
 SHA512:
-  metadata.gz: 2db8772835afb0358179255e94960499fbfa4bcebcd6bba532e38a0a533b658e9dfd2a94a12de5d7ef29aef372d671e14d04a226b19acddc1621d80617056d7a
-  data.tar.gz: b9aa489ff41eecde7aa9bee4e0b8377a8952827dff9a0911272d987bd487fb4b5bdcde02974414bc6ad25b7c6490585282baa4dd189e66a76d5b549743af088f
+  metadata.gz: 5140b18fff31f7dd33da2cdc158b89c1e7e573f85ada027fea92adfe9f7a43cf2ac64889269cae102409e7d62aa89183ef11ba803e9c1e91d2d00478e0d9d7fd
+  data.tar.gz: 4bcba60c3a1d0737f5765f8043939f9a6557bd0946afc18b266d418749abf7f8b3f7cb3b9bbc68b7dc92ff8d28b21750927a91331d882f1b1afefc967ddfaa48

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+###  v0.6.3  (2023-11-27)
+- custom request normalization
+
+###  v0.6.2  (2023-11-26)
+- syncer
+- redis without_reconnect
+
 ###  v0.6.1  (2023-11-21)
 - bugfix
 - redis system errors

data/Gemfile.lock

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

data/lib/network_resiliency/adapter/http.rb

@@ -17,15 +17,16 @@ module NetworkResiliency
 
       ID_REGEX = %r{/[0-9]+(?=/|$)}.freeze
       UUID_REGEX = %r`/\h{8}-\h{4}-(\h{4})-\h{4}-\h{12}(?=/|$)`.freeze
+
       refine Net::HTTP do
         def normalize_path(path)
-          path.gsub(
+          NetworkResiliency.normalize_request(:http, path).gsub(
             Regexp.union(
               NetworkResiliency::Adapter::HTTP::ID_REGEX,
               NetworkResiliency::Adapter::HTTP::UUID_REGEX,
             ),
             '/x',
-          )
+          ).gsub(%r{//+}, "/")
         end
 
         def with_resilience(action, destination, idempotent, &block)

data/lib/network_resiliency/adapter/redis.rb

@@ -82,7 +82,7 @@ module NetworkResiliency
 
             @options[timeout_key] = timeouts.shift
 
-            yield
+            without_reconnect { yield }
           rescue ::Redis::BaseConnectionError, SystemCallError => e
             # capture error
 

data/lib/network_resiliency/syncer.rb

@@ -0,0 +1,39 @@
+module NetworkResiliency
+  class Syncer < Thread
+    class << self
+      def start(redis)
+        @instance&.shutdown
+        @instance = new(redis)
+      end
+
+      def stop
+        @instance&.shutdown
+        @instance = nil
+      end
+    end
+
+    def initialize(redis)
+      @redis = redis
+
+      super { sync }
+    end
+
+    def shutdown
+      @shutdown = true
+
+      # prevent needless delay
+      raise Interrupt if status == "sleep"
+    end
+
+    private
+
+    def sync
+      until @shutdown
+        StatsEngine.sync(@redis)
+
+        sleep(3)
+      end
+    rescue Interrupt
+    end
+  end
+end

data/lib/network_resiliency/version.rb

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

data/lib/network_resiliency.rb

@@ -1,6 +1,7 @@
 require "network_resiliency/refinements"
 require "network_resiliency/stats"
 require "network_resiliency/stats_engine"
+require "network_resiliency/syncer"
 require "network_resiliency/version"
 
 using NetworkResiliency::Refinements
@@ -14,6 +15,7 @@ module NetworkResiliency
     autoload :Postgres, "network_resiliency/adapter/postgres"
   end
 
+  ADAPTERS = [ :http, :faraday, :redis, :mysql, :postgres ].freeze
   MODE = [ :observe, :resilient ].freeze
   RESILIENCY_SIZE_THRESHOLD = 1_000
 
@@ -24,7 +26,7 @@ module NetworkResiliency
   def configure
     yield self if block_given?
 
-    start_syncing if redis
+    Syncer.start(redis) if redis
   end
 
   def patch(*adapters)
@@ -102,6 +104,28 @@ module NetworkResiliency
     @mode = mode
   end
 
+  def normalize_request(adapter, request = nil, &block)
+    unless ADAPTERS.include?(adapter)
+      raise ArgumentError, "invalid adapter: #{adapter}"
+    end
+
+    if request && block_given?
+      raise ArgumentError, "specify request or block, but not both"
+    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)
+      end
+    else
+      @normalize_request[adapter]
+    end
+  end
+
   # private
 
   def record(adapter:, action:, destination:, duration:, error:, timeout:, attempts: 1)
@@ -290,13 +314,10 @@ module NetworkResiliency
   def reset
     @enabled = nil
     @mode = nil
+    @normalize_request = nil
     Thread.current["network_resiliency"] = nil
     StatsEngine.reset
-
-    if @sync_worker
-      @sync_worker.kill
-      @sync_worker = nil
-    end
+    Syncer.stop
   end
 
   # private
@@ -304,18 +325,4 @@ module NetworkResiliency
   def thread_state
     Thread.current["network_resiliency"] ||= {}
   end
-
-  def start_syncing
-    @sync_worker.kill if @sync_worker
-
-    raise "Redis not configured" unless redis
-
-    @sync_worker = Thread.new do
-      loop do
-        StatsEngine.sync(redis)
-
-        sleep(3)
-      end
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: network_resiliency
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Daniel Pepper
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -198,6 +198,7 @@ files:
 - lib/network_resiliency/refinements.rb
 - lib/network_resiliency/stats.rb
 - lib/network_resiliency/stats_engine.rb
+- lib/network_resiliency/syncer.rb
 - lib/network_resiliency/version.rb
 - network_resiliency.gemspec
 homepage: https://github.com/dpep/network_resiliency_rb