Merge pull request #42 from godon-dev/otel_instrumenation_logging

feat: use OTel logging via get_logger from shared module

Author: cherusk

.github/workflows/ci.yml

@@ -72,8 +72,13 @@ jobs:
 
           fake_f = MagicMock()
           fake_f.controller = FakeControllerModule()
+          fake_f.shared = MagicMock()
+          fake_f.shared.otel_logging = MagicMock()
+          fake_f.shared.otel_logging.get_logger = lambda name: MagicMock()
           sys.modules['f'] = fake_f
           sys.modules['f.controller'] = fake_f.controller
+          sys.modules['f.shared'] = fake_f.shared
+          sys.modules['f.shared.otel_logging'] = fake_f.shared.otel_logging
 
           # Pre-populate all f.controller.xxx modules BEFORE any imports
           for module_name in ['config', 'database', 'breeder_service', 'breeder_create',
@@ -382,8 +387,13 @@ jobs:
 
           fake_f = MagicMock()
           fake_f.controller = FakeControllerModule()
+          fake_f.shared = MagicMock()
+          fake_f.shared.otel_logging = MagicMock()
+          fake_f.shared.otel_logging.get_logger = lambda name: MagicMock()
           sys.modules['f'] = fake_f
           sys.modules['f.controller'] = fake_f.controller
+          sys.modules['f.shared'] = fake_f.shared
+          sys.modules['f.shared.otel_logging'] = fake_f.shared.otel_logging
 
           # Pre-populate all f.controller.xxx modules BEFORE any imports
           for module_name in ['config', 'database', 'breeder_service', 'breeder_create',

controller/breeder_service.py

@@ -2,21 +2,19 @@
 import hashlib
 import datetime
 import copy
-import logging
 import os
 from dateutil.parser import parse
 
 from f.controller.database import ArchiveDatabaseRepository, MetadataDatabaseRepository
 from f.controller.config import BreederConfig, BREEDER_CAPABILITIES, DatabaseConfig
+from f.shared.otel_logging import get_logger
 
-# Import wmill at top level so Windmill can detect it for dependency resolution
 import wmill
 from wmill import Windmill
 
-# Import optuna for schema initialization
 import optuna.storages
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 def cancel_job_by_id(job_id: str, reason: str = None) -> bool:
     """Cancel a Windmill job by its ID

controller/credential_create.py

@@ -1,9 +1,9 @@
 from f.controller.config import DatabaseConfig
 from f.controller.database import MetadataDatabaseRepository
+from f.shared.otel_logging import get_logger
 import uuid
-import logging
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 def main(request_data=None):
     """Create a new credential catalog entry"""

controller/credential_delete.py

@@ -1,8 +1,8 @@
 from f.controller.config import DatabaseConfig
 from f.controller.database import MetadataDatabaseRepository
-import logging
+from f.shared.otel_logging import get_logger
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 def main(request_data=None):
     """Delete a credential by ID"""

controller/credential_get.py

@@ -1,8 +1,8 @@
 from f.controller.config import DatabaseConfig
 from f.controller.database import MetadataDatabaseRepository
-import logging
+from f.shared.otel_logging import get_logger
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 def main(request_data=None):
     """Get a specific credential by ID"""

controller/credentials_get.py

@@ -1,8 +1,8 @@
 from f.controller.config import DatabaseConfig
 from f.controller.database import MetadataDatabaseRepository
-import logging
+from f.shared.otel_logging import get_logger
 
-logger = logging.getLogger(__name__)
+logger = get_logger(__name__)
 
 def main(request_data=None):
     """Get list of all credentials"""

controller/database.py

@@ -1,9 +1,10 @@
 import psycopg2
-import logging
 import json
 from contextlib import contextmanager
 
-logger = logging.getLogger(__name__)
+from f.shared.otel_logging import get_logger
+
+logger = get_logger(__name__)
 
 @contextmanager
 def get_db_connection(db_config):

tests/conftest.py

@@ -23,32 +23,32 @@
 import types
 from unittest.mock import MagicMock
 
-# Add parent directory to path for imports
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
 
-# Mock external dependencies before imports
 sys.modules['database'] = MagicMock()
 
-# Mock wmill module (only available inside Windmill)
 sys.modules['wmill'] = MagicMock()
 
-# Mock optuna.storages module (only needed in production, not tests)
 sys.modules['optuna'] = MagicMock()
 sys.modules['optuna.storages'] = MagicMock()
 
-# Create stub modules using types.ModuleType
 def create_stub_module(name):
     module = types.ModuleType(name)
     module.__path__ = []
     module.__spec__ = None
     module.__name__ = name
     return module
 
-# Create f and f.controller
 fake_f = create_stub_module('f')
 fake_controller = create_stub_module('f.controller')
+fake_shared = create_stub_module('f.shared')
 sys.modules['f'] = fake_f
 sys.modules['f.controller'] = fake_controller
+sys.modules['f.shared'] = fake_shared
+
+fake_otel = create_stub_module('f.shared.otel_logging')
+fake_otel.get_logger = lambda name: MagicMock()
+sys.modules['f.shared.otel_logging'] = fake_otel
 
 # Pre-populate all f.controller.xxx modules BEFORE any imports
 for module_name in ['config', 'database', 'breeder_service', 'credential_create',