fix tests

Author: EGOROV Vadim

microbootstrap/bootstrappers/litestar.py

@@ -171,7 +171,7 @@ def create_open_telemetry_middleware(self, app: ASGIApp) -> OpenTelemetryMiddlew
         )
 
     async def handle(self, scope: Scope, receive: Receive, send: Send, next_app: ASGIApp) -> None:
-        await self.create_open_telemetry_middleware(next_app)(scope, receive, send)
+        await self.create_open_telemetry_middleware(next_app)(scope, receive, send)  # type: ignore[arg-type]
 
 
 @LitestarBootstrapper.use_instrument()
@@ -182,7 +182,7 @@ def bootstrap_before(self) -> dict[str, typing.Any]:
                 LitestarOpenTelemetryInstrumentationMiddleware(
                     LitestarOpentelemetryConfig(
                         tracer_provider=self.tracer_provider,
-                        middleware_class=LitestarOpenTelemetryInstrumentationMiddleware,
+                        middleware_class=LitestarOpenTelemetryInstrumentationMiddleware,  # type: ignore[arg-type]
                     )
                 )
             ]

tests/bootstrappers/test_litestar_opentelemetry.py

@@ -115,8 +115,8 @@ def test_litestar_opentelemetry_instrument_uses_custom_middleware(
     assert "middleware" in bootstrap_result
     assert len(bootstrap_result["middleware"]) == 1
 
-    middleware_config: typing.Final = bootstrap_result["middleware"][0]
-    assert middleware_config.middleware == LitestarOpenTelemetryInstrumentationMiddleware
+    middleware_config: typing.Final = bootstrap_result["middleware"][0].config
+    assert middleware_config.middleware.middleware == LitestarOpenTelemetryInstrumentationMiddleware
 
 
 @pytest.mark.parametrize(
@@ -177,8 +177,8 @@ def test_litestar_opentelemetry_middleware_initialization() -> None:
     mock_config.server_request_hook_handler = None
     mock_config.tracer_provider = None
 
-    middleware: typing.Final = LitestarOpenTelemetryInstrumentationMiddleware(app=mock_app, config=mock_config)
+    middleware: typing.Final = LitestarOpenTelemetryInstrumentationMiddleware(config=mock_config)
 
-    assert middleware.app == mock_app
-    assert hasattr(middleware, "open_telemetry_middleware")
-    assert middleware.open_telemetry_middleware is not None
+    assert middleware.config == mock_config
+    otel_middleware = middleware.create_open_telemetry_middleware(mock_app)
+    assert otel_middleware is not None

tests/instruments/test_opentelemetry.py

@@ -7,13 +7,15 @@
 import litestar
 import pytest
 from fastapi.testclient import TestClient as FastAPITestClient
-from litestar.middleware.base import DefineMiddleware
 from litestar.testing import TestClient as LitestarTestClient
 from opentelemetry.instrumentation.dependencies import DependencyConflictError
 
 from microbootstrap import OpentelemetryConfig
 from microbootstrap.bootstrappers.fastapi import FastApiOpentelemetryInstrument
-from microbootstrap.bootstrappers.litestar import LitestarOpentelemetryInstrument
+from microbootstrap.bootstrappers.litestar import (
+    LitestarOpentelemetryInstrument,
+    LitestarOpenTelemetryInstrumentationMiddleware,
+)
 from microbootstrap.instruments import opentelemetry_instrument
 from microbootstrap.instruments.opentelemetry_instrument import OpentelemetryInstrument
 
@@ -61,7 +63,7 @@ def test_litestar_opentelemetry_bootstrap(
     assert "middleware" in opentelemetry_bootstrap_result
     assert isinstance(opentelemetry_bootstrap_result["middleware"], list)
     assert len(opentelemetry_bootstrap_result["middleware"]) == 1
-    assert isinstance(opentelemetry_bootstrap_result["middleware"][0], DefineMiddleware)
+    assert isinstance(opentelemetry_bootstrap_result["middleware"][0], LitestarOpenTelemetryInstrumentationMiddleware)
 
 
 def test_litestar_opentelemetry_teardown(
@@ -83,9 +85,9 @@ def test_litestar_opentelemetry_bootstrap_working(
     opentelemetry_bootstrap_result: typing.Final = test_opentelemetry_instrument.bootstrap_before()
 
     opentelemetry_middleware = opentelemetry_bootstrap_result["middleware"][0]
-    assert isinstance(opentelemetry_middleware, DefineMiddleware)
+    assert isinstance(opentelemetry_middleware, LitestarOpenTelemetryInstrumentationMiddleware)
     async_mock.__name__ = "test-name"
-    opentelemetry_middleware.middleware.__call__ = async_mock  # type: ignore[operator]
+    opentelemetry_middleware.handle = async_mock  # type: ignore[method-assign]
 
     @litestar.get("/test-handler")
     async def test_handler() -> None: