wip

Author: mrnicegyu11

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

@@ -15,23 +15,31 @@
 from opentelemetry.instrumentation.aiohttp_server import (
     middleware as aiohttp_server_opentelemetry_middleware,  # pylint:disable=no-name-in-module
 )
-from opentelemetry.instrumentation.aiopg import (  # pylint:disable=no-name-in-module
-    AiopgInstrumentor,
-)
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from settings_library.tracing import TracingSettings
 
 _logger = logging.getLogger(__name__)
+try:
+    from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
+
+    HAS_BOTOCORE = True
+except ImportError:
+    HAS_BOTOCORE = False
+try:
+    from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
+
+    HAS_AIOPG = True
+except ImportError:
+    HAS_AIOPG = False
 
 
 def setup_tracing(
     app: web.Application,
     tracing_settings: TracingSettings,
     service_name: str,
-    instrument_aiopg: bool = False,  # noqa: FBT001, FBT002
 ) -> None:
     """
     Sets up this service for a distributed tracing system (opentelemetry)
@@ -91,6 +99,10 @@ def setup_tracing(
 
     # Instrument aiohttp client
     AioHttpClientInstrumentor().instrument()
-    if instrument_aiopg:
+    if HAS_AIOPG:
         AiopgInstrumentor().instrument()
+        _logger.info("Attempting to add aiopg opentelemetry autoinstrumentation...")
+    if HAS_BOTOCORE:
+        BotocoreInstrumentor().instrument()
+        _logger.info("Attempting to add botocore opentelemetry autoinstrumentation...")
     RequestsInstrumentor().instrument()

services/storage/requirements/_base.in

@@ -19,6 +19,7 @@ aiofiles # i/o
 aiohttp # server
 aiohttp-swagger[performance] # server
 aiopg[sa] # db
+opentelemetry-instrumentation-botocore
 packaging
 tenacity
 typer

services/storage/src/simcore_service_storage/application.py

@@ -56,7 +56,6 @@ def create(settings: Settings) -> web.Application:
             app,
             tracing_settings=tracing_settings,
             service_name=APP_NAME,
-            instrument_aiopg=True,
         )
 
     setup_db(app)

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

@@ -26,6 +26,5 @@ def setup_app_tracing(app: web.Application):
     setup_tracing(
         app,
         tracing_settings=tracing_settings,
-        instrument_aiopg=True,
         service_name=APP_NAME,
     )