Update depends and fix tests

Author: draincoder

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
         stages: [commit-msg]
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-ast
       - id: check-case-conflict
@@ -21,14 +21,14 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-formate/flake8-dunder-all
-    rev: v0.4.0
+    rev: v0.4.1
     hooks:
       - id: ensure-dunder-all
         exclude: "tests*|examples*"
         args: ["--use-tuple"]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.3.4
+    rev: v0.5.0
     hooks:
       - id: ruff
         args: ["--fix"]

pdm.lock

@@ -33,7 +33,7 @@
 
 
 def _get_default_span_details(scope: Scope) -> tuple[str, dict[str, Any]]:
-    method, path = scope["method"], scope["path"]  # type: ignore[typeddict-item]  # The WebSocket is not supported
+    method, path = scope["method"], scope["path"]  # The WebSocket is not supported
     return f"{method} {path}", {SpanAttributes.HTTP_ROUTE: path}
 
 
@@ -74,7 +74,7 @@ def __init__(self, app: ASGIApp, config: TracingConfig) -> None:
         self.open_telemetry_middleware = build_open_telemetry_middleware(app, config)
 
     async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
-        return await self.open_telemetry_middleware(scope, receive, send)  # type: ignore[arg-type]
+        return await self.open_telemetry_middleware(scope, receive, send)  # type: ignore[no-any-return]
 
 
 def _get_wrapped_send(send: Send, request_span: dict[str, float]) -> Callable:
@@ -146,7 +146,7 @@ async def __call__(self, scope: Scope, receive: Receive, send: Send) -> None:
             self.metrics.inc_responses_count(
                 method=method,
                 path=path,
-                status_code=request_span["status_code"],  # type: ignore[arg-type]
+                status_code=request_span["status_code"],
             )
             self.metrics.remove_request_in_progress(method=method, path=path)
 

src/asgi_monitor/integrations/litestar.py

@@ -115,7 +115,7 @@ async def __call__(
         if scope["type"] != "http":
             return await self.app(scope, receive, send)
 
-        return await self.open_telemetry_middleware(scope, receive, send)  # type: ignore[arg-type]
+        return await self.open_telemetry_middleware(scope, receive, send)  # type: ignore[no-any-return]
 
 
 class MetricsMiddleware(BaseHTTPMiddleware):

src/asgi_monitor/integrations/starlette.py

@@ -71,7 +71,7 @@ def _configure_default_logging(
 
     formatter = structlog.stdlib.ProcessorFormatter(
         foreign_pre_chain=default_processors,
-        processors=logging_processors,  # type: ignore[arg-type]
+        processors=logging_processors,
     )
 
     handler = logging.StreamHandler(stream=sys.stdout)

src/asgi_monitor/logging/configure.py

@@ -18,7 +18,7 @@ def extract_opentelemetry_trace_meta(
             return event_dict
 
         ctx = span.get_span_context()
-        service_name = trace.get_tracer_provider().resource.attributes["service.name"]  # type: ignore[attr-defined]
+        service_name = trace.get_tracer_provider().resource.attributes["service.name"]
         parent = getattr(span, "parent", None)
 
         event_dict["span_id"] = trace.format_span_id(ctx.span_id)

src/asgi_monitor/logging/trace_processor.py

@@ -52,7 +52,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         ]
 
         super().__init__(
-            processors=processors,  # type: ignore[arg-type]
+            processors=processors,
             foreign_pre_chain=_build_default_processors(json_format=False),
             pass_foreign_args=True,  # for args from record.args in positional_args
         )
@@ -68,7 +68,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         ]
 
         super().__init__(
-            processors=processors,  # type: ignore[arg-type]
+            processors=processors,
             foreign_pre_chain=_build_default_processors(json_format=False),
             pass_foreign_args=True,  # for args from record.args in positional_args
         )
@@ -91,7 +91,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         ]
 
         super().__init__(
-            processors=processors,  # type: ignore[arg-type]
+            processors=processors,
             foreign_pre_chain=_build_default_processors(json_format=True),
             pass_foreign_args=True,  # for args from record.args in positional_args
         )
@@ -107,7 +107,7 @@ def __init__(self, *args: Any, **kwargs: Any) -> None:
         ]
 
         super().__init__(
-            processors=processors,  # type: ignore[arg-type]
+            processors=processors,
             foreign_pre_chain=_build_default_processors(json_format=True),
             pass_foreign_args=True,  # for args from record.args in positional_args
         )
@@ -134,7 +134,7 @@ def build_uvicorn_log_config(
         default = UvicornDefaultJSONFormatter
         access = UvicornAccessJSONFormatter if not include_trace else TraceUvicornAccessJSONFormatter
     else:
-        default = UvicornDefaultConsoleFormatter  # type: ignore[assignment]
+        default = UvicornDefaultConsoleFormatter
         access = UvicornAccessConsoleFormatter if not include_trace else TraceUvicornAccessConsoleFormatter
 
     return {

src/asgi_monitor/logging/uvicorn/log_config.py

@@ -42,8 +42,10 @@ async def test_tracing() -> None:
         first_span, second_span, third_span = cast("tuple[Span, Span, Span]", exporter.get_finished_spans())
 
         assert response.status_code == 200
-        assert_that(first_span.attributes).is_equal_to({"http.status_code": 200, "type": "http.response.start"})
-        assert_that(second_span.attributes).is_equal_to({"type": "http.response.body"})
+        assert_that(first_span.attributes).is_equal_to(
+            {"http.status_code": 200, "asgi.event.type": "http.response.start"},
+        )
+        assert_that(second_span.attributes).is_equal_to({"asgi.event.type": "http.response.body"})
         assert_that(third_span.attributes).is_equal_to(
             {
                 "http.scheme": "http",

tests/integration/litestar/test_middlewares.py

@@ -39,15 +39,19 @@ async def test_tracing() -> None:
         first_span, second_span, third_span = cast("tuple[Span, Span, Span]", exporter.get_finished_spans())
 
         assert response.status_code == 200
-        assert_that(first_span.attributes).is_equal_to({"http.status_code": 200, "type": "http.response.start"})
-        assert_that(second_span.attributes).is_equal_to({"type": "http.response.body"})
+        assert_that(first_span.attributes).is_equal_to(
+            {"http.status_code": 200, "asgi.event.type": "http.response.start"},
+        )
+        assert_that(second_span.attributes).is_equal_to({"asgi.event.type": "http.response.body"})
         assert_that(third_span.attributes).is_equal_to(
             {
                 "http.scheme": "http",
                 "http.host": "testserver",
                 "net.host.port": 80,
                 "http.flavor": "1.1",
                 "http.target": "/",
+                "net.peer.ip": "testclient",
+                "net.peer.port": 50000,
                 "http.url": "http://testserver/",
                 "http.method": "GET",
                 "http.server_name": "testserver",
@@ -71,8 +75,10 @@ async def test_tracing_with_empty_routes() -> None:
         # Assert
         first_span, second_span, third_span = cast("tuple[Span, Span, Span]", exporter.get_finished_spans())
         assert response.status_code == 405
-        assert_that(first_span.attributes).is_equal_to({"http.status_code": 405, "type": "http.response.start"})
-        assert_that(second_span.attributes).is_equal_to({"type": "http.response.body"})
+        assert_that(first_span.attributes).is_equal_to(
+            {"http.status_code": 405, "asgi.event.type": "http.response.start"},
+        )
+        assert_that(second_span.attributes).is_equal_to({"asgi.event.type": "http.response.body"})
         assert_that(third_span.attributes).is_equal_to(
             {
                 "http.scheme": "http",
@@ -86,6 +92,8 @@ async def test_tracing_with_empty_routes() -> None:
                 "http.user_agent": "testclient",
                 "http.status_code": 405,
                 "http.route": "/",
+                "net.peer.ip": "testclient",
+                "net.peer.port": 50000,
             },
         )
 
@@ -103,8 +111,10 @@ async def test_tracing_partial_match() -> None:
         # Assert
         first_span, second_span, third_span = cast("tuple[Span, Span, Span]", exporter.get_finished_spans())
         assert response.status_code == 404
-        assert_that(first_span.attributes).is_equal_to({"http.status_code": 404, "type": "http.response.start"})
-        assert_that(second_span.attributes).is_equal_to({"type": "http.response.body"})
+        assert_that(first_span.attributes).is_equal_to(
+            {"http.status_code": 404, "asgi.event.type": "http.response.start"},
+        )
+        assert_that(second_span.attributes).is_equal_to({"asgi.event.type": "http.response.body"})
         assert_that(third_span.attributes).is_equal_to(
             {
                 "http.scheme": "http",
@@ -117,6 +127,8 @@ async def test_tracing_partial_match() -> None:
                 "http.server_name": "testserver",
                 "http.user_agent": "testclient",
                 "http.status_code": 404,
+                "net.peer.ip": "testclient",
+                "net.peer.port": 50000,
             },
         )
 

tests/integration/starlette/test_middlewares.py

@@ -69,7 +69,7 @@ def add_metrics() -> None:
 
 def test_get_latest_metrics_multiprocess(tmpdir: Path, manager: MetricsManager) -> None:
     # Arrange
-    multiprocessing.set_start_method("spawn")
+    multiprocessing.set_start_method("spawn", force=True)
     os.environ["PROMETHEUS_MULTIPROC_DIR"] = str(tmpdir)
     processes = [Process(target=add_metrics) for _ in range(10)]