fix(github): catch network ReadTimeout

Today we got a

    ERROR -- : Caught Net::ReadTimeout POSTing to https://api.github.com/graphql: Net::ReadTimeout with #<TCPSocket:(closed)>

This is not worthy of an ERROR; it's safe to just retry.

Turns out we didn't have any rescue for this case, so I've added it.

I've also flattened the file a little bit, having a global rescue list
instead of splitting them.

Author: nobe4

lib/entitlements/service/github.rb

@@ -392,23 +392,28 @@ def graphql_http_post_real(query)
             return { code: response.code.to_i, data: { "body" => response.body } }
           end
 
-          begin
-            data = JSON.parse(response.body)
-            if data.key?("errors")
-              # Synthesized 500 below triggers a retry, so log at WARN. Note: some GraphQL
-              # `errors` are permanent (bad query, auth, schema). The retry wrapper's final
-              # "Giving up" ERROR will surface persistent cases.
-              Entitlements.logger.warn "Errors reported: #{data['errors'].inspect}"
-              return { code: 500, data: }
-            end
-            { code: response.code.to_i, data: }
-          rescue JSON::ParserError => e
-            # JSON parse errors mean the API returned something we can't interpret. The
-            # synthesized 500 below triggers a retry, but the cause is more likely a real
-            # protocol/server problem than a transient network blip, so log at ERROR.
-            Entitlements.logger.error "#{e.class} #{e.message}: #{response.body.inspect}"
-            { code: 500, data: { "body" => response.body } }
+          data = JSON.parse(response.body)
+          if data.key?("errors")
+            # Synthesized 500 below triggers a retry, so log at WARN. Note: some GraphQL
+            # `errors` are permanent (bad query, auth, schema). The retry wrapper's final
+            # "Giving up" ERROR will surface persistent cases.
+            Entitlements.logger.warn "Errors reported: #{data['errors'].inspect}"
+            return { code: 500, data: }
           end
+
+          { code: response.code.to_i, data: }
+
+        rescue Net::ReadTimeout => e
+          # Defend against network blips, those can be safely retried via the
+          # synthesized 500 below, so log at WARN.
+          Entitlements.logger.warn "#{e.class} #{e.message}"
+          { code: 500, data: nil }
+        rescue JSON::ParserError => e
+          # JSON parse errors mean the API returned something we can't interpret. The
+          # synthesized 500 below triggers a retry, but the cause is more likely a real
+          # protocol/server problem than a transient network blip, so log at ERROR.
+          Entitlements.logger.error "#{e.class} #{e.message}: #{response.body.inspect}"
+          { code: 500, data: { "body" => response.body } }
         rescue => e
           # Catch-all for any unexpected exception (network blip OR local code bug).
           # We retry below via the synthesized 500, but log at ERROR because this

lib/version.rb

@@ -2,6 +2,6 @@
 
 module Entitlements
   module Version
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

spec/unit/entitlements/service/github_spec.rb

@@ -450,6 +450,14 @@
       expect(response).to eq(code: 200, data: answer)
     end
 
+    it "logs at warn and returns a retryable response for a read timeout" do
+      timeout = Net::ReadTimeout.new
+      stub_request(:post, "https://github.fake/api/v3/graphql").to_raise(timeout)
+      expect(logger).to receive(:warn).with("#{timeout.class} #{timeout.message}")
+      response = subject.send(:graphql_http_post_real, "nonsense")
+      expect(response).to eq(code: 500, data: nil)
+    end
+
     it "logs at error and returns code=500 and exception message for an unhandled exception" do
       exc = StandardError.new("Oh no you don't")
       stub_request(:post, "https://github.fake/api/v3/graphql").to_raise(exc)