@pcrespov change requests

Author: mrnicegyu11

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

@@ -19,6 +19,7 @@
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from servicelib.logging_utils import log_context
 from settings_library.tracing import TracingSettings
 
 _logger = logging.getLogger(__name__)
@@ -100,9 +101,17 @@ def setup_tracing(
     # Instrument aiohttp client
     AioHttpClientInstrumentor().instrument()
     if HAS_AIOPG:
-        AiopgInstrumentor().instrument()
-        _logger.info("Added aiopg opentelemetry instrumentation.")
+        with log_context(
+            _logger,
+            logging.INFO,
+            msg="Attempting to add aio-pika opentelemetry autoinstrumentation...",
+        ):
+            AiopgInstrumentor().instrument()
     if HAS_BOTOCORE:
-        BotocoreInstrumentor().instrument()
-        _logger.info("Attempting to add botocore opentelemetry autoinstrumentation...")
+        with log_context(
+            _logger,
+            logging.INFO,
+            msg="Attempting to add botocore opentelemetry autoinstrumentation...",
+        ):
+            BotocoreInstrumentor().instrument()
     RequestsInstrumentor().instrument()

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

@@ -17,34 +17,35 @@
 from settings_library.tracing import TracingSettings
 
 _logger = 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