Instrument HTTP client requests to buildbucket

scripts/master/deferred_resource.py

 # Copyright 2014 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.
 
 """deferred_resource converts blocking apiclient resource to deferred."""
 
 import collections
 import datetime
 import functools
 import httplib
@@ skipping 143 matching lines @@
     self._pool = _pool or self._create_thread_pool(max_concurrent_requests)
     self._resource = resource
     self.credentials = credentials
     self.retry_wait_seconds = retry_wait_seconds
     self.retry_attempt_count = retry_attempt_count
     self.verbose = verbose
     self.log_prefix = log_prefix
     self.api = self.Api(self)
     self._th_local = threading.local()
     self.started = False
-    self.timeout = timeout
+    self._resource._http.timeout = timeout
 
   @classmethod
   def _create_thread_pool(cls, max_concurrent_requests):
     return DaemonThreadPool(minthreads=1, maxthreads=max_concurrent_requests)
 
   @classmethod
   def _create_async(
       cls, resource_factory, max_concurrent_requests=1, _pool=None, **kwargs):
     _pool = _pool or cls._create_thread_pool(max_concurrent_requests)
     result = defer.Deferred()
@@ skipping 153 matching lines @@
         create_creds = False
         if getattr(self._th_local, 'http', None) is None:
           create_creds = True
         elif (self._th_local.credentials_expiry is not None and
               self._th_local.credentials_expiry <= now):
           create_creds = True
 
         if create_creds:
           self._th_local.credentials = None
           self._th_local.credentials_expiry = None
-          self._th_local.http = httplib2.Http(timeout=self.timeout)
+          self._th_local.http = self._resource._http

[nodir, 2016/08/17 07:01:52]

That doesn't look thread-safe anymore

[dsansome, 2016/08/17 08:55:41]

Ah so *that's* why it's done this way.  I've changed it to create an
InstrumentedHttp here directly.

Is the Http in the Resource actually used at all?

[nodir, 2016/08/17 21:07:29]

Yes, th_local is threading.Local
No

           if self.credentials is not None:
             creds = self.credentials
             ttl = None
             if isinstance(creds, CredentialFactory):
               ttl = creds.ttl
               creds = creds()
             self._th_local.credentials = creds.from_json(creds.to_json())
             if ttl is not None:
               self._th_local.credentials_expiry = now + ttl
             self._th_local.http = self._th_local.credentials.authorize(
@@ skipping 23 matching lines @@
   return d
 
 
 def is_transient(ex):
   if isinstance(ex, apiclient.errors.HttpError) and ex.resp:
     return ex.resp.status >= 500;
   if isinstance(ex, ssl.SSLError):
     # No reason, no errcode.
     return "timed out" in str(ex)
   return False