🎨 Tracing: Add more autoinstrumentation, enhance setup_tracing() - DON'T DELETE PR BRANCH

packages/aws-library/requirements/_base.in

@@ -11,4 +11,5 @@ aiocache
 arrow
 pydantic[email]
 types-aiobotocore[ec2,s3,ssm]
+opentelemetry-instrumentation-botocore
 sh

packages/aws-library/requirements/_base.txt

@@ -127,7 +127,11 @@ opentelemetry-api==1.27.0
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-botocore
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
+    #   opentelemetry-propagator-aws-xray
     #   opentelemetry-sdk
     #   opentelemetry-semantic-conventions
 opentelemetry-exporter-otlp==1.27.0
@@ -141,9 +145,21 @@ opentelemetry-exporter-otlp-proto-grpc==1.27.0
 opentelemetry-exporter-otlp-proto-http==1.27.0
     # via opentelemetry-exporter-otlp
 opentelemetry-instrumentation==0.48b0
-    # via opentelemetry-instrumentation-requests
+    # via
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-botocore
+    #   opentelemetry-instrumentation-redis
+    #   opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-aio-pika==0.48b0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
+opentelemetry-instrumentation-botocore==0.48b0
+    # via -r requirements/_base.in
+opentelemetry-instrumentation-redis==0.48b0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
 opentelemetry-instrumentation-requests==0.48b0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
+opentelemetry-propagator-aws-xray==1.0.2
+    # via opentelemetry-instrumentation-botocore
 opentelemetry-proto==1.27.0
     # via
     #   opentelemetry-exporter-otlp-proto-common
@@ -156,6 +172,8 @@ opentelemetry-sdk==1.27.0
     #   opentelemetry-exporter-otlp-proto-http
 opentelemetry-semantic-conventions==0.48b0
     # via
+    #   opentelemetry-instrumentation-botocore
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
     #   opentelemetry-sdk
 opentelemetry-util-http==0.48b0
@@ -297,6 +315,8 @@ wrapt==1.16.0
     #   aiobotocore
     #   deprecated
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-redis
 yarl==1.12.1
     # via
     #   aio-pika

packages/postgres-database/requirements/_base.in

@@ -7,4 +7,5 @@
 alembic
 pydantic
 sqlalchemy[postgresql_psycopg2binary,postgresql_asyncpg] # SEE extras in https://github.com/sqlalchemy/sqlalchemy/blob/main/setup.cfg#L43
+opentelemetry-instrumentation-asyncpg
 yarl

packages/postgres-database/requirements/_base.txt

@@ -4,10 +4,16 @@ async-timeout==4.0.3
     # via asyncpg
 asyncpg==0.29.0
     # via sqlalchemy
+deprecated==1.2.14
+    # via
+    #   opentelemetry-api
+    #   opentelemetry-semantic-conventions
 greenlet==3.1.1
     # via sqlalchemy
 idna==3.10
     # via yarl
+importlib-metadata==8.4.0
+    # via opentelemetry-api
 mako==1.3.5
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -16,12 +22,25 @@ markupsafe==2.1.5
     # via mako
 multidict==6.1.0
     # via yarl
+opentelemetry-api==1.27.0
+    # via
+    #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-asyncpg
+    #   opentelemetry-semantic-conventions
+opentelemetry-instrumentation==0.48b0
+    # via opentelemetry-instrumentation-asyncpg
+opentelemetry-instrumentation-asyncpg==0.48b0
+    # via -r requirements/_base.in
+opentelemetry-semantic-conventions==0.48b0
+    # via opentelemetry-instrumentation-asyncpg
 psycopg2-binary==2.9.9
     # via sqlalchemy
 pydantic==1.10.18
     # via
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/_base.in
+setuptools==75.2.0
+    # via opentelemetry-instrumentation
 sqlalchemy==1.4.54
     # via
     #   -c requirements/../../../requirements/constraints.txt
@@ -31,5 +50,11 @@ typing-extensions==4.12.2
     # via
     #   alembic
     #   pydantic
+wrapt==1.16.0
+    # via
+    #   deprecated
+    #   opentelemetry-instrumentation
 yarl==1.12.1
     # via -r requirements/_base.in
+zipp==3.20.2
+    # via importlib-metadata

packages/postgres-database/requirements/_tools.txt

@@ -68,8 +68,10 @@ pyyaml==6.0.2
     #   pre-commit
 ruff==0.6.7
     # via -r requirements/../../../requirements/devenv.txt
-setuptools==75.1.0
-    # via pip-tools
+setuptools==75.2.0
+    # via
+    #   -c requirements/_base.txt
+    #   pip-tools
 tomlkit==0.13.2
     # via pylint
 typing-extensions==4.12.2

packages/service-library/requirements/_base.in

@@ -18,6 +18,8 @@ faststream
 opentelemetry-api
 opentelemetry-exporter-otlp
 opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-aio-pika
+opentelemetry-instrumentation-redis
 opentelemetry-sdk
 psutil
 pydantic

packages/service-library/requirements/_base.txt

@@ -93,6 +93,8 @@ opentelemetry-api==1.27.0
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
     #   opentelemetry-sdk
     #   opentelemetry-semantic-conventions
@@ -107,7 +109,14 @@ opentelemetry-exporter-otlp-proto-grpc==1.27.0
 opentelemetry-exporter-otlp-proto-http==1.27.0
     # via opentelemetry-exporter-otlp
 opentelemetry-instrumentation==0.48b0
-    # via opentelemetry-instrumentation-requests
+    # via
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-redis
+    #   opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-aio-pika==0.48b0
+    # via -r requirements/_base.in
+opentelemetry-instrumentation-redis==0.48b0
+    # via -r requirements/_base.in
 opentelemetry-instrumentation-requests==0.48b0
     # via -r requirements/_base.in
 opentelemetry-proto==1.27.0
@@ -122,6 +131,7 @@ opentelemetry-sdk==1.27.0
     #   opentelemetry-exporter-otlp-proto-http
 opentelemetry-semantic-conventions==0.48b0
     # via
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
     #   opentelemetry-sdk
 opentelemetry-util-http==0.48b0
@@ -219,6 +229,8 @@ wrapt==1.16.0
     # via
     #   deprecated
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-redis
 yarl==1.12.1
     # via
     #   aio-pika

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("Added aiopg opentelemetry instrumentation.")
+    if HAS_BOTOCORE:
+        BotocoreInstrumentor().instrument()
+        _logger.info("Attempting to add botocore opentelemetry autoinstrumentation...")
     RequestsInstrumentor().instrument()

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

@@ -16,6 +16,40 @@
 from settings_library.tracing import TracingSettings
 
 log = logging.getLogger(__name__)
+#########
+try:
+    from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor
+
+    HAS_ASYNCPG = True
+except ImportError:
+    HAS_ASYNCPG = False
+#########
+try:
+    from opentelemetry.instrumentation.aio_pika import AioPikaInstrumentor
+
+    HAS_AIOPIKA = True
+except ImportError:
+    HAS_AIOPIKA = False
+#########
+try:
+    from opentelemetry.instrumentation.aiopg import AiopgInstrumentor
+
+    HAS_AIOPG = True
+except ImportError:
+    HAS_AIOPG = False
+#########
+try:
+    from opentelemetry.instrumentation.redis import RedisInstrumentor
+
+    HAS_REDIS = True
+except ImportError:
+    HAS_REDIS = False
+try:
+    from opentelemetry.instrumentation.botocore import BotocoreInstrumentor
+
+    HAS_BOTOCORE = True
+except ImportError:
+    HAS_BOTOCORE = False
 
 
 def setup_tracing(
@@ -35,7 +69,7 @@ def setup_tracing(
     assert isinstance(global_tracer_provider, TracerProvider)  # nosec
     tracing_destination: str = f"{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:{tracing_settings.TRACING_OPENTELEMETRY_COLLECTOR_PORT}/v1/traces"
     log.info(
-        "Trying to connect service %s to tracing collector at %s.",
+        "Trying to connect service %s to opentelemetry tracing collector at %s.",
         service_name,
         tracing_destination,
     )
@@ -45,3 +79,19 @@ def setup_tracing(
     global_tracer_provider.add_span_processor(span_processor)
     # Instrument FastAPI
     FastAPIInstrumentor().instrument_app(app)
+
+    if HAS_AIOPG:
+        log.info("Attempting to add aiopg opentelemetry autoinstrumentation...")
+        AiopgInstrumentor().instrument()
+    if HAS_ASYNCPG:
+        log.info("Attempting to add asyncpg opentelemetry autoinstrumentation...")
+        AsyncPGInstrumentor().instrument()
+    if HAS_AIOPIKA:
+        log.info("Attempting to add aio-pika opentelemetry autoinstrumentation...")
+        AioPikaInstrumentor().instrument()
+    if HAS_REDIS:
+        log.info("Attempting to add redis opentelemetry autoinstrumentation...")
+        RedisInstrumentor().instrument()
+    if HAS_BOTOCORE:
+        log.info("Attempting to add botocore opentelemetry autoinstrumentation...")
+        BotocoreInstrumentor().instrument()

packages/simcore-sdk/requirements/_base.in

@@ -12,6 +12,7 @@ aiocache
 aiofiles
 aiohttp
 aiopg[sa]
+opentelemetry-instrumentation-aiopg
 packaging
 pint
 pydantic[email]

packages/simcore-sdk/requirements/_base.txt

@@ -139,6 +139,11 @@ opentelemetry-api==1.27.0
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-exporter-otlp-proto-http
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-aiopg
+    #   opentelemetry-instrumentation-asyncpg
+    #   opentelemetry-instrumentation-dbapi
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
     #   opentelemetry-sdk
     #   opentelemetry-semantic-conventions
@@ -153,7 +158,23 @@ opentelemetry-exporter-otlp-proto-grpc==1.27.0
 opentelemetry-exporter-otlp-proto-http==1.27.0
     # via opentelemetry-exporter-otlp
 opentelemetry-instrumentation==0.48b0
-    # via opentelemetry-instrumentation-requests
+    # via
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-aiopg
+    #   opentelemetry-instrumentation-asyncpg
+    #   opentelemetry-instrumentation-dbapi
+    #   opentelemetry-instrumentation-redis
+    #   opentelemetry-instrumentation-requests
+opentelemetry-instrumentation-aio-pika==0.48b0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
+opentelemetry-instrumentation-aiopg==0.48b0
+    # via -r requirements/_base.in
+opentelemetry-instrumentation-asyncpg==0.48b0
+    # via -r requirements/../../../packages/postgres-database/requirements/_base.in
+opentelemetry-instrumentation-dbapi==0.48b0
+    # via opentelemetry-instrumentation-aiopg
+opentelemetry-instrumentation-redis==0.48b0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
 opentelemetry-instrumentation-requests==0.48b0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 opentelemetry-proto==1.27.0
@@ -168,6 +189,9 @@ opentelemetry-sdk==1.27.0
     #   opentelemetry-exporter-otlp-proto-http
 opentelemetry-semantic-conventions==0.48b0
     # via
+    #   opentelemetry-instrumentation-asyncpg
+    #   opentelemetry-instrumentation-dbapi
+    #   opentelemetry-instrumentation-redis
     #   opentelemetry-instrumentation-requests
     #   opentelemetry-sdk
 opentelemetry-util-http==0.48b0
@@ -321,6 +345,10 @@ wrapt==1.16.0
     # via
     #   deprecated
     #   opentelemetry-instrumentation
+    #   opentelemetry-instrumentation-aio-pika
+    #   opentelemetry-instrumentation-aiopg
+    #   opentelemetry-instrumentation-dbapi
+    #   opentelemetry-instrumentation-redis
 yarl==1.12.1
     # via
     #   -r requirements/../../../packages/postgres-database/requirements/_base.in