Merge lp:~ralsina/tanuki-agent/log-req-id into lp:tanuki-agent

[Roberto Alsina]

Log request-id on errors where it makes sense.

Log request-id on errors where it makes sense.

[Celso Providelo (cprov)]

Thanks, Roberto.

review: Approve

=== modified file 'agent.py'
--- agent.py	2015-12-11 16:18:35 +0000
+++ agent.py	2016-01-08 18:37:54 +0000
@@ -218,7 +218,8 @@
                 formatted_extra = ';'.join('{}: {}'.format(k, ','.join(v))
                                            for k, v in res.json().get('extra', {}).items())
                 self.log.error(
-                    'Error %d getting SSO token %s: %s, %s',
+                    '[%s] Error %d getting SSO token %s: %s, %s',
+                    res.headers.get('x-request-id'),
                     res.status_code,
                     sso_url,
                     msg, formatted_extra)
@@ -266,7 +267,8 @@
                 timeout=self.nw_timeout)
             if r.status_code > 299:
                 self.log.error(
-                    'Error %d registering at %s: %s',
+                    '[%s] Error %d registering at %s: %s',
+                    r.headers.get('x-request-id'),
                     r.status_code,
                     self.register_url,
                     r.text)
@@ -278,7 +280,9 @@
                 self.queue_url = urllib.parse.urljoin(self.server, href)
                 return True
             except KeyError:
-                self.log.error("Malformed registration response: %s", r.json())
+                self.log.error("[%s] Malformed registration response: %s",
+                               r.headers.get('x-request-id'),
+                               r.json())
                 return False
         except requests.exceptions.ConnectionError as err:
             self.log.error('Exception: %s', err)
@@ -300,7 +304,8 @@
                 return False
             elif r.status_code > 299:
                 self.log.error(
-                    'Error %d polling at %s: %s',
+                    '[%s] Error %d polling at %s: %s',
+                    r.headers.get('x-request-id'),
                     r.status_code,
                     self.queue_url,
                     r.text)
@@ -379,7 +384,8 @@
                 timeout=self.nw_timeout)
             if r.status_code > 299:
                 self.log.error(
-                    'Error %d posting result at %s: %s',
+                    '[%s] Error %d posting result at %s: %s',
+                    r.headers.get('x-request-id'),
                     r.status_code,
                     self.testresult_url,
                     r.text)
 
=== modified file 'test_agent.py'
--- test_agent.py	2015-12-04 22:54:58 +0000
+++ test_agent.py	2016-01-08 18:37:54 +0000
@@ -49,6 +49,8 @@
     def text(self):
         return self._text
 
+    headers = {'x-request-id': 'foobar'}
+
 
 epoch = datetime.datetime(1970, 1, 1)