Merge branch 'devel' into x-request-id

fixup syntax
include x-request-id header in perf log if exists
2026-02-05 11:34:43 -03:30 · 2024-04-24 15:04:13 -05:00 · 2024-04-24 14:48:02 -05:00 · 2024-04-24 13:51:42 -05:00
1 changed files with 1 additions and 1 deletions
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -58,7 +58,7 @@ class TimingMiddleware(threading.local, MiddlewareMixin):
            response['X-API-Profile-File'] = self.prof.stop()
        perf_logger.debug(
            f'request: {request}, response_time: {response["X-API-Total-Time"]}',
-            extra=dict(python_objects=dict(request=request, response=response, X_API_TOTAL_TIME=response["X-API-Total-Time"])),
+            extra=dict(python_objects=dict(request=request, response=response, X_API_TOTAL_TIME=response["X-API-Total-Time"], x_request_id=request.get('x-request-id', 'not-set'))),
        )
        return response
Author	SHA1	Message	Date
Elijah DeLee	19e3cba35c	Merge branch 'devel' into x-request-id	2024-04-24 15:04:13 -05:00
Elijah DeLee	c11ff49a56	fixup syntax	2024-04-24 14:48:02 -05:00
Elijah DeLee	51bcf82cf4	include x-request-id header in perf log if exists	2024-04-24 13:51:42 -05:00