Skip to content

Commit 767228b

Browse files
committed
Revert changes to client as they are unecessary. Inject otel headers into both operation inputs in otel interceptor
1 parent a4b69d8 commit 767228b

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

temporalio/client.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,6 @@ def on_start_error(
12081208
start_workflow_input=start_workflow_operation._start_workflow_input,
12091209
update_workflow_input=update_input,
12101210
_on_start=on_start,
1211-
headers={},
12121211
_on_start_error=on_start_error,
12131212
)
12141213

@@ -5539,7 +5538,6 @@ class StartWorkflowUpdateWithStartInput:
55395538
[temporalio.api.workflowservice.v1.StartWorkflowExecutionResponse], None
55405539
]
55415540
_on_start_error: Callable[[BaseException], None]
5542-
headers: Mapping[str, temporalio.api.common.v1.Payload]
55435541

55445542

55455543
@dataclass
@@ -6363,10 +6361,6 @@ def on_start(
63636361

63646362
err: Optional[BaseException] = None
63656363

6366-
# fan headers out to both operations
6367-
input.start_workflow_input.headers = input.headers
6368-
input.update_workflow_input.headers = input.headers
6369-
63706364
try:
63716365
return await self._start_workflow_update_with_start(
63726366
input.start_workflow_input, input.update_workflow_input, on_start

temporalio/contrib/opentelemetry.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,14 @@ async def start_update_with_start_workflow(
304304
with self.root._start_as_current_span(
305305
f"StartUpdateWithStartWorkflow:{input.start_workflow_input.workflow}",
306306
attributes=attrs,
307-
input=input,
307+
input=input.start_workflow_input,
308308
kind=opentelemetry.trace.SpanKind.CLIENT,
309309
):
310+
if input.update_workflow_input:
311+
input.update_workflow_input.headers = self.root._context_to_headers(
312+
input.update_workflow_input.headers
313+
)
314+
310315
return await super().start_update_with_start_workflow(input)
311316

312317

0 commit comments

Comments
 (0)