Set appropriate timeouts for PrometheusClient

b039df77 · Matthias Käppler · Alessio Caiazza · 0e418163 · b039df77 · b039df77
Commit b039df77 authored Jul 29, 2020 by Matthias Käppler Committed by Alessio Caiazza Jul 29, 2020
Showing with 6 additions and 1 deletion

changelogs/unreleased/232468-prometheus-conn-timeout.yml changelogs/unreleased/232468-prometheus-conn-timeout.yml +5 -0

lib/gitlab/prometheus_client.rb lib/gitlab/prometheus_client.rb +1 -1

No files found.
--- a/changelogs/unreleased/232468-prometheus-conn-timeout.yml
+++ b/changelogs/unreleased/232468-prometheus-conn-timeout.yml
+---
+title: Set appropriate timeouts for PrometheusClient
+merge_request: 37924
+author:
+type: other
--- a/lib/gitlab/prometheus_client.rb
+++ b/lib/gitlab/prometheus_client.rb
@@ -132,7 +132,7 @@ module Gitlab

    def http_options
      strong_memoize(:http_options) do
-        { follow_redirects: false }.merge(mapped_options)
+        { follow_redirects: false, open_timeout: 5, read_timeout: 10 }.merge(mapped_options)
      end
    end