Merge pull request #454 from geoadmin/feat-PB-511-add-request-log

PB-511: Add request context to all logs

Pipfile

@@ -43,7 +43,7 @@ py-multihash = "~=2.0.1"
 django-prometheus = "~=2.3.1"
 django-admin-autocomplete-filter = "~=0.7.1"
 django-pgtrigger = "~=4.11.1"
-logging-utilities = "~=4.4.1"
+logging-utilities = "~=4.5.0"
 django-environ = "*"
 
 [requires]

app/config/logging-cfg-local.yml

@@ -38,6 +38,11 @@ filters:
     (): logging_utilities.filters.TimeAttribute
     isotime: False
     utc_isotime: True
+  add_request:
+    (): logging_utilities.filters.add_thread_context_filter.AddThreadContextFilter
+    contexts:
+    - logger_key: request
+      context_key: request
   django:
     (): logging_utilities.filters.django_request.JsonDjangoRequest
     attr_name: request
@@ -133,6 +138,7 @@ handlers:
       # handler, they will affect every handler
       - type_filter
       - isotime
+      - add_request
       - django
       # This filter only applies to the current handler (It does not modify the record in-place, but
       # instead selects which logs to display)

app/config/settings_prod.py

@@ -81,6 +81,9 @@
 # last, put everything else in between
 MIDDLEWARE = [
     'django_prometheus.middleware.PrometheusBeforeMiddleware',
+    # Middleware to add request to thread variables, this should be far up in the chain so request
+    # information can be added to as many logs as possible.
+    'logging_utilities.django_middlewares.add_request_context.AddToThreadContextMiddleware',
     'middleware.logging.RequestResponseLoggingMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'middleware.cors.CORSHeadersMiddleware',