dynamic-scheduler and director-v2

Author: bisgaard-itis

packages/service-library/src/servicelib/fastapi/http_client_thin.py

@@ -8,6 +8,8 @@
 from httpx import AsyncClient, ConnectError, HTTPError, PoolTimeout, Response
 from httpx._types import TimeoutTypes, URLTypes
 from pydantic.errors import PydanticErrorMixin
+from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from settings_library.tracing import TracingSettings
 from tenacity import RetryCallState
 from tenacity.asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
@@ -201,6 +203,7 @@ def __init__(
         base_url: URLTypes | None = None,
         default_http_client_timeout: TimeoutTypes | None = None,
         extra_allowed_method_names: set[str] | None = None,
+        tracing_settings: TracingSettings | None,
     ) -> None:
         _assert_public_interface(self, extra_allowed_method_names)
 
@@ -220,7 +223,10 @@ def __init__(
         if default_http_client_timeout:
             client_args["timeout"] = default_http_client_timeout
 
-        super().__init__(client=AsyncClient(**client_args))
+        client = AsyncClient(**client_args)
+        if tracing_settings:
+            setup_httpx_client_tracing(client)
+        super().__init__(client=client)
 
     async def __aenter__(self):
         await self.setup_client()

packages/service-library/tests/fastapi/test_http_client_thin.py

@@ -119,7 +119,7 @@ async def raises_request_error(self) -> Response:
                 request=Request(method="GET", url=test_url),
             )
 
-    client = ATestClient(total_retry_interval=request_timeout)
+    client = ATestClient(total_retry_interval=request_timeout, tracing_settings=None)
 
     with pytest.raises(ClientHttpError):
         await client.raises_request_error()
@@ -145,7 +145,7 @@ async def raises_http_error(self) -> Response:
             msg = "mock_http_error"
             raise HTTPError(msg)
 
-    client = ATestClient(total_retry_interval=request_timeout)
+    client = ATestClient(total_retry_interval=request_timeout, tracing_settings=None)
 
     with pytest.raises(ClientHttpError):
         await client.raises_http_error()
@@ -159,21 +159,25 @@ async def public_method_ok(self) -> Response:  # type: ignore
             """this method will be ok even if no code is used"""
 
     # OK
-    OKTestClient(total_retry_interval=request_timeout)
+    OKTestClient(total_retry_interval=request_timeout, tracing_settings=None)
 
     class FailWrongAnnotationTestClient(BaseThinClient):
         async def public_method_wrong_annotation(self) -> None:
             """this method will raise an error"""
 
     with pytest.raises(AssertionError, match="should return an instance"):
-        FailWrongAnnotationTestClient(total_retry_interval=request_timeout)
+        FailWrongAnnotationTestClient(
+            total_retry_interval=request_timeout, tracing_settings=None
+        )
 
     class FailNoAnnotationTestClient(BaseThinClient):
         async def public_method_no_annotation(self):
             """this method will raise an error"""
 
     with pytest.raises(AssertionError, match="should return an instance"):
-        FailNoAnnotationTestClient(total_retry_interval=request_timeout)
+        FailNoAnnotationTestClient(
+            total_retry_interval=request_timeout, tracing_settings=None
+        )
 
 
 async def test_expect_state_decorator(
@@ -197,7 +201,9 @@ async def get_wrong_state(self) -> Response:
     respx_mock.get(url_get_200_ok).mock(return_value=Response(codes.OK))
     respx_mock.get(get_wrong_state).mock(return_value=Response(codes.OK))
 
-    test_client = ATestClient(total_retry_interval=request_timeout)
+    test_client = ATestClient(
+        total_retry_interval=request_timeout, tracing_settings=None
+    )
 
     # OK
     response = await test_client.get_200_ok()

services/director-v2/src/simcore_service_director_v2/cli/_client.py

@@ -12,7 +12,9 @@ class ThinDV2LocalhostClient(BaseThinClient):
 
     def __init__(self):
         super().__init__(
-            total_retry_interval=10, default_http_client_timeout=Timeout(5)
+            total_retry_interval=10,
+            default_http_client_timeout=Timeout(5),
+            tracing_settings=None,
         )
 
     def _get_url(self, postfix: str) -> str:

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/api_client/_thin.py

@@ -12,6 +12,7 @@
     expect_status,
     retry_on_errors,
 )
+from settings_library.tracing import TracingSettings
 
 from ....core.dynamic_services_settings.scheduler import (
     DynamicServicesSchedulerSettings,
@@ -31,6 +32,9 @@ def __init__(self, app: FastAPI):
         scheduler_settings: DynamicServicesSchedulerSettings = (
             app.state.settings.DYNAMIC_SERVICES.DYNAMIC_SCHEDULER
         )
+        tracing_settings: TracingSettings | None = (
+            app.state.settings.DIRECTOR_V2_TRACING
+        )
 
         # timeouts
         self._health_request_timeout = Timeout(1.0, connect=1.0)
@@ -53,6 +57,7 @@ def __init__(self, app: FastAPI):
                 scheduler_settings.DYNAMIC_SIDECAR_API_REQUEST_TIMEOUT,
                 connect=scheduler_settings.DYNAMIC_SIDECAR_API_CONNECT_TIMEOUT,
             ),
+            tracing_settings=tracing_settings,
         )
 
     def _get_url(

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v2/_thin_client.py

@@ -37,6 +37,7 @@ def __init__(self, app: FastAPI) -> None:
                 DEFAULT_LEGACY_WB_TO_DV2_HTTP_REQUESTS_TIMEOUT_S
             ),
             extra_allowed_method_names={"attach_lifespan_to"},
+            tracing_settings=settings.DYNAMIC_SCHEDULER_TRACING,
         )
 
     @retry_on_errors()