dbos 0.26.0a24__tar.gz → 0.27.0a1__tar.gz

{dbos-0.26.0a24 → dbos-0.27.0a1}/PKG-INFO

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

{dbos-0.26.0a24 → dbos-0.27.0a1}/dbos/_dbos.py

@@ -65,7 +65,7 @@ from ._registrations import (
 from ._roles import default_required_roles, required_roles
 from ._scheduler import ScheduledWorkflow, scheduled
 from ._sys_db import StepInfo, WorkflowStatus, reset_system_database
-from ._tracer import dbos_tracer
+from ._tracer import DBOSTracer, dbos_tracer
 
 if TYPE_CHECKING:
     from fastapi import FastAPI
@@ -1166,6 +1166,11 @@ class DBOS:
         ctx.authenticated_user = authenticated_user
         ctx.authenticated_roles = authenticated_roles
 
+    @classproperty
+    def tracer(self) -> DBOSTracer:
+        """Return the DBOS OpenTelemetry tracer."""
+        return dbos_tracer
+
 
 class WorkflowHandle(Generic[R], Protocol):
     """

{dbos-0.26.0a24 → dbos-0.27.0a1}/dbos/_dbos_config.py

@@ -1,4 +1,3 @@
-import inspect
 import json
 import os
 import re
@@ -311,17 +310,6 @@ def load_config(
 
     """
 
-    # Get the current call stack
-    frame_records = inspect.stack()
-    called_from_cli = False
-    for frame_record in frame_records:
-        if "dbos/cli/cli.py" in frame_record.filename:
-            called_from_cli = True
-    if not called_from_cli and not silent:
-        dbos_logger.warning(
-            "This function is deprecated and will be removed in a future version. Use `DBOS.config` instead."
-        )
-
     with open(config_file_path, "r") as file:
         content = file.read()
         substituted_content = _substitute_env_vars(content, silent=silent)

{dbos-0.26.0a24 → dbos-0.27.0a1}/dbos/_tracer.py

@@ -3,8 +3,10 @@ from typing import TYPE_CHECKING, Optional
 
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, ConsoleSpanExporter
+from opentelemetry.semconv.resource import ResourceAttributes
 from opentelemetry.trace import Span
 
 from dbos._utils import GlobalParams
@@ -23,7 +25,13 @@ class DBOSTracer:
 
     def config(self, config: ConfigFile) -> None:
         if not isinstance(trace.get_tracer_provider(), TracerProvider):
-            provider = TracerProvider()
+            resource = Resource(
+                attributes={
+                    ResourceAttributes.SERVICE_NAME: config["name"],
+                }
+            )
+
+            provider = TracerProvider(resource=resource)
             if os.environ.get("DBOS__CONSOLE_TRACES", None) is not None:
                 processor = BatchSpanProcessor(ConsoleSpanExporter())
                 provider.add_span_processor(processor)

{dbos-0.26.0a24 → dbos-0.27.0a1}/pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
 ]
 requires-python = ">=3.9"
 readme = "README.md"
-version = "0.26.0a24"
+version = "0.27.0a1"
 
 [project.license]
 text = "MIT"

{dbos-0.26.0a24 → dbos-0.27.0a1}/tests/test_spans.py

@@ -17,6 +17,10 @@ def test_spans(dbos: DBOS) -> None:
     @DBOS.workflow()
     def test_workflow() -> None:
         test_step()
+        current_span = DBOS.span
+        subspan = DBOS.tracer.start_span({"name": "a new span"}, parent=current_span)
+        subspan.add_event("greeting_event", {"name": "a new event"})
+        DBOS.tracer.end_span(subspan)
 
     @DBOS.step()
     def test_step() -> None:
@@ -33,20 +37,23 @@ def test_spans(dbos: DBOS) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 3
+    assert len(spans) == 4
 
     for span in spans:
         assert span.attributes is not None
         assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
 
     assert spans[0].name == test_step.__name__
-    assert spans[1].name == test_workflow.__name__
-    assert spans[2].name == test_step.__name__
+    assert spans[1].name == 'a new span'
+    assert spans[2].name == test_workflow.__name__
+    assert spans[3].name == test_step.__name__
 
-    assert spans[0].parent.span_id == spans[1].context.span_id  # type: ignore
-    assert spans[1].parent == None
+    assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
+    assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
+    assert spans[3].parent == None
 
 
 @pytest.mark.asyncio
@@ -55,6 +62,10 @@ async def test_spans_async(dbos: DBOS) -> None:
     @DBOS.workflow()
     async def test_workflow() -> None:
         await test_step()
+        current_span = DBOS.span
+        subspan = DBOS.tracer.start_span({"name": "a new span"}, parent=current_span)
+        subspan.add_event("greeting_event", {"name": "a new event"})
+        DBOS.tracer.end_span(subspan)
 
     @DBOS.step()
     async def test_step() -> None:
@@ -71,20 +82,23 @@ async def test_spans_async(dbos: DBOS) -> None:
 
     spans = exporter.get_finished_spans()
 
-    assert len(spans) == 3
+    assert len(spans) == 4
 
     for span in spans:
         assert span.attributes is not None
         assert span.attributes["applicationVersion"] == GlobalParams.app_version
+        assert span.attributes["executorID"] == GlobalParams.executor_id
         assert span.context is not None
 
     assert spans[0].name == test_step.__name__
-    assert spans[1].name == test_workflow.__name__
-    assert spans[2].name == test_step.__name__
+    assert spans[1].name == 'a new span'
+    assert spans[2].name == test_workflow.__name__
+    assert spans[3].name == test_step.__name__
 
-    assert spans[0].parent.span_id == spans[1].context.span_id  # type: ignore
-    assert spans[1].parent == None
+    assert spans[0].parent.span_id == spans[2].context.span_id  # type: ignore
+    assert spans[1].parent.span_id == spans[2].context.span_id  # type: ignore
     assert spans[2].parent == None
+    assert spans[3].parent == None
 
 
 def test_temp_wf_fastapi(dbos_fastapi: Tuple[DBOS, FastAPI]) -> None: