network_resiliency 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8949456e392f5198caa080238dff62a567114a9386d3a6f575fdb855fd5b5e98
-  data.tar.gz: 95d58f753ccb7f4aa5ffe1093d98d0f5e33016bb7e06caa111a181d29c8ac5fb
+  metadata.gz: 6bf447ec73846d8911df202dc4a2ba576879a2768cd2a2e817ae9119a0e40506
+  data.tar.gz: d38481d92461272cbcefd34ea81f2c82d38381e135a06daed527210cdce6a178
 SHA512:
-  metadata.gz: d1544a231ebcdd48c6838a8b398f3d4463c9cae2e18182c8e28fda3c4cfeba51b75b6e355342f98a16a51979da035d65040dffdd83e1bcd0273c636f14332236
-  data.tar.gz: a90be5d5152dee3ce23ef7d682ce62dd495293e429d06494e5dcc91eb9cf3bf4a0bcf26b1cece0665815ab181394feff48016c9781e81b69408de3dca1572ec1
+  metadata.gz: 73b6e3fa940f4f8b91e26cc039b2bdfb37f7879a2a4c60ac1cc29e0572e79fd427c4984dfd8a139695e1225a370e295330833d81e250c6b3f922f467fb5f0b00
+  data.tar.gz: 00a8fe95736393d1e9133ca4d2d0c9873d859a93c53ef487503ad00762eadcaba18bad6c99138910a9bbf4916cc7eae5a464d8324657321b68eaaca076a5a10f

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+###  v0.5.1  (2023-11-17)
+- support nil timeouts
+
+###  v0.5.0  (2023-11-16)
+- postgres timeout stats
+- mysql timeout stats
+- http resiliency
+
 ###  v0.4.1  (2023-11-14)
 - timeout units
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    network_resiliency (0.4.1)
+    network_resiliency (0.5.1)
 
 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.to_f * 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].to_f * 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

@@ -78,7 +78,7 @@ module NetworkResiliency
               destination: host,
               duration: ts,
               error: error,
-              timeout: @options[:connect_timeout] * 1_000,
+              timeout: @options[:connect_timeout].to_f * 1_000,
               attempts: attempts,
             )
           end

data/lib/network_resiliency/version.rb

@@ -1,3 +1,3 @@
 module NetworkResiliency
-  VERSION = "0.4.1"
+  VERSION = "0.5.1"
 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(
@@ -135,7 +135,7 @@ module NetworkResiliency
         adapter: adapter,
         destination: destination,
       },
-    )
+    ) if timeout && timeout > 0
 
     if error
       NetworkResiliency.statsd&.distribution(
@@ -145,7 +145,7 @@ module NetworkResiliency
           adapter: adapter,
           destination: destination,
         },
-      ) if timeout
+      ) if timeout && timeout > 0
     else
       # track successful retries
       NetworkResiliency.statsd&.increment(
@@ -153,6 +153,7 @@ module NetworkResiliency
         tags: {
           adapter: adapter,
           destination: destination,
+          attempts: attempts,
         },
       ) if attempts > 1
 

metadata

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