✨ Add headers field to apicall response log

Author: heysaeid

fastapi_and_logging/http_clients/aiohttp.py

@@ -43,15 +43,17 @@ async def default_request_hook(self, session, trace_config_ctx, params):
 
     async def default_response_hook(self, session, trace_config_ctx, params):
         response = params.response
-        request_data = trace_config_ctx.trace_request_ctx.pop(
-            "request_data",
-        )
+        request_data, request_id = {}, {}
+        if trace_config_ctx.trace_request_ctx:
+            request_data = trace_config_ctx.trace_request_ctx.pop(
+                "request_data", None
+            )
+            request_id = trace_config_ctx.trace_request_ctx.pop(
+                "request_id",
+            )
         response_data = await response.read()
-
         extra_data = {
-            "request_id": trace_config_ctx.trace_request_ctx.pop(
-                "request_id",
-            ),
+            "request_id": request_id,
             "method": response.method,
             "url": str(response.url),
             "status_code": response.status,
@@ -60,6 +62,7 @@ async def default_response_hook(self, session, trace_config_ctx, params):
                 response_data, self.response_max_len
             ),
             "trace_request_ctx": trace_config_ctx.trace_request_ctx,
+            "headers": dict(params.headers),
         }
 
         get_apicall_logger(

fastapi_and_logging/http_clients/httpx.py

@@ -63,6 +63,7 @@ def response_hook(self, response: httpx.Response) -> None:
             "status_code": response.status_code,
             "request_data": str(response.request.content)[:request_max_len],
             "response_data": str(response.read())[:response_max_len],
+            "headers": dict(response.request.headers),
         }
 
         if callable(HTTPXClient._response_hook):
@@ -102,6 +103,7 @@ async def response_hook(self, response: httpx.Response) -> None:
             "status_code": response.status_code,
             "request_data": str(response.request.content)[:request_max_len],
             "response_data": str(await response.aread())[:response_max_len],
+            "headers": dict(response.request.headers),
         }
 
         if callable(HTTPXAsyncClient._response_hook):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastapi-and-logging"
-version = "0.0.7"
+version = "0.0.8"
 description = "FastAPI-and-Logging simplifies log handling, allowing for effective organization, tracking, and analysis of logs in FastAPI applications, aiding in debugging and issue resolut"
 authors = ["Saeid Noormohammadi <heysaeid92@gmail.com>"]
 license = "MIT"
@@ -71,4 +71,4 @@ ignore = [
 
 [tool.ruff.pyupgrade]
 # Preserve types, even if a file imports `from __future__ import annotations`.
-keep-runtime-typing = true
+keep-runtime-typing = true