changes according to PR feedback @pcrespov

Author: bisgaard-itis

packages/service-library/src/servicelib/aiohttp/tracing.py

@@ -113,7 +113,7 @@ def _startup(
     # Since the code that is provided (monkeypatched) in the __init__ that the opentelemetry-autoinstrumentation-library provides is only 4 lines,
     # just adding a middleware, we are free to simply execute this "missed call" [since we can't call the monkeypatch'ed __init__()] in this following line:
     if add_response_trace_id_header:
-        app.middlewares.insert(0, ResponseTraceIdHeaderMiddleware)
+        app.middlewares.insert(0, response_trace_id_header_middleware)
     app.middlewares.insert(0, aiohttp_server_opentelemetry_middleware)
     # Code of the aiohttp server instrumentation: github.com/open-telemetry/opentelemetry-python-contrib/blob/eccb05c808a7d797ef5b6ecefed3590664426fbf/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py#L246
     # For reference, the above statement was written for:
@@ -155,14 +155,16 @@ def _startup(
 
 
 @web.middleware
-async def ResponseTraceIdHeaderMiddleware(request: web.Request, handler):
+async def response_trace_id_header_middleware(request: web.Request, handler):
+    headers = get_trace_id_header()
+
     try:
         response = await handler(request)
     except web.HTTPException as exc:
-        if headers := get_trace_id_header():
+        if headers:
             exc.headers.update(headers)
         raise exc
-    if headers := get_trace_id_header():
+    if headers:
         response.headers.update(headers)
     return response
 
@@ -196,6 +198,7 @@ def _shutdown() -> None:
 
 
 def get_tracing_lifespan(
+    *,
     app: web.Application,
     tracing_settings: TracingSettings,
     service_name: str,

packages/service-library/tests/aiohttp/test_tracing.py

@@ -62,7 +62,7 @@ async def test_valid_tracing_settings(
     service_name = "simcore_service_webserver"
     tracing_settings = TracingSettings()
     async for _ in get_tracing_lifespan(
-        app, service_name=service_name, tracing_settings=tracing_settings
+        app=app, service_name=service_name, tracing_settings=tracing_settings
     )(app):
         pass
 
@@ -139,13 +139,13 @@ async def test_tracing_setup_package_detection(
     service_name = "simcore_service_webserver"
     tracing_settings = TracingSettings()
     async for _ in get_tracing_lifespan(
-        app,
+        app=app,
         service_name=service_name,
         tracing_settings=tracing_settings,
     )(app):
         # idempotency
         async for _ in get_tracing_lifespan(
-            app,
+            app=app,
             service_name=service_name,
             tracing_settings=tracing_settings,
         )(app):
@@ -182,7 +182,7 @@ async def handler(request: web.Request) -> web.Response:
     app.router.add_get("/", handler)
 
     async for _ in get_tracing_lifespan(
-        app,
+        app=app,
         service_name=service_name,
         tracing_settings=tracing_settings,
         add_response_trace_id_header=True,

services/web/server/src/simcore_service_webserver/tracing.py

@@ -25,7 +25,7 @@ def setup_app_tracing(app: web.Application):
     tracing_settings: TracingSettings = get_plugin_settings(app)
     app.cleanup_ctx.append(
         get_tracing_lifespan(
-            app,
+            app=app,
             tracing_settings=tracing_settings,
             service_name=APP_NAME,
             add_response_trace_id_header=True,