Skip to content

💥 feat(sdk): enforce some activity to close timeout is set #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chris-olszewski merged 6 commits into from
Apr 20, 2026
Merged

💥 feat(sdk): enforce some activity to close timeout is set #1221

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c43f3fc
chore(sdk): move to activity options builder
chris-olszewski Apr 16, 2026
df70207
feat(sdk): prevent no timeouts for activites
chris-olszewski Apr 17, 2026
d778542
remove useless tests
chris-olszewski Apr 17, 2026
f7d4476
fixup doc comments
chris-olszewski Apr 17, 2026
1891c4b
use custom builders everywhere
chris-olszewski Apr 17, 2026
979ad37
fix: include http client when otel enabled
chris-olszewski Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions crates/sdk-core/tests/common/workflows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ impl LaProblemWorkflow {
ctx.start_activity(
StdActivities::delay,
Duration::from_secs(15),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(20)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(20)),
)
.await
.map_err(|e| anyhow::anyhow!("{e}"))?;
Expand Down
40 changes: 16 additions & 24 deletions crates/sdk-core/tests/heavy_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ use temporalio_common::{
worker::WorkerTaskTypes,
};
use temporalio_sdk::{
ActivityOptions, SyncWorkflowContext, WorkflowContext, WorkflowResult,
ActivityCloseTimeouts, ActivityOptions, SyncWorkflowContext, WorkflowContext, WorkflowResult,
activities::{ActivityContext, ActivityError},
workflows,
};
Expand All @@ -60,16 +60,16 @@ impl ActivityLoadWf {
.start_activity(
StdActivities::echo,
input_str.clone(),
ActivityOptions {
activity_id: Some("act-1".to_string()),
task_queue: Some(tq),
schedule_to_start_timeout: Some(Duration::from_secs(8)),
start_to_close_timeout: Some(Duration::from_secs(8)),
schedule_to_close_timeout: Some(Duration::from_secs(8)),
heartbeat_timeout: Some(Duration::from_secs(8)),
cancellation_type: ActivityCancellationType::TryCancel,
..Default::default()
},
ActivityOptions::with_close_timeouts(ActivityCloseTimeouts::Both {
start_to_close: Duration::from_secs(8),
schedule_to_close: Duration::from_secs(8),
})
.activity_id("act-1".to_string())
.task_queue(tq)
.schedule_to_start_timeout(Duration::from_secs(8))
.heartbeat_timeout(Duration::from_secs(8))
.cancellation_type(ActivityCancellationType::TryCancel)
.build(),
)
.await?;
assert_eq!(res, input_str);
Expand Down Expand Up @@ -129,11 +129,9 @@ impl ChunkyActivityWf {
.start_activity(
ChunkyActivities::chunky_echo,
input_str.clone(),
ActivityOptions {
activity_id: Some("act-1".to_string()),
start_to_close_timeout: Some(Duration::from_secs(30)),
..Default::default()
},
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(30))
.activity_id("act-1".to_string())
.build(),
)
.await?;
assert_eq!(res, input_str);
Expand Down Expand Up @@ -222,10 +220,7 @@ impl WorkflowLoadWf {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
ctx.timer(Duration::from_secs(1)).await;
Expand Down Expand Up @@ -439,10 +434,7 @@ impl PollerLoadWf {
.start_activity(
JitteryActivities::jittery_echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
}
Expand Down
5 changes: 1 addition & 4 deletions crates/sdk-core/tests/heavy_tests/fuzzy_workflow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,7 @@ impl FuzzyWf {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
}
Expand Down
12 changes: 5 additions & 7 deletions crates/sdk-core/tests/integ_tests/async_activity_client_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,13 @@ async fn async_activity_completions(
let activity_future = ctx.start_activity(
AsyncActivities::complete_async_activity,
expected_outcome,
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(30)),
retry_policy: Some(RetryPolicy {
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(30))
.retry_policy(RetryPolicy {
maximum_attempts: 1,
..Default::default()
}),
cancellation_type: ActivityCancellationType::WaitCancellationCompleted,
..Default::default()
},
})
.cancellation_type(ActivityCancellationType::WaitCancellationCompleted)
.build(),
);

// For cancellation, wait a bit to let the activity start, then request cancel
Expand Down
10 changes: 2 additions & 8 deletions crates/sdk-core/tests/integ_tests/data_converter_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ impl DataConverterTestWorkflow {
.start_activity(
TestActivities::process_tracked,
input,
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await
.map_err(|e| anyhow::anyhow!("{e}"))?;
Expand All @@ -132,10 +129,7 @@ impl DescribeDataConverterWorkflow {
.start_activity(
TestActivities::process_tracked,
input,
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await
.map_err(|e| anyhow::anyhow!("{e}"))?;
Expand Down
12 changes: 5 additions & 7 deletions crates/sdk-core/tests/integ_tests/heartbeat_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,13 @@ impl ActivityDoesntHeartbeatHitsTimeoutThenCompletesWf {
.start_activity(
StdActivities::delay,
Duration::from_secs(4),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(10)),
heartbeat_timeout: Some(Duration::from_secs(2)),
retry_policy: Some(RetryPolicy {
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(10))
.heartbeat_timeout(Duration::from_secs(2))
.retry_policy(RetryPolicy {
maximum_attempts: 1,
..Default::default()
}),
..Default::default()
},
})
.build(),
)
.await;
let err = res.unwrap_err();
Expand Down
15 changes: 5 additions & 10 deletions crates/sdk-core/tests/integ_tests/metrics_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,22 +857,17 @@ async fn activity_metrics() {
let normal_act_pass = ctx.start_activity(
PassFailActivities::pass_fail_act,
"pass".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(1)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(1)),
);
let normal_act_fail = ctx.start_activity(
PassFailActivities::pass_fail_act,
"fail".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(1)),
retry_policy: Some(RetryPolicy {
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(1))
.retry_policy(RetryPolicy {
maximum_attempts: 1,
..Default::default()
}),
..Default::default()
},
})
.build(),
);
let _ = join!(normal_act_pass, normal_act_fail);
let local_act_pass = ctx.start_local_activity(
Expand Down
5 changes: 1 addition & 4 deletions crates/sdk-core/tests/integ_tests/polling_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,7 @@ impl OnlyOneWorkflowSlotAndTwoPollers {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
}
Expand Down
20 changes: 4 additions & 16 deletions crates/sdk-core/tests/integ_tests/update_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1119,10 +1119,7 @@ async fn worker_restarted_in_middle_of_update() {
ctx.start_activity(
BlockingActivities::blocks,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(2)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(2)),
)
.await?;
Ok(())
Expand Down Expand Up @@ -1223,10 +1220,7 @@ async fn update_after_empty_wft() {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(2)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(2)),
)
.await;
ACT_STARTED.store(false, Ordering::Release);
Expand All @@ -1251,10 +1245,7 @@ async fn update_after_empty_wft() {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(2)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(2)),
)
.await;
}
Expand Down Expand Up @@ -1324,10 +1315,7 @@ async fn update_lost_on_activity_mismatch() {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(2)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(2)),
)
.await;
ctx.state_mut(|s| s.can_run -= 1);
Expand Down
35 changes: 9 additions & 26 deletions crates/sdk-core/tests/integ_tests/worker_heartbeat_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,7 @@ async fn docker_worker_heartbeat_basic(#[values("otel", "prom", "no_metrics")] b
.start_activity(
NotifyActivities::pass_fail_act,
"pass".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
Ok(())
Expand Down Expand Up @@ -356,10 +353,7 @@ async fn docker_worker_heartbeat_tuner() {
.start_activity(
StdActivities::echo,
"pass".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(1)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(1)),
)
.await;
Ok(())
Expand Down Expand Up @@ -661,10 +655,7 @@ async fn worker_heartbeat_sticky_cache_miss() {
.start_activity(
StickyCacheActivities::sticky_cache_history_act,
wf_marker.clone(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;

Expand Down Expand Up @@ -905,16 +896,14 @@ async fn worker_heartbeat_failure_metrics() {
.start_activity(
FailingActivities::failing_act,
"boom".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
retry_policy: Some(RetryPolicy {
ActivityOptions::with_start_to_close_timeout(Duration::from_secs(5))
.retry_policy(RetryPolicy {
initial_interval: Some(prost_dur!(from_millis(10))),
backoff_coefficient: 1.0,
maximum_attempts: 4,
..Default::default()
}),
..Default::default()
},
})
.build(),
)
.await;

Expand Down Expand Up @@ -1048,10 +1037,7 @@ async fn worker_heartbeat_no_runtime_heartbeat() {
.start_activity(
StdActivities::echo,
"pass".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(1)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(1)),
)
.await;
Ok(())
Expand Down Expand Up @@ -1121,10 +1107,7 @@ async fn worker_heartbeat_skip_client_worker_set_check() {
.start_activity(
StdActivities::echo,
"pass".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(1)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(1)),
)
.await;
Ok(())
Expand Down
25 changes: 15 additions & 10 deletions crates/sdk-core/tests/integ_tests/worker_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,12 +414,20 @@ async fn activity_tasks_from_completion_reserve_slots() {
impl ActivityTasksCompletionWf {
#[run(name = DEFAULT_WORKFLOW_TYPE)]
async fn run(ctx: &mut WorkflowContext<Self>) -> WorkflowResult<()> {
ctx.start_activity(FakeAct::act1, (), ActivityOptions::default())
.await
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
ctx.start_activity(FakeAct::act2, (), ActivityOptions::default())
.await
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
ctx.start_activity(
FakeAct::act1,
(),
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
ctx.start_activity(
FakeAct::act2,
(),
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await
.map_err(|e| WorkflowTermination::from(anyhow::Error::from(e)))?;
ctx.state(|wf| wf.complete_token.cancel());
Ok(())
}
Expand Down Expand Up @@ -782,10 +790,7 @@ async fn test_custom_slot_supplier_simple() {
.start_activity(
StdActivities::no_op,
(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(10)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(10)),
)
.await;
let _result = ctx
Expand Down
5 changes: 1 addition & 4 deletions crates/sdk-core/tests/integ_tests/worker_versioning_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,7 @@ impl ActivityHasDeploymentStampWf {
.start_activity(
StdActivities::echo,
"hi!".to_string(),
ActivityOptions {
start_to_close_timeout: Some(Duration::from_secs(5)),
..Default::default()
},
ActivityOptions::start_to_close_timeout(Duration::from_secs(5)),
)
.await;
Ok(())
Expand Down
Loading
Loading