diff options
| author | Zhi Yan Liu <zhiyanl@cn.ibm.com> | 2014-08-25 23:19:41 +0800 |
|---|---|---|
| committer | Zhi Yan Liu <lzy.dev@gmail.com> | 2014-12-10 03:41:18 +0800 |
| commit | 1cd92286473d5737cfa19ac4c850519e4ec64c72 (patch) | |
| tree | efb2cd03ac926fae7f2da7db558ce802b64bc331 /troveclient/client.py | |
| parent | 4d8e1567ec35ebda8071862bbc5c6818685a5205 (diff) | |
| download | python-troveclient-1cd92286473d5737cfa19ac4c850519e4ec64c72.tar.gz | |
Add profiling support to Trove client
To be able to create profiling traces for Trove, client should be
able to send special HTTP header that contains trace info.
This patch is as well important to be able to make cross project
traces. (Typical case horizon calls Trove via python client, if
profiler is initialized, Trove client will add extra header, that
will be parsed by special osprofiler middleware in Trove api)
Don't worry no security issue here, trace information is signed
by HMAC key that is setted in api-paste.ini. So only person that
knows HMAC key is able to send proper header.
Main patch in Trove is: I580cce8d2b3c4ec9ce625ac09de6f14e1249f6f5
We prepared a common BP in oslo-spec due to integration change is
similar to all projects: I95dccdc9f274661767d2659c18b96da169891f30
Currently there are 2 other projects are using osprofiler: Glance &
Cinder, and some others are working in progress.
Change-Id: I5a76e11d428c63d33f6d2c2021426090ebf8340c
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
Diffstat (limited to 'troveclient/client.py')
| -rw-r--r-- | troveclient/client.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/troveclient/client.py b/troveclient/client.py index d9dcc48..0acf246 100644 --- a/troveclient/client.py +++ b/troveclient/client.py @@ -28,6 +28,7 @@ import requests from keystoneclient import adapter from troveclient.openstack.common.apiclient import client from troveclient.openstack.common.apiclient import exceptions +from troveclient.openstack.common import importutils from troveclient import service_catalog try: @@ -50,6 +51,8 @@ if not hasattr(urlparse, 'parse_qsl'): import cgi urlparse.parse_qsl = cgi.parse_qsl +osprofiler_web = importutils.try_import("osprofiler.web") + class TroveClientMixin(object): @@ -157,6 +160,8 @@ class HTTPClient(TroveClientMixin): kwargs.setdefault('headers', kwargs.get('headers', {})) kwargs['headers']['User-Agent'] = self.USER_AGENT kwargs['headers']['Accept'] = 'application/json' + if osprofiler_web: + kwargs['headers'].update(osprofiler_web.get_trace_id_headers()) if 'body' in kwargs: kwargs['headers']['Content-Type'] = 'application/json' kwargs['data'] = json.dumps(kwargs['body']) |