network_resiliency 0.4.1 → 0.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/Gemfile.lock +1 -1
- data/README.md +1 -1
- data/lib/network_resiliency/adapter/http.rb +24 -2
- data/lib/network_resiliency/adapter/mysql.rb +3 -2
- data/lib/network_resiliency/adapter/postgres.rb +1 -0
- data/lib/network_resiliency/adapter/redis.rb +1 -1
- data/lib/network_resiliency/version.rb +1 -1
- data/lib/network_resiliency.rb +4 -3
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6bf447ec73846d8911df202dc4a2ba576879a2768cd2a2e817ae9119a0e40506
|
4
|
+
data.tar.gz: d38481d92461272cbcefd34ea81f2c82d38381e135a06daed527210cdce6a178
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 73b6e3fa940f4f8b91e26cc039b2bdfb37f7879a2a4c60ac1cc29e0572e79fd427c4984dfd8a139695e1225a370e295330833d81e250c6b3f922f467fb5f0b00
|
7
|
+
data.tar.gz: 00a8fe95736393d1e9133ca4d2d0c9873d859a93c53ef487503ad00762eadcaba18bad6c99138910a9bbf4916cc7eae5a464d8324657321b68eaaca076a5a10f
|
data/CHANGELOG.md
CHANGED
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -18,23 +18,45 @@ module NetworkResiliency
|
|
18
18
|
module Instrumentation
|
19
19
|
def connect
|
20
20
|
return super unless NetworkResiliency.enabled?(:http)
|
21
|
+
original_timeout = self.open_timeout
|
22
|
+
|
23
|
+
timeouts = NetworkResiliency.timeouts_for(
|
24
|
+
adapter: "http",
|
25
|
+
action: "connect",
|
26
|
+
destination: address,
|
27
|
+
max: original_timeout,
|
28
|
+
units: :seconds,
|
29
|
+
)
|
30
|
+
|
31
|
+
attempts = 0
|
32
|
+
ts = -NetworkResiliency.timestamp
|
21
33
|
|
22
34
|
begin
|
23
|
-
|
35
|
+
attempts += 1
|
36
|
+
error = nil
|
37
|
+
|
38
|
+
self.open_timeout = timeouts.shift
|
24
39
|
|
25
40
|
super
|
26
41
|
rescue Net::OpenTimeout => e
|
27
42
|
# capture error
|
43
|
+
error = e.class
|
44
|
+
|
45
|
+
retry if timeouts.size > 0
|
46
|
+
|
28
47
|
raise
|
29
48
|
ensure
|
30
49
|
ts += NetworkResiliency.timestamp
|
50
|
+
self.open_timeout = original_timeout
|
31
51
|
|
32
52
|
NetworkResiliency.record(
|
33
53
|
adapter: "http",
|
34
54
|
action: "connect",
|
35
55
|
destination: address,
|
36
|
-
error:
|
56
|
+
error: error,
|
37
57
|
duration: ts,
|
58
|
+
timeout: self.open_timeout.to_f * 1_000,
|
59
|
+
attempts: attempts,
|
38
60
|
)
|
39
61
|
end
|
40
62
|
end
|
@@ -18,8 +18,6 @@ module NetworkResiliency
|
|
18
18
|
|
19
19
|
module Instrumentation
|
20
20
|
def connect(_, _, host, *args)
|
21
|
-
# timeout = query_options[:connect_timeout]
|
22
|
-
|
23
21
|
return super unless NetworkResiliency.enabled?(:mysql)
|
24
22
|
|
25
23
|
begin
|
@@ -38,11 +36,14 @@ module NetworkResiliency
|
|
38
36
|
destination: host,
|
39
37
|
error: e&.class,
|
40
38
|
duration: ts,
|
39
|
+
timeout: query_options[:connect_timeout].to_f * 1_000,
|
41
40
|
)
|
42
41
|
end
|
43
42
|
end
|
44
43
|
|
45
44
|
# def query(sql, options = {})
|
45
|
+
# query_options[:read_timeout]
|
46
|
+
# query_options[:write_timeout]
|
46
47
|
# puts "query"
|
47
48
|
# super
|
48
49
|
# end
|
data/lib/network_resiliency.rb
CHANGED
@@ -104,7 +104,7 @@ module NetworkResiliency
|
|
104
104
|
|
105
105
|
# private
|
106
106
|
|
107
|
-
def record(adapter:, action:, destination:, duration:, error:, timeout
|
107
|
+
def record(adapter:, action:, destination:, duration:, error:, timeout:, attempts: 1)
|
108
108
|
return if ignore_destination?(adapter, action, destination)
|
109
109
|
|
110
110
|
NetworkResiliency.statsd&.distribution(
|
@@ -135,7 +135,7 @@ module NetworkResiliency
|
|
135
135
|
adapter: adapter,
|
136
136
|
destination: destination,
|
137
137
|
},
|
138
|
-
)
|
138
|
+
) if timeout && timeout > 0
|
139
139
|
|
140
140
|
if error
|
141
141
|
NetworkResiliency.statsd&.distribution(
|
@@ -145,7 +145,7 @@ module NetworkResiliency
|
|
145
145
|
adapter: adapter,
|
146
146
|
destination: destination,
|
147
147
|
},
|
148
|
-
) if timeout
|
148
|
+
) if timeout && timeout > 0
|
149
149
|
else
|
150
150
|
# track successful retries
|
151
151
|
NetworkResiliency.statsd&.increment(
|
@@ -153,6 +153,7 @@ module NetworkResiliency
|
|
153
153
|
tags: {
|
154
154
|
adapter: adapter,
|
155
155
|
destination: destination,
|
156
|
+
attempts: attempts,
|
156
157
|
},
|
157
158
|
) if attempts > 1
|
158
159
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: network_resiliency
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.5.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Daniel Pepper
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-11-
|
11
|
+
date: 2023-11-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: byebug
|