Merge pull request #222 from nickvanw/master

Enable configuring `Net::HTTP` timeouts

lib/prometheus/client/push.rb

@@ -21,7 +21,7 @@ class Push
 
       attr_reader :job, :instance, :gateway, :path
 
-      def initialize(job, instance = nil, gateway = nil)
+      def initialize(job, instance = nil, gateway = nil, **kwargs)
         @mutex = Mutex.new
         @job = job
         @instance = instance
@@ -31,6 +31,8 @@ def initialize(job, instance = nil, gateway = nil)
 
         @http = Net::HTTP.new(@uri.host, @uri.port)
         @http.use_ssl = (@uri.scheme == 'https')
+        @http.open_timeout = kwargs[:open_timeout] if kwargs[:open_timeout]
+        @http.read_timeout = kwargs[:read_timeout] if kwargs[:read_timeout]
       end
 
       def add(registry)

spec/prometheus/client/push_spec.rb

@@ -5,7 +5,7 @@
 describe Prometheus::Client::Push do
   let(:gateway) { 'http://localhost:9091' }
   let(:registry) { Prometheus::Client.registry }
-  let(:push) { Prometheus::Client::Push.new('test-job', nil, gateway) }
+  let(:push) { Prometheus::Client::Push.new('test-job', nil, gateway, open_timeout: 5, read_timeout: 30) }
 
   describe '.new' do
     it 'returns a new push instance' do
@@ -91,6 +91,8 @@
 
       http = double(:http)
       expect(http).to receive(:use_ssl=).with(false)
+      expect(http).to receive(:open_timeout=).with(5)
+      expect(http).to receive(:read_timeout=).with(30)
       expect(http).to receive(:request).with(request)
       expect(Net::HTTP).to receive(:new).with('localhost', 9091).and_return(http)
 
@@ -104,6 +106,8 @@
 
       http = double(:http)
       expect(http).to receive(:use_ssl=).with(false)
+      expect(http).to receive(:open_timeout=).with(5)
+      expect(http).to receive(:read_timeout=).with(30)
       expect(http).to receive(:request).with(request)
       expect(Net::HTTP).to receive(:new).with('localhost', 9091).and_return(http)
 
@@ -121,6 +125,8 @@
 
         http = double(:http)
         expect(http).to receive(:use_ssl=).with(true)
+        expect(http).to receive(:open_timeout=).with(5)
+        expect(http).to receive(:read_timeout=).with(30)
         expect(http).to receive(:request).with(request)
         expect(Net::HTTP).to receive(:new).with('localhost', 9091).and_return(http)
 
@@ -140,6 +146,8 @@
 
         http = double(:http)
         expect(http).to receive(:use_ssl=).with(true)
+        expect(http).to receive(:open_timeout=).with(5)
+        expect(http).to receive(:read_timeout=).with(30)
         expect(http).to receive(:request).with(request)
         expect(Net::HTTP).to receive(:new).with('localhost', 9091).and_return(http)