Log client host/port (#65)

* log remote host/port

* simplify

Author: jschlyter

dnstapir/starlette.py

@@ -15,12 +15,22 @@ async def dispatch(self, request: Request, call_next: Callable[[Request], Awaita
         logger = structlog.get_logger()
         request_id = str(uuid.uuid4())
 
+        remote = (
+            {
+                "client_host": str(request.client.host),
+                "client_port": str(request.client.port),
+            }
+            if request.client
+            else {}
+        )
+
         with structlog.contextvars.bound_contextvars(request_id=request_id):
             logger.bind(
+                **remote,
                 method=request.method,
                 path=request.url.path,
             ).info(
-                f"Processing {request.method} request to {request.url.path}",
+                f"Processing {request.method} request from {request.client.host} to {request.url.path}",
             )
 
             request.state.start_time = time.perf_counter()
@@ -29,12 +39,13 @@ async def dispatch(self, request: Request, call_next: Callable[[Request], Awaita
             elapsed = time.perf_counter() - request.state.start_time
 
             logger.bind(
-                path=request.url.path,
+                **remote,
                 method=request.method,
+                path=request.url.path,
                 status_code=response.status_code,
                 elapsed=elapsed,
             ).info(
-                f"Processed {request.method} request to {request.url.path} in {elapsed:.3f} seconds",
+                f"Processed {request.method} request from {request.client.host} to {request.url.path} in {elapsed:.3f} seconds",
             )
 
             response.headers["X-Request-ID"] = request_id

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dnstapir"
-version = "1.4.0"
+version = "1.5.0"
 description = "DNS TAPIR Python Library"
 authors = ["Jakob Schlyter <[email protected]>"]
 readme = "README.md"