Merge "Add profiling support to glanceclinet"

glanceclient/common/http.py

@@ -40,9 +40,12 @@ import OpenSSL
 
 from glanceclient.common import utils
 from glanceclient import exc
+from glanceclient.openstack.common import importutils
 from glanceclient.openstack.common import network_utils
 from glanceclient.openstack.common import strutils
 
+osprofiler_web = importutils.try_import("osprofiler.web")
+
 try:
     from eventlet import patcher
     # Handle case where we are running in a monkey patched environment
@@ -189,6 +192,10 @@ class HTTPClient(object):
         # Copy the kwargs so we can reuse the original in case of redirects
         kwargs['headers'] = copy.deepcopy(kwargs.get('headers', {}))
         kwargs['headers'].setdefault('User-Agent', USER_AGENT)
+
+        if osprofiler_web:
+            kwargs['headers'].update(osprofiler_web.get_trace_id_headers())
+
         if self.auth_token:
             kwargs['headers'].setdefault('X-Auth-Token', self.auth_token)