dbos 0.5.0a5__tar.gz → 0.5.0a7__tar.gz

{dbos-0.5.0a5 → dbos-0.5.0a7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 0.5.0a5
+Version: 0.5.0a7
 Summary: A Python framework for backends that scale
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-0.5.0a5 → dbos-0.5.0a7}/dbos/dbos.py

@@ -72,7 +72,7 @@ from dbos.error import DBOSException, DBOSNonExistentWorkflowError
 
 from .application_database import ApplicationDatabase
 from .dbos_config import ConfigFile, load_config, set_env_vars
-from .logger import config_logger, dbos_logger, init_logger
+from .logger import add_otlp_to_all_loggers, config_logger, dbos_logger, init_logger
 from .system_database import SystemDatabase
 
 # Most DBOS functions are just any callable F, so decorators / wrappers work on F
@@ -204,7 +204,6 @@ class DBOS:
         cls: Type[DBOS],
         fastapi: Optional["FastAPI"] = None,
         config: Optional[ConfigFile] = None,
-        launch: bool = True,
     ) -> DBOS:
         global _dbos_global_instance
         global _dbos_global_registry
@@ -219,7 +218,7 @@ class DBOS:
                     )
                 config = _dbos_global_registry.config
             _dbos_global_instance = super().__new__(cls)
-            _dbos_global_instance.__init__(fastapi=fastapi, config=config, launch=launch)  # type: ignore
+            _dbos_global_instance.__init__(fastapi=fastapi, config=config)  # type: ignore
         else:
             if (config is not None and _dbos_global_instance.config is not config) or (
                 _dbos_global_instance.fastapi is not fastapi
@@ -242,7 +241,6 @@ class DBOS:
         self,
         fastapi: Optional["FastAPI"] = None,
         config: Optional[ConfigFile] = None,
-        launch: bool = True,
     ) -> None:
         if hasattr(self, "_initialized") and self._initialized:
             return
@@ -270,7 +268,6 @@ class DBOS:
 
             setup_fastapi_middleware(self.fastapi)
             self.fastapi.on_event("startup")(self.launch)
-            launch = False
 
         # Register send_stub as a workflow
         def send_temp_workflow(
@@ -283,8 +280,8 @@ class DBOS:
         set_temp_workflow_type(send_temp_workflow, "send")
         self._registry.register_wf_function(TEMP_SEND_WF_NAME, temp_send_wf)
 
-        if launch:
-            self.launch()
+        for handler in dbos_logger.handlers:
+            handler.flush()
 
     @property
     def executor(self) -> ThreadPoolExecutor:
@@ -342,9 +339,13 @@ class DBOS:
             self.executor.submit(func, *args, **kwargs)
         self._registry.pollers = []
 
-        dbos_logger.info("DBOS initialized")
+        dbos_logger.info("DBOS launched")
+
+        # Flush handlers and add OTLP to all loggers if enabled
+        # to enable their export in DBOS Cloud
         for handler in dbos_logger.handlers:
             handler.flush()
+        add_otlp_to_all_loggers()
 
     def _destroy(self) -> None:
         self._initialized = False

{dbos-0.5.0a5 → dbos-0.5.0a7}/dbos/logger.py

@@ -12,6 +12,7 @@ if TYPE_CHECKING:
     from dbos.dbos_config import ConfigFile
 
 dbos_logger = logging.getLogger("dbos")
+otlp_handler, otlp_transformer = None, None
 
 
 class DBOSLogTransformer(logging.Filter):
@@ -73,25 +74,28 @@ def config_logger(config: "ConfigFile") -> None:
                 export_timeout_millis=5000,
             )
         )
+        global otlp_handler
         otlp_handler = LoggingHandler(logger_provider=log_provider)
 
         # Attach DBOS-specific attributes to all log entries.
+        global otlp_transformer
         otlp_transformer = DBOSLogTransformer()
 
-        # Direct all logs to OTLP
-        add_otlp_to_all_loggers(otlp_handler, otlp_transformer)
+        # Direct DBOS logs to OTLP
+        dbos_logger.addHandler(otlp_handler)
+        dbos_logger.addFilter(otlp_transformer)
 
 
-def add_otlp_to_all_loggers(
-    otlp_handler: LoggingHandler, otlp_transformer: DBOSLogTransformer
-) -> None:
-    root = logging.root
+def add_otlp_to_all_loggers() -> None:
+    if otlp_handler is not None and otlp_transformer is not None:
+        root = logging.root
 
-    root.addHandler(otlp_handler)
-    root.addFilter(otlp_transformer)
+        root.addHandler(otlp_handler)
+        root.addFilter(otlp_transformer)
 
-    for logger_name in root.manager.loggerDict:
-        logger = logging.getLogger(logger_name)
-        if not logger.propagate:
-            logger.addHandler(otlp_handler)
-        logger.addFilter(otlp_transformer)
+        for logger_name in root.manager.loggerDict:
+            if logger_name != dbos_logger.name:
+                logger = logging.getLogger(logger_name)
+                if not logger.propagate:
+                    logger.addHandler(otlp_handler)
+                logger.addFilter(otlp_transformer)

{dbos-0.5.0a5 → dbos-0.5.0a7}/dbos/system_database.py

@@ -734,7 +734,6 @@ class SystemDatabase:
                 )
                 notification_cursor = self.notification_conn.cursor()
 
-                dbos_logger.info("Listening to notifications")
                 notification_cursor.execute("LISTEN dbos_notifications_channel")
                 notification_cursor.execute("LISTEN dbos_workflow_events_channel")
                 while self._run_background_processes:

{dbos-0.5.0a5 → dbos-0.5.0a7}/pyproject.toml

@@ -23,7 +23,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.5.0a5"
+version = "0.5.0a7"
 
 [project.license]
 text = "MIT"

{dbos-0.5.0a5 → dbos-0.5.0a7}/tests/atexit_no_launch.py

@@ -26,4 +26,4 @@ def default_config() -> ConfigFile:
     }
 
 
-DBOS(config=default_config(), launch=False)
+DBOS(config=default_config())

{dbos-0.5.0a5 → dbos-0.5.0a7}/tests/conftest.py

@@ -103,7 +103,8 @@ def dbos(
     #     launch themselves.
     # If your test is tricky and has a problem with this, use a different
     #   fixture that does not launch.
-    dbos = DBOS(config=config, launch=True)
+    dbos = DBOS(config=config)
+    dbos.launch()
 
     yield dbos
     DBOS.destroy()

{dbos-0.5.0a5 → dbos-0.5.0a7}/tests/test_dbos.py

@@ -472,7 +472,7 @@ def test_recovery_thread(config: ConfigFile, dbos: DBOS) -> None:
     )
 
     dbos._destroy()  # Unusual pattern - reusing the memory
-    dbos.__init__(config=config, launch=False)  # type: ignore
+    dbos.__init__(config=config)  # type: ignore
 
     @DBOS.workflow()  # type: ignore
     def test_workflow(var: str) -> str:
@@ -685,6 +685,7 @@ def test_without_fastapi() -> None:
         sys.meta_path.remove(blocker)
 
     dbos = DBOS(config=config)
+    dbos.launch()
 
     try:
 

{dbos-0.5.0a5 → dbos-0.5.0a7}/tests/test_schema_migration.py

@@ -65,6 +65,7 @@ def test_custom_sysdb_name_migration(
     # Test migrating up
     DBOS.destroy()  # In case of other tests leaving it
     dbos = DBOS(config=config)
+    dbos.launch()
 
     # Make sure all tables exist
     with dbos.sys_db.engine.connect() as connection:

{dbos-0.5.0a5 → dbos-0.5.0a7}/tests/test_singleton.py

@@ -22,7 +22,7 @@ def test_dbos_singleton(cleanup_test_databases: None) -> None:
     #    then imports more
     from tests.classdefs import DBOSSendRecv, DBOSTestClass, DBOSTestRoles
 
-    dbos: DBOS = DBOS(None, default_config(), launch=False)
+    dbos: DBOS = DBOS(None, default_config())
 
     from tests.more_classdefs import DBOSWFEvents, wfFunc