feat: add TraceAccessLogger

Author: Cooh12

examples/aiohttp_app.py

@@ -9,6 +9,7 @@
 
 from asgi_monitor.integrations.aiohttp import MetricsConfig, TracingConfig, setup_metrics, setup_tracing
 from asgi_monitor.logging import configure_logging
+from asgi_monitor.logging.aiohttp import TraceAccessLogger
 
 logger = logging.getLogger(__name__)
 
@@ -35,14 +36,14 @@ def create_app() -> Application:
     trace.set_tracer_provider(tracer_provider)
 
     trace_config = TracingConfig(tracer_provider=tracer_provider)
-    metrics_config = MetricsConfig(app_name="aiohttp", include_trace_exemplar=True)
+    metrics_config = MetricsConfig(app_name="aiohttp")
 
-    setup_metrics(app=app, config=metrics_config)
     setup_tracing(app=app, config=trace_config)
+    setup_metrics(app=app, config=metrics_config)
 
     return app
 
 
 if __name__ == "__main__":
     app = create_app()
-    run_app(app=app, host="127.0.0.1", port=8000)
+    run_app(app=app, host="127.0.0.1", port=8000, access_log_class=TraceAccessLogger, access_log=logger)

pyproject.toml

@@ -93,6 +93,7 @@ lint.ignore = [
     "ISC001",
     "UP035",
     "COM812",
+    "G002"
 ]
 
 [tool.ruff.lint.per-file-ignores]

src/asgi_monitor/integrations/aiohttp.py

@@ -113,7 +113,7 @@ def build_metrics_middleware(
 ) -> Callable[..., Coroutine]:
     @middleware
     async def metrics_middleware(request: Request, handler: Callable) -> Any:
-        status_code = HTTPInternalServerError().status_code
+        status_code = HTTPInternalServerError.status_code
 
         method = request.method
         path = request.url.path
@@ -193,6 +193,7 @@ async def tracing_middleware(request: Request, handler: Callable) -> Any:
             context=extract(request, getter=getter),
             kind=trace.SpanKind.SERVER,
         ) as span:
+            request.span = span
             span.set_attributes(attributes)
             start = default_timer()
             active_requests_counter.add(1, active_requests_count_attrs)

src/asgi_monitor/logging/aiohttp/__init__.py

@@ -0,0 +1,3 @@
+from .logger import TraceAccessLogger
+
+__all__ = ("TraceAccessLogger",)

src/asgi_monitor/logging/aiohttp/logger.py

@@ -0,0 +1,52 @@
+import contextlib
+import logging
+from typing import TYPE_CHECKING, Any
+
+from aiohttp.web_log import AccessLogger
+from aiohttp.web_request import BaseRequest
+from aiohttp.web_response import StreamResponse
+from opentelemetry import trace
+
+if TYPE_CHECKING:
+    from opentelemetry.trace import Span
+
+__all__ = ("TraceAccessLogger",)
+
+
+class TraceAccessLogger(AccessLogger):
+    def log(self, request: BaseRequest, response: StreamResponse, time: float) -> None:
+        if not self.logger.isEnabledFor(logging.INFO):
+            # Avoid formatting the log line if it will not be emitted.
+            return
+        try:
+            fmt_info = self._format_line(request, response, time)
+
+            values = []
+            extra: dict[str, Any] = {}
+            for key, value in fmt_info:
+                values.append(value)
+
+                if key.__class__ is str:
+                    extra[key] = value
+                else:
+                    k1, k2 = key  # type: ignore[misc]
+                    dct = extra.get(k1, {})  # type: ignore[has-type]
+                    dct[k2] = value  # type: ignore[has-type]
+                    extra[k1] = dct  # type: ignore[has-type]
+
+            with contextlib.suppress(KeyError, ValueError):
+                span: Span = request.span  # type: ignore[attr-defined]
+                ctx = span.get_span_context()
+                service_name = trace.get_tracer_provider().resource.attributes["service.name"]  # type: ignore[attr-defined]
+                parent = getattr(span, "parent", None)
+
+                extra["span_id"] = trace.format_span_id(ctx.span_id)
+                extra["trace_id"] = trace.format_trace_id(ctx.trace_id)
+                extra["service.name"] = service_name
+
+                if parent:
+                    extra["parent_span_id"] = trace.format_span_id(parent.span_id)
+
+            self.logger.info(self._log_format % tuple(values), extra=extra)
+        except Exception:
+            self.logger.exception("Error in logging")