further propagate tracing_data

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/utils/client_base.py

@@ -5,7 +5,7 @@
 import httpx
 from fastapi import FastAPI
 from httpx import AsyncClient, Timeout
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from settings_library.tracing import TracingSettings
 
 from .app_data import AppDataMixin
@@ -60,7 +60,10 @@ def setup_client_instance(
         timeout=Timeout(_DEFAULT_BASE_SERVICE_CLIENT_API_TIMEOUT_SECONDS),
     )
     if tracing_settings:
-        setup_httpx_client_tracing(client)
+        setup_httpx_client_tracing(
+            client,
+            tracing_data=get_tracing_data(app, tracing_settings=tracing_settings),
+        )
 
     # events
     def _create_instance() -> None:

services/catalog/src/simcore_service_catalog/clients/director.py

@@ -15,7 +15,7 @@
 from models_library.services_metadata_published import ServiceMetaDataPublished
 from models_library.services_types import ServiceKey, ServiceVersion
 from pydantic import NonNegativeInt, TypeAdapter
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from servicelib.logging_utils import log_catch, log_context
 from starlette import status
 from tenacity.asyncio import AsyncRetrying
@@ -146,7 +146,12 @@ def __init__(self, base_url: str, app: FastAPI):
             timeout=settings.CATALOG_CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
         if settings.CATALOG_TRACING:
-            setup_httpx_client_tracing(self.client)
+            setup_httpx_client_tracing(
+                self.client,
+                tracing_data=get_tracing_data(
+                    app=app, tracing_settings=settings.CATALOG_TRACING
+                ),
+            )
 
         assert settings.CATALOG_DIRECTOR  # nosec
         self.vtag = settings.CATALOG_DIRECTOR.DIRECTOR_VTAG

services/director-v2/src/simcore_service_director_v2/modules/catalog.py

@@ -11,7 +11,7 @@
 from models_library.services_resources import ServiceResourcesDict
 from models_library.users import UserID
 from pydantic import TypeAdapter
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from settings_library.catalog import CatalogSettings
 from settings_library.tracing import TracingSettings
 
@@ -35,7 +35,10 @@ async def on_startup() -> None:
             timeout=app.state.settings.CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
         if tracing_settings:
-            setup_httpx_client_tracing(client=client)
+            setup_httpx_client_tracing(
+                client=client,
+                tracing_data=get_tracing_data(app, tracing_settings=tracing_settings),
+            )
 
         CatalogClient.create(
             app,

services/director-v2/src/simcore_service_director_v2/modules/director_v0.py

@@ -13,7 +13,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.users import UserID
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from servicelib.logging_utils import log_decorator
 from settings_library.director_v0 import DirectorV0Settings
 from settings_library.tracing import TracingSettings
@@ -40,7 +40,10 @@ def on_startup() -> None:
             timeout=app.state.settings.CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
         if tracing_settings:
-            setup_httpx_client_tracing(client=client)
+            setup_httpx_client_tracing(
+                client=client,
+                tracing_data=get_tracing_data(app, tracing_settings=tracing_settings),
+            )
         DirectorV0Client.create(
             app,
             client=client,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_services.py

@@ -1,14 +1,11 @@
-""" Module that takes care of communications with dynamic services v0
-
-
-"""
+"""Module that takes care of communications with dynamic services v0"""
 
 import logging
 from dataclasses import dataclass
 
 import httpx
 from fastapi import FastAPI
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from settings_library.tracing import TracingSettings
 
 from ..utils.client_decorators import handle_errors, handle_retry
@@ -22,7 +19,12 @@ def on_startup() -> None:
             timeout=app.state.settings.CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT
         )
         if tracing_settings:
-            setup_httpx_client_tracing(client=client)
+            setup_httpx_client_tracing(
+                client=client,
+                tracing_data=get_tracing_data(
+                    app=app, tracing_settings=tracing_settings
+                ),
+            )
         ServicesClient.create(
             app,
             client=client,

services/director-v2/src/simcore_service_director_v2/modules/resource_usage_tracker_client.py

@@ -1,5 +1,4 @@
-""" Interface to communicate with the resource usage tracker
-"""
+"""Interface to communicate with the resource usage tracker"""
 
 import contextlib
 import logging
@@ -23,7 +22,7 @@
 )
 from models_library.services import ServiceKey, ServiceVersion
 from models_library.wallets import WalletID
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 
 from ..core.errors import PricingPlanUnitNotFoundError
 from ..core.settings import AppSettings
@@ -37,12 +36,19 @@ class ResourceUsageTrackerClient:
     exit_stack: contextlib.AsyncExitStack
 
     @classmethod
-    def create(cls, settings: AppSettings) -> "ResourceUsageTrackerClient":
+    def create(
+        cls, app: FastAPI, settings: AppSettings
+    ) -> "ResourceUsageTrackerClient":
         client = httpx.AsyncClient(
             base_url=settings.DIRECTOR_V2_RESOURCE_USAGE_TRACKER.api_base_url,
         )
         if settings.DIRECTOR_V2_TRACING:
-            setup_httpx_client_tracing(client=client)
+            setup_httpx_client_tracing(
+                client=client,
+                tracing_data=get_tracing_data(
+                    app=app, tracing_settings=settings.DIRECTOR_V2_TRACING
+                ),
+            )
         exit_stack = contextlib.AsyncExitStack()
 
         return cls(client=client, exit_stack=exit_stack)
@@ -166,7 +172,7 @@ def setup(cls, app: FastAPI):
         assert not hasattr(app.state, "resource_usage_api")  # nosec
         app_settings: AppSettings = app.state.settings
 
-        app.state.resource_usage_api = api = cls.create(app_settings)
+        app.state.resource_usage_api = api = cls.create(app, app_settings)
 
         async def on_startup():
             await api.start()

services/director-v2/src/simcore_service_director_v2/modules/storage.py

@@ -1,14 +1,12 @@
-""" Module that takes care of communications with director v0 service
+"""Module that takes care of communications with director v0 service"""
 
-
-"""
 import logging
 from dataclasses import dataclass
 
 import httpx
 from fastapi import FastAPI, HTTPException
 from models_library.users import UserID
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 from servicelib.logging_utils import log_decorator
 from settings_library.s3 import S3Settings
 from settings_library.storage import StorageSettings
@@ -40,7 +38,10 @@ def on_startup() -> None:
             timeout=app.state.settings.CLIENT_REQUEST.HTTP_CLIENT_REQUEST_TOTAL_TIMEOUT,
         )
         if tracing_settings:
-            setup_httpx_client_tracing(client=client)
+            setup_httpx_client_tracing(
+                client=client,
+                tracing_data=get_tracing_data(app, tracing_settings=tracing_settings),
+            )
         StorageClient.create(
             app,
             client=client,

services/payments/src/simcore_service_payments/services/payments_gateway.py

@@ -1,4 +1,4 @@
-""" Interface to communicate with the payment's gateway
+"""Interface to communicate with the payment's gateway
 
 - httpx client with base_url to PAYMENTS_GATEWAY_URL
 - Fake gateway service in services/payments/scripts/example_payment_gateway.py
@@ -25,7 +25,7 @@
     HealthMixinMixin,
 )
 from servicelib.fastapi.httpx_utils import to_curl_command
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 
 from ..core.settings import ApplicationSettings
 from ..models.payments_gateway import (
@@ -216,6 +216,11 @@ def setup_payments_gateway(app: FastAPI):
         ),
     )
     if settings.PAYMENTS_TRACING:
-        setup_httpx_client_tracing(api.client)
+        setup_httpx_client_tracing(
+            api.client,
+            tracing_data=get_tracing_data(
+                app, tracing_settings=settings.PAYMENTS_TRACING
+            ),
+        )
     api.attach_lifespan_to(app)
     api.set_to_app_state(app)

services/payments/src/simcore_service_payments/services/resource_usage_tracker.py

@@ -1,10 +1,9 @@
-""" Interface to communicate with the Resource Usage Tracker (RUT)
+"""Interface to communicate with the Resource Usage Tracker (RUT)
 
 - httpx client with base_url to PAYMENTS_RESOURCE_USAGE_TRACKER
 
 """
 
-
 import logging
 from datetime import datetime
 from decimal import Decimal
@@ -25,7 +24,7 @@
     BaseHTTPApi,
     HealthMixinMixin,
 )
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 
 from ..core.settings import ApplicationSettings
 
@@ -75,6 +74,11 @@ def setup_resource_usage_tracker(app: FastAPI):
         base_url=settings.PAYMENTS_RESOURCE_USAGE_TRACKER.base_url,
     )
     if settings.PAYMENTS_TRACING:
-        setup_httpx_client_tracing(api.client)
+        setup_httpx_client_tracing(
+            api.client,
+            tracing_data=get_tracing_data(
+                app, tracing_settings=settings.PAYMENTS_TRACING
+            ),
+        )
     api.set_to_app_state(app)
     api.attach_lifespan_to(app)

services/payments/src/simcore_service_payments/services/stripe.py

@@ -1,4 +1,4 @@
-""" Interface to communicate with the Resource Usage Tracker (RUT)
+"""Interface to communicate with the Resource Usage Tracker (RUT)
 
 - httpx client with base_url to PAYMENTS_RESOURCE_USAGE_TRACKER
 
@@ -19,7 +19,7 @@
     BaseHTTPApi,
     HealthMixinMixin,
 )
-from servicelib.fastapi.tracing import setup_httpx_client_tracing
+from servicelib.fastapi.tracing import get_tracing_data, setup_httpx_client_tracing
 
 from ..core.errors import StripeRuntimeError
 from ..core.settings import ApplicationSettings
@@ -93,7 +93,12 @@ def setup_stripe(app: FastAPI):
         auth=_StripeBearerAuth(settings.PAYMENTS_STRIPE_API_SECRET.get_secret_value()),
     )
     if settings.PAYMENTS_TRACING:
-        setup_httpx_client_tracing(api.client)
+        setup_httpx_client_tracing(
+            api.client,
+            tracing_data=get_tracing_data(
+                app, tracing_settings=settings.PAYMENTS_TRACING
+            ),
+        )
 
     api.set_to_app_state(app)
     api.attach_lifespan_to(app)