Merge pull request #357 from alphagov/feature/log-request-id

Log Request-Id

backdrop/core/log_handler.py

@@ -41,7 +41,8 @@ def set_up_logging(app, env):
 
 def create_request_logger(app):
     def log_request():
-        app.logger.info("request: %s - %s" % (request.method, request.url))
+        app.logger.info("request: %s - %s" % (request.method, request.url),
+                        extra=create_logging_extra_dict())
     return log_request
 
 
@@ -50,7 +51,12 @@ def log_response(response):
         app.logger.info(
             "response: %s - %s - %s" % (
                 request.method, request.url, response.status
-            )
+            ),
+            extra=create_logging_extra_dict()
         )
         return response
     return log_response
+
+
+def create_logging_extra_dict():
+    return { 'request_id': request.headers.get('Request-Id')}

backdrop/read/api.py

@@ -36,10 +36,16 @@
     app.config['MONGO_PORT'],
     app.config['DATABASE_NAME'])
 
+
+def generate_request_id():
+    return request.headers.get('Request-Id')
+
+
 admin_api = client.AdminAPI(
     app.config['STAGECRAFT_URL'],
     app.config['SIGNON_API_USER_TOKEN'],
     dry_run=False,
+    request_id_fn = generate_request_id,
 )
 
 DEFAULT_DATA_SET_QUERYABLE = True

backdrop/write/api.py

@@ -36,10 +36,16 @@
     app.config['MONGO_PORT'],
     app.config['DATABASE_NAME'])
 
+
+def generate_request_id():
+    return request.headers.get('Request-Id')
+
+
 admin_api = client.AdminAPI(
     app.config['STAGECRAFT_URL'],
     app.config['SIGNON_API_USER_TOKEN'],
     dry_run=False,
+    request_id_fn = generate_request_id,
 )
 
 log_handler.set_up_logging(app, GOVUK_ENV)

requirements.txt

@@ -5,7 +5,7 @@ gunicorn==19.1.1
 invoke
 isodate==0.5.0
 jsonschema==2.4
-performanceplatform-client==0.0.8
+performanceplatform-client==0.0.9
 pip==1.5.6
 pymongo==2.7.2
 python-dateutil==2.2