add thread + postgres instrumentation

packages/grid/backend/grid/logging.yaml

@@ -3,7 +3,7 @@ disable_existing_loggers: True
 
 formatters:
   default:
-    format: "ROOT %(asctime)s - %(levelname)s - %(name)s - %(message)s"
+    format: "%(asctime)s - %(levelname)s - %(name)s - %(message)s"
   uvicorn.default:
     "()": uvicorn.logging.DefaultFormatter
     format: "%(asctime)s - %(levelname)s - %(name)s - %(message)s"

packages/syft/setup.cfg

@@ -117,9 +117,9 @@ telemetry =
     opentelemetry-instrumentation-botocore==0.48b0
     opentelemetry-instrumentation-logging==0.48b0
     opentelemetry-instrumentation-sqlalchemy==0.48b0
+    opentelemetry-instrumentation-threading==0.48b0
     ; opentelemetry-instrumentation-asyncio==0.48b0
     ; opentelemetry-instrumentation-sqlite3==0.48b0
-    ; opentelemetry-instrumentation-threading==0.48b0
     ; opentelemetry-instrumentation-jinja2==0.48b0
     ; opentelemetry-instrumentation-system-metrics==0.48b0
 

packages/syft/src/syft/__init__.py

@@ -90,6 +90,7 @@
 from .util.commit import __commit__
 from .util.patch_ipython import patch_ipython
 from .util.telemetry import instrument
+from .util.telemetry import instrument_threads
 from .util.util import autocache
 from .util.util import get_root_data_path
 from .util.version_compare import make_requires
@@ -103,6 +104,8 @@
 sys.path.append(str(Path(__file__)))
 
 
+instrument_threads()
+
 patch_ipython()
 
 

packages/syft/src/syft/store/db/db.py

@@ -13,10 +13,12 @@
 from ...serde.serializable import serializable
 from ...server.credentials import SyftVerifyKey
 from ...types.uid import UID
+from ...util.telemetry import instrument_sqlalchemny
 from .schema import PostgresBase
 from .schema import SQLiteBase
 
 logger = logging.getLogger(__name__)
+instrument_sqlalchemny()
 
 
 @serializable(canonical_name="DBConfig", version=1)

packages/syft/src/syft/util/telemetry.py

@@ -73,7 +73,6 @@ def instrument_fastapi(app: Any) -> None:
         logger.error(f"Failed to load FastAPIInstrumentor. {e}")
 
 
-
 def instrument_botocore() -> None:
     if not TRACING_ENABLED:
         return
@@ -88,4 +87,32 @@ def instrument_botocore() -> None:
         logger.error(f"Failed to load BotocoreInstrumentor. {e}")
 
 
+def instrument_threads() -> None:
+    if not TRACING_ENABLED:
+        return
+
+    try:
+        # third party
+        from opentelemetry.instrumentation.threading import ThreadingInstrumentor
+
+        ThreadingInstrumentor().instrument()
+        logger.info("Added OTEL ThreadingInstrumentor")
+    except Exception as e:
+        logger.error(f"Failed to load ThreadingInstrumentor. {e}")
+
+
+def instrument_sqlalchemny() -> None:
+    if not TRACING_ENABLED:
+        return
+
+    try:
+        # third party
+        from opentelemetry.instrumentation.sqlalchemy import SQLAlchemyInstrumentor
+
+        SQLAlchemyInstrumentor().instrument(enable_commenter=True, commenter_options={})
+        logger.info("Added OTEL SQLAlchemyInstrumentor")
+    except Exception as e:
+        logger.error(f"Failed to load SQLAlchemyInstrumentor. {e}")
+
+
 instrument = setup_instrumenter()

packages/syft/tests/conftest.py

@@ -27,7 +27,6 @@
 from syft.service.user import user
 
 
-
 def patch_protocol_file(filepath: Path):
     dp = get_data_protocol()
     shutil.copyfile(src=dp.file_path, dst=filepath)