dbos 0.24.0a12__py3-none-any.whl → 0.24.0a14__py3-none-any.whl

dbos/_conductor/conductor.py

@@ -1,3 +1,4 @@
+import socket
 import threading
 import time
 import traceback
@@ -51,6 +52,7 @@ class ConductorWebsocket(threading.Thread):
                                 request_id=base_message.request_id,
                                 executor_id=GlobalParams.executor_id,
                                 application_version=GlobalParams.app_version,
+                                hostname=socket.gethostname(),
                             )
                             websocket.send(info_response.to_json())
                             self.dbos.logger.info("Connected to DBOS conductor")

dbos/_conductor/protocol.py

@@ -59,6 +59,7 @@ class ExecutorInfoRequest(BaseMessage):
 class ExecutorInfoResponse(BaseMessage):
     executor_id: str
     application_version: str
+    hostname: Optional[str]
     error_message: Optional[str] = None
 
 
@@ -137,6 +138,7 @@ class WorkflowsOutput:
     UpdatedAt: Optional[str]
     QueueName: Optional[str]
     ApplicationVersion: Optional[str]
+    ExecutorID: Optional[str]
 
     @classmethod
     def from_workflow_information(cls, info: WorkflowInformation) -> "WorkflowsOutput":
@@ -164,6 +166,7 @@ class WorkflowsOutput:
             UpdatedAt=updated_at_str,
             QueueName=info.queue_name,
             ApplicationVersion=info.app_version,
+            ExecutorID=info.executor_id,
         )
 
 

dbos/_dbos_config.py

@@ -34,6 +34,7 @@ class DBOSConfig(TypedDict, total=False):
         sys_db_pool_size (int): System database pool size
         log_level (str): Log level
         otlp_traces_endpoints: List[str]: OTLP traces endpoints
+        otlp_logs_endpoints: List[str]: OTLP logs endpoints
         admin_port (int): Admin port
         run_admin_server (bool): Whether to run the DBOS admin server
     """
@@ -45,6 +46,7 @@ class DBOSConfig(TypedDict, total=False):
     sys_db_pool_size: Optional[int]
     log_level: Optional[str]
     otlp_traces_endpoints: Optional[List[str]]
+    otlp_logs_endpoints: Optional[List[str]]
     admin_port: Optional[int]
     run_admin_server: Optional[bool]
 
@@ -94,8 +96,8 @@ def parse_database_url_to_dbconfig(database_url: str) -> DatabaseConfig:
 
 
 class OTLPExporterConfig(TypedDict, total=False):
-    logsEndpoint: Optional[str]
-    tracesEndpoint: Optional[str]
+    logsEndpoint: Optional[List[str]]
+    tracesEndpoint: Optional[List[str]]
 
 
 class LoggerConfig(TypedDict, total=False):
@@ -187,17 +189,27 @@ def translate_dbos_config_to_config_file(config: DBOSConfig) -> ConfigFile:
         ]
 
     # Telemetry config
-    telemetry = {}
+    telemetry: TelemetryConfig = {
+        "OTLPExporter": {"tracesEndpoint": [], "logsEndpoint": []}
+    }
+    # For mypy
+    assert telemetry["OTLPExporter"] is not None
+
     # Add OTLPExporter if traces endpoints exist
     otlp_trace_endpoints = config.get("otlp_traces_endpoints")
     if isinstance(otlp_trace_endpoints, list) and len(otlp_trace_endpoints) > 0:
-        telemetry["OTLPExporter"] = {"tracesEndpoint": otlp_trace_endpoints[0]}
+        telemetry["OTLPExporter"]["tracesEndpoint"] = otlp_trace_endpoints
+    # Same for the logs
+    otlp_logs_endpoints = config.get("otlp_logs_endpoints")
+    if isinstance(otlp_logs_endpoints, list) and len(otlp_logs_endpoints) > 0:
+        telemetry["OTLPExporter"]["logsEndpoint"] = otlp_logs_endpoints
+
     # Default to INFO -- the logging seems to default to WARN otherwise.
     log_level = config.get("log_level", "INFO")
     if log_level:
         telemetry["logs"] = {"logLevel": log_level}
     if telemetry:
-        translated_config["telemetry"] = cast(TelemetryConfig, telemetry)
+        translated_config["telemetry"] = telemetry
 
     return translated_config
 
@@ -287,6 +299,17 @@ def load_config(
     except ValidationError as e:
         raise DBOSInitializationError(f"Validation error: {e}")
 
+    # Special case: convert logsEndpoint and tracesEndpoint from strings to lists of strings, if present
+    if "telemetry" in data and "OTLPExporter" in data["telemetry"]:
+        if "logsEndpoint" in data["telemetry"]["OTLPExporter"]:
+            data["telemetry"]["OTLPExporter"]["logsEndpoint"] = [
+                data["telemetry"]["OTLPExporter"]["logsEndpoint"]
+            ]
+        if "tracesEndpoint" in data["telemetry"]["OTLPExporter"]:
+            data["telemetry"]["OTLPExporter"]["tracesEndpoint"] = [
+                data["telemetry"]["OTLPExporter"]["tracesEndpoint"]
+            ]
+
     data = cast(ConfigFile, data)
     if run_process_config:
         data = process_config(data=data, use_db_wizard=use_db_wizard, silent=silent)
@@ -494,10 +517,13 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
     # Telemetry config
     if "telemetry" not in provided_config or provided_config["telemetry"] is None:
         provided_config["telemetry"] = {
-            "OTLPExporter": {},
+            "OTLPExporter": {"tracesEndpoint": [], "logsEndpoint": []},
         }
     elif "OTLPExporter" not in provided_config["telemetry"]:
-        provided_config["telemetry"]["OTLPExporter"] = {}
+        provided_config["telemetry"]["OTLPExporter"] = {
+            "tracesEndpoint": [],
+            "logsEndpoint": [],
+        }
 
     # This is a super messy from a typing perspective.
     # Some of ConfigFile keys are optional -- but in practice they'll always be present in hosted environments
@@ -512,14 +538,15 @@ def overwrite_config(provided_config: ConfigFile) -> ConfigFile:
         telemetry = cast(Dict[str, Any], provided_config["telemetry"])
         otlp_exporter = cast(Dict[str, Any], telemetry["OTLPExporter"])
 
+        # Merge the logsEndpoint and tracesEndpoint lists from the file with what we have
         source_otlp = config_from_file["telemetry"]["OTLPExporter"]
         if source_otlp:
             tracesEndpoint = source_otlp.get("tracesEndpoint")
             if tracesEndpoint:
-                otlp_exporter["tracesEndpoint"] = tracesEndpoint
+                otlp_exporter["tracesEndpoint"].extend(tracesEndpoint)
             logsEndpoint = source_otlp.get("logsEndpoint")
             if logsEndpoint:
-                otlp_exporter["logsEndpoint"] = logsEndpoint
+                otlp_exporter["logsEndpoint"].extend(logsEndpoint)
 
     # Runtime config
     if "runtimeConfig" in provided_config:

dbos/_logger.py

@@ -56,10 +56,10 @@ def config_logger(config: "ConfigFile") -> None:
         dbos_logger.setLevel(log_level)
 
     # Log to the OTLP endpoint if provided
-    otlp_logs_endpoint = (
+    otlp_logs_endpoints = (
         config.get("telemetry", {}).get("OTLPExporter", {}).get("logsEndpoint")  # type: ignore
     )
-    if otlp_logs_endpoint:
+    if otlp_logs_endpoints:
         log_provider = PatchedOTLPLoggerProvider(
             Resource.create(
                 attributes={
@@ -68,12 +68,13 @@ def config_logger(config: "ConfigFile") -> None:
             )
         )
         set_logger_provider(log_provider)
-        log_provider.add_log_record_processor(
-            BatchLogRecordProcessor(
-                OTLPLogExporter(endpoint=otlp_logs_endpoint),
-                export_timeout_millis=5000,
+        for e in otlp_logs_endpoints:
+            log_provider.add_log_record_processor(
+                BatchLogRecordProcessor(
+                    OTLPLogExporter(endpoint=e),
+                    export_timeout_millis=5000,
+                )
             )
-        )
         global _otlp_handler
         _otlp_handler = LoggingHandler(logger_provider=log_provider)
 

dbos/_tracer.py

@@ -27,14 +27,13 @@ class DBOSTracer:
             if os.environ.get("DBOS__CONSOLE_TRACES", None) is not None:
                 processor = BatchSpanProcessor(ConsoleSpanExporter())
                 provider.add_span_processor(processor)
-            otlp_traces_endpoint = (
+            otlp_traces_endpoints = (
                 config.get("telemetry", {}).get("OTLPExporter", {}).get("tracesEndpoint")  # type: ignore
             )
-            if otlp_traces_endpoint:
-                processor = BatchSpanProcessor(
-                    OTLPSpanExporter(endpoint=otlp_traces_endpoint)
-                )
-                provider.add_span_processor(processor)
+            if otlp_traces_endpoints:
+                for e in otlp_traces_endpoints:
+                    processor = BatchSpanProcessor(OTLPSpanExporter(endpoint=e))
+                    provider.add_span_processor(processor)
             trace.set_tracer_provider(provider)
 
     def set_provider(self, provider: Optional[TracerProvider]) -> None:

{dbos-0.24.0a12.dist-info → dbos-0.24.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbos
-Version: 0.24.0a12
+Version: 0.24.0a14
 Summary: Ultra-lightweight durable execution in Python
 Author-Email: "DBOS, Inc." <contact@dbos.dev>
 License: MIT

{dbos-0.24.0a12.dist-info → dbos-0.24.0a14.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dbos-0.24.0a12.dist-info/METADATA,sha256=bbX82S62nJ9ZMnyppiRzrgMB_NuRFhigHkLeTK7aa_I,5522
-dbos-0.24.0a12.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-dbos-0.24.0a12.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
-dbos-0.24.0a12.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
+dbos-0.24.0a14.dist-info/METADATA,sha256=JByekcTcZ0mmvLBZ5rp8VuyTFFKpm2uHco9sc-2MrmU,5522
+dbos-0.24.0a14.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+dbos-0.24.0a14.dist-info/entry_points.txt,sha256=_QOQ3tVfEjtjBlr1jS4sHqHya9lI2aIEIWkz8dqYp14,58
+dbos-0.24.0a14.dist-info/licenses/LICENSE,sha256=VGZit_a5-kdw9WT6fY5jxAWVwGQzgLFyPWrcVVUhVNU,1067
 dbos/__init__.py,sha256=uq9LP5uY96kIS9N0yKqlvDwADmtg_Hl30uSUhyuUr-4,754
 dbos/__main__.py,sha256=P7jAr-7L9XE5mrsQ7i4b-bLr2ap1tCQfhMByLCRWDj0,568
 dbos/_admin_server.py,sha256=YiVn5lywz2Vg8_juyNHOYl0HVEy48--7b4phwK7r92o,5732
@@ -10,21 +10,21 @@ dbos/_classproperty.py,sha256=f0X-_BySzn3yFDRKB2JpCbLYQ9tLwt1XftfshvY7CBs,626
 dbos/_cloudutils/authentication.py,sha256=V0fCWQN9stCkhbuuxgPTGpvuQcDqfU3KAxPAh01vKW4,5007
 dbos/_cloudutils/cloudutils.py,sha256=YC7jGsIopT0KveLsqbRpQk2KlRBk-nIRC_UCgep4f3o,7797
 dbos/_cloudutils/databases.py,sha256=_shqaqSvhY4n2ScgQ8IP5PDZvzvcx3YBKV8fj-cxhSY,8543
-dbos/_conductor/conductor.py,sha256=5mFrE6yEAHWcFjkYr5p2AoPkV6iwYHxsB3K06yaOmqM,15112
-dbos/_conductor/protocol.py,sha256=W-BnX-bD5folo96NGrUytuCHW72H-OQwPrkJ9q5Au5c,5534
+dbos/_conductor/conductor.py,sha256=bKf6uGch7Ea3Qdken24AE-kxg_trdmwOngyDiHSInuU,15189
+dbos/_conductor/protocol.py,sha256=MWY3SuIeY6GN2Vg3wQjcxiT0d4zz4ccGzdEkmYYJ6t0,5633
 dbos/_context.py,sha256=Ue5qu3rzLfRmPkz-UUZi9ZS8iXpapRN0NTM4mbA2QmQ,17738
 dbos/_core.py,sha256=_a_rSkAWNLoHqzQbkqez0mpctkjDs301123ti3wmKHk,41340
 dbos/_croniter.py,sha256=XHAyUyibs_59sJQfSNWkP7rqQY6_XrlfuuCxk4jYqek,47559
 dbos/_db_wizard.py,sha256=YEW2qoy6hfHQv2fZ_4nHiPUeHMFofPpNTolJ1Kvw7AQ,8394
 dbos/_dbos.py,sha256=ymQnOZ8RQehcPVAjjJipoW8StxM7bktTyT_4a_Zlse8,43599
-dbos/_dbos_config.py,sha256=-DnOQ5gk3I8RPxNkL3GsAkaYvL8jv5umS8Xv5V7UQkw,20217
+dbos/_dbos_config.py,sha256=rWGy8mB7uLGRgkAybBEz-ogsJQYJpXY41cXNy5eITMs,21513
 dbos/_debug.py,sha256=mmgvLkqlrljMBBow9wk01PPur9kUf2rI_11dTJXY4gw,1822
 dbos/_error.py,sha256=B6Y9XLS1f6yrawxB2uAEYFMxFwk9BHhdxPNddKco-Fw,5399
 dbos/_fastapi.py,sha256=ke03vqsSYDnO6XeOtOVFXj0-f-v1MGsOxa9McaROvNc,3616
 dbos/_flask.py,sha256=DZKUZR5-xOzPI7tYZ53r2PvvHVoAb8SYwLzMVFsVfjI,2608
 dbos/_kafka.py,sha256=o6DbwnsYRDtvVTZVsN7BAK8cdP79AfoWX3Q7CGY2Yuo,4199
 dbos/_kafka_message.py,sha256=NYvOXNG3Qn7bghn1pv3fg4Pbs86ILZGcK4IB-MLUNu0,409
-dbos/_logger.py,sha256=utroNAXW71MLYb5D3lsM5xifXT19n5mAidyW-4kwyMA,3499
+dbos/_logger.py,sha256=pSP-CyzHUR6ypousTaeKe2zYMKSqvrbsFru8HJpBHsA,3546
 dbos/_migrations/env.py,sha256=38SIGVbmn_VV2x2u1aHLcPOoWgZ84eCymf3g_NljmbU,1626
 dbos/_migrations/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 dbos/_migrations/versions/04ca4f231047_workflow_queues_executor_id.py,sha256=ICLPl8CN9tQXMsLDsAj8z1TsL831-Z3F8jSBvrR-wyw,736
@@ -56,7 +56,7 @@ dbos/_templates/dbos-db-starter/migrations/env.py.dbos,sha256=GUV6sjkDzf9Vl6wkGE
 dbos/_templates/dbos-db-starter/migrations/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 dbos/_templates/dbos-db-starter/migrations/versions/2024_07_31_180642_init.py,sha256=MpS7LGaJS0CpvsjhfDkp9EJqvMvVCjRPfUp4c0aE2ys,941
 dbos/_templates/dbos-db-starter/start_postgres_docker.py,sha256=lQVLlYO5YkhGPEgPqwGc7Y8uDKse9HsWv5fynJEFJHM,1681
-dbos/_tracer.py,sha256=_Id9j9kCrptSNpEpLiRk_g5VPp-DrTWP1WNZInd5BA4,2439
+dbos/_tracer.py,sha256=dFDSFlta-rfA3-ahIRLYwnnoAOmlavdxAGllqwFgnCA,2440
 dbos/_utils.py,sha256=wjOJzxN66IzL9p4dwcEmQACRQah_V09G6mJI2exQfOM,155
 dbos/_workflow_commands.py,sha256=CEzR5XghoZscbc2RHb9G-7Eoo4MMuzfeTo-QBZu4VPY,4690
 dbos/cli/_github_init.py,sha256=Y_bDF9gfO2jB1id4FV5h1oIxEJRWyqVjhb7bNEa5nQ0,3224
@@ -65,4 +65,4 @@ dbos/cli/cli.py,sha256=pet2vf4GLlSDfxfQbsplM9uewD6pJK2ZpLgZlwgBU5w,15627
 dbos/dbos-config.schema.json,sha256=HtF_njVTGHLdzBGZ4OrGQz3qbPPT0Go-iwd1PgFVTNg,5847
 dbos/py.typed,sha256=QfzXT1Ktfk3Rj84akygc7_42z0lRpCq0Ilh8OXI6Zas,44
 version/__init__.py,sha256=L4sNxecRuqdtSFdpUGX3TtBi9KL3k7YsZVIvv-fv9-A,1678
-dbos-0.24.0a12.dist-info/RECORD,,
+dbos-0.24.0a14.dist-info/RECORD,,