network_resiliency 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c372873056610bf21197e55a265bdfd03e200b064c727a4713ea8725ae3d696d
-  data.tar.gz: 5da4933543bf9a57d46ed4a3b4d94a692524e641f6c1293d8bcb99aa74c0c9d9
+  metadata.gz: 4eb56ca7bf0ce8610999ebfa3d51ddb42c0d1781fdbb944f305e362c03bb0f9a
+  data.tar.gz: 9e40b02dfd30f3d60d0983586fe09842fab43a1decc1c419bf6b3b4f640c5613
 SHA512:
-  metadata.gz: b8e9b66cb83ff5bfda080c43935e8834228cfbd16afd0c1229be2b7edbea8469702d917ae7b6bb7383b774ebf68802e9a5572ee89357723d479d1dd8b3a91f2c
-  data.tar.gz: 68f241f0bd9b7ef5b0b291e2e1be11aa3d2c377f6b4b70552ba32638122bff300bc1252b279a13c41e96af3ffa8843bc571b74bd9aac7f1300f27472e18001ff
+  metadata.gz: f872730f5fd3e25bb405b24b5cc0c0e3a807c9c582ca70d8bbc3ee172cba6126433f2a3f7d116a9df059fe08a5f4215856a7e3318d50bc160ebecfd463387aa7
+  data.tar.gz: 8db779e5dd4fee001e9298806510351d6d0d0748ba0760d37acc9e205b6a425ea22a1f0757d26512a63936020baf764ec266620eb9cd6cbe23745abbb4f8acba

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+###  v0.5.0  (2023-11-16)
+- postgres timeout stats
+- mysql timeout stats
+- http resiliency
+
+###  v0.4.1  (2023-11-14)
+- timeout units
+
 ###  v0.4.0  (2023-11-13)
 - redis resiliency
 - timeouts_for

data/Gemfile.lock

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

data/README.md

@@ -18,7 +18,7 @@ NetworkResiliency.configure do |conf|
   conf.patch :redis
 end
 
-Redis.new.connect
+Redis.new.ping
 ```
 
 

data/lib/network_resiliency/adapter/http.rb

@@ -18,23 +18,45 @@ module NetworkResiliency
       module Instrumentation
         def connect
           return super unless NetworkResiliency.enabled?(:http)
+          original_timeout = self.open_timeout
+
+          timeouts = NetworkResiliency.timeouts_for(
+            adapter: "http",
+            action: "connect",
+            destination: address,
+            max: original_timeout,
+            units: :seconds,
+          )
+
+          attempts = 0
+          ts = -NetworkResiliency.timestamp
 
           begin
-            ts = -NetworkResiliency.timestamp
+            attempts += 1
+            error = nil
+
+            self.open_timeout = timeouts.shift
 
             super
           rescue Net::OpenTimeout => e
             # capture error
+            error = e.class
+
+            retry if timeouts.size > 0
+
             raise
           ensure
             ts += NetworkResiliency.timestamp
+            self.open_timeout = original_timeout
 
             NetworkResiliency.record(
               adapter: "http",
               action: "connect",
               destination: address,
-              error: e&.class,
+              error: error,
               duration: ts,
+              timeout: self.open_timeout * 1_000,
+              attempts: attempts,
             )
           end
         end

data/lib/network_resiliency/adapter/mysql.rb

@@ -18,8 +18,6 @@ module NetworkResiliency
 
       module Instrumentation
         def connect(_, _, host, *args)
-          # timeout = query_options[:connect_timeout]
-
           return super unless NetworkResiliency.enabled?(:mysql)
 
           begin
@@ -38,11 +36,14 @@ module NetworkResiliency
               destination: host,
               error: e&.class,
               duration: ts,
+              timeout: query_options[:connect_timeout] * 1_000,
             )
           end
         end
 
         # def query(sql, options = {})
+        #   query_options[:read_timeout]
+        #   query_options[:write_timeout]
         #   puts "query"
         #   super
         # end

data/lib/network_resiliency/adapter/postgres.rb

@@ -38,6 +38,7 @@ module NetworkResiliency
               destination: host,
               error: e&.class,
               duration: ts,
+              timeout: opts[:connect_timeout].to_i * 1_000,
             )
           end
         end

data/lib/network_resiliency/adapter/redis.rb

@@ -46,6 +46,7 @@ module NetworkResiliency
             action: "connect",
             destination: host,
             max: original_timeout,
+            units: :seconds,
           )
 
           attempts = 0
@@ -77,7 +78,7 @@ module NetworkResiliency
               destination: host,
               duration: ts,
               error: error,
-              timeout: @options[:connect_timeout],
+              timeout: @options[:connect_timeout] * 1_000,
               attempts: attempts,
             )
           end

data/lib/network_resiliency/stats_engine.rb

@@ -31,7 +31,7 @@ module NetworkResiliency
 
       # select data to be synced
       data = synchronize do
-        # ensure sync is not run concurrently
+        # ensure sync does not run concurrently
         return [] if @syncing
         @syncing = Thread.current
 

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/network_resiliency.rb

@@ -104,7 +104,7 @@ module NetworkResiliency
 
   # private
 
-  def record(adapter:, action:, destination:, duration:, error:, timeout: nil, attempts: 1)
+  def record(adapter:, action:, destination:, duration:, error:, timeout:, attempts: 1)
     return if ignore_destination?(adapter, action, destination)
 
     NetworkResiliency.statsd&.distribution(
@@ -153,6 +153,7 @@ module NetworkResiliency
         tags: {
           adapter: adapter,
           destination: destination,
+          attempts: attempts,
         },
       ) if attempts > 1
 
@@ -204,7 +205,7 @@ module NetworkResiliency
     IP_ADDRESS_REGEX.match?(destination)
   end
 
-  def timeouts_for(adapter:, action:, destination:, max: nil)
+  def timeouts_for(adapter:, action:, destination:, max: nil, units: :ms)
     default = [ max ]
 
     return default if NetworkResiliency.mode == :observe
@@ -224,6 +225,8 @@ module NetworkResiliency
     timeouts = []
 
     if max
+      max *= 1_000 if units == :s || units == :seconds
+
       if p99 < max
         timeouts << p99
 
@@ -262,7 +265,14 @@ module NetworkResiliency
       )
     end
 
-    timeouts
+    case units
+    when nil, :ms, :milliseconds
+      timeouts
+    when :s, :seconds
+      timeouts.map { |t| t.to_f / 1_000 if t }
+    else
+      raise ArgumentError, "invalid units: #{units}"
+    end
   rescue => e
     NetworkResiliency.statsd&.increment(
       "network_resiliency.error",

metadata

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