Added default timeout to InstrumentedHttp

infra_libs/httplib2_utils.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 import copy
 import json
 import logging
 import os
 import re
 import socket
 import sys
 import time
 
 import httplib2
 import oauth2client.client
 
 from infra_libs.ts_mon.common import http_metrics
 
 DEFAULT_SCOPES = ['email']
 
+# default timeout for http requests, in seconds
+DEFAULT_TIMEOUT = 30
+
 # This is part of the API.
 if sys.platform.startswith('win'): # pragma: no cover
   SERVICE_ACCOUNTS_CREDS_ROOT = 'C:\\creds\\service_accounts'
 else:
   SERVICE_ACCOUNTS_CREDS_ROOT = '/creds/service_accounts'
 
 
 class AuthError(Exception):
   pass
 
@@ skipping 87 matching lines @@
     service_accounts_creds_root=service_accounts_creds_root)
 
   return oauth2client.client.SignedJwtAssertionCredentials(
     key['client_email'], key['private_key'], scope)
 
 
 def get_authenticated_http(credentials_filename,
                            scope=None,
                            service_accounts_creds_root=None,
                            http_identifier=None,
-                           timeout=30):
+                           timeout=DEFAULT_TIMEOUT):
   """Creates an httplib2.Http wrapped with a service account authenticator.
 
   Args:
     credentials_filename (str): relative path to the file containing
       credentials in json format. Path is relative to the default
       location where credentials are stored (platform-dependent).
 
   Keyword Args:
     scope (str|list of str): scope(s) of the credentials being
       requested. Defaults to https://www.googleapis.com/auth/userinfo.email.
@@ skipping 15 matching lines @@
   if http_identifier:
     http = InstrumentedHttp(http_identifier, timeout=timeout)
   else:
     http = httplib2.Http(timeout=timeout)
   return creds.authorize(http)
 
 
 class InstrumentedHttp(httplib2.Http):
   """A httplib2.Http object that reports ts_mon metrics about its requests."""
 
-  def __init__(self, name, time_fn=time.time, **kwargs):
+  def __init__(self, name, time_fn=time.time, timeout=DEFAULT_TIMEOUT,
+               **kwargs):
     """
     Args:
       name: An identifier for the HTTP requests made by this object.
       time_fn: Function returning the current time in seconds. Use for testing
         purposes only.
     """
 
-    super(InstrumentedHttp, self).__init__(**kwargs)
+    super(InstrumentedHttp, self).__init__(timeout=timeout, **kwargs)
     self.fields = {'name': name, 'client': 'httplib2'}
     self.time_fn = time_fn
 
   def _update_metrics(self, status, start_time):
     status_fields = {'status': status}
     status_fields.update(self.fields)
     http_metrics.response_status.increment(fields=status_fields)
 
     duration_msec = (self.time_fn() - start_time) * 1000
     http_metrics.durations.add(duration_msec, fields=self.fields)
@@ skipping 69 matching lines @@
     self.requests_made.append(self.HttpCall(uri, method, body, headers))
     headers = None
     body = None
     for candidate in self._uris:
       if candidate[0].match(uri):
         _, headers, body = candidate
         break
     if not headers:
       raise AssertionError("Unexpected request to %s" % uri)
     return httplib2.Response(headers), body