PR Feedback

Author: andystaples

durabletask/internal/tracing.py

@@ -269,8 +269,7 @@ def start_orchestration_span(
     # capture "now" so the value can be fed back to the sidecar.
     start_time_ns: Optional[int] = None
     if orchestration_trace_context is not None and orchestration_trace_context.HasField("spanStartTime"):
-        start_dt = orchestration_trace_context.spanStartTime.ToDatetime()
-        start_time_ns = int(start_dt.timestamp() * 1e9)
+        start_time_ns = orchestration_trace_context.spanStartTime.ToNanoseconds()
     else:
         start_time_ns = time.time_ns()
 
@@ -318,7 +317,8 @@ def detach_orchestration_tokens(tokens: Any) -> None:
     if tokens is None:
         return
     parent_token, span_token = tokens
-    otel_context.detach(span_token)
+    if span_token is not None:
+        otel_context.detach(span_token)
     if parent_token is not None:
         otel_context.detach(parent_token)
 
@@ -567,10 +567,7 @@ def build_orchestration_trace_context(
 
     if start_time_ns is not None:
         ts = timestamp_pb2.Timestamp()
-        seconds = int(start_time_ns // 1e9)
-        nanos = int(start_time_ns % 1e9)
-        ts.seconds = seconds
-        ts.nanos = nanos
+        ts.FromNanoseconds(start_time_ns)
         ctx.spanStartTime.CopyFrom(ts)
 
     return ctx

durabletask/worker.py

@@ -718,7 +718,8 @@ def _execute_orchestrator(
             else:
                 # Intermediate dispatch — keep the span alive for later,
                 # but detach context tokens for this call.
-                self._orchestration_spans[instance_id] = (span, orch_trace_ctx)
+                if span is not None:
+                    self._orchestration_spans[instance_id] = (span, orch_trace_ctx)
                 tracing.detach_orchestration_tokens(tokens)
 
             res = pb.OrchestratorResponse(

pyproject.toml

@@ -33,7 +33,8 @@ dependencies = [
 
 [project.optional-dependencies]
 opentelemetry = [
-    "opentelemetry-api>=1.0.0"
+    "opentelemetry-api>=1.0.0",
+    "opentelemetry-sdk>=1.0.0"
 ]
 
 [project.urls]

tests/durabletask/test_tracing.py

@@ -1315,13 +1315,14 @@ def orchestrator(ctx: task.OrchestrationContext, _):
         assert ptc.traceParent != ""
 
         # Dispatch 2: activity completes
+        activity_name = task.get_name(dummy_activity)
         w._execute_orchestrator(pb.OrchestratorRequest(
             instanceId=TEST_INSTANCE_ID,
             pastEvents=[
                 helpers.new_orchestrator_started_event(schedule_time),
                 helpers.new_execution_started_event(
                     name, TEST_INSTANCE_ID, encoded_input=None),
-                helpers.new_task_scheduled_event(1, name),
+                helpers.new_task_scheduled_event(1, activity_name),
             ],
             newEvents=[
                 helpers.new_orchestrator_started_event(complete_time),