Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Updating Task Heartbeat Struct to actually include job_id #646

Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
293dd06
Updating yml file to run config endpoint command with tenant/authorit…
nharper285 Nov 23, 2020
cbf9dd3
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
deb6c5d
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
5a7d9bb
Merge branch 'main' into main
bmc-msft Nov 30, 2020
daddaa1
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
4fa2486
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
d84ac5d
Merge branch 'main' of https://github.com/nharper285/onefuzz into main
nharper285 Jan 26, 2021
4273a01
Merge remote-tracking branch 'upstream/main' into main
nharper285 Feb 24, 2021
4bf731e
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
5771fc9
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
7dab9e5
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
63b966b
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
7aa20a3
Merge branch 'main' of https://github.com/nharper285/onefuzz
nharper285 Mar 4, 2021
23bd81a
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
0cbfc50
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
7dbb77f
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
e0916ed
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
3dca8ca
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
b4f22aa
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
c603b1b
Adding -DD parameter to unzip command. Forces file replacement irresp…
nharper285 Nov 25, 2020
359c96c
Revert "Adding -DD parameter to unzip command. Forces file replacemen…
nharper285 Nov 25, 2020
b447bb2
Merge branch 'main' of https://github.com/nharper285/onefuzz
nharper285 Mar 8, 2021
77fd7d5
Fixing task heartbeat update to actually include in heartbeat struct
nharper285 Mar 8, 2021
400f7fe
Including job_id into queueing heartbeat functionality
nharper285 Mar 9, 2021
d998e8e
Updating context in heartbeat.rs to include job_id
nharper285 Mar 9, 2021
a424c74
Merge branch 'main' into user/noharper/fix-heartbeat-task-update
bmc-msft Mar 9, 2021
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
3 changes: 3 additions & 0 deletions src/agent/onefuzz-agent/src/tasks/heartbeat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pub enum HeartbeatData {
#[derive(Debug, Deserialize, Serialize, Clone)]
struct Heartbeat {
task_id: Uuid,
job_id: Uuid,
machine_id: Uuid,
machine_name: String,
data: Vec<HeartbeatData>,
Expand Down Expand Up @@ -53,13 +54,15 @@ pub async fn init_task_heartbeat(
let task_id = context.state.task_id;
let machine_id = context.state.machine_id;
let machine_name = context.state.machine_name.clone();
let job_id = context.state.job_id;

let data = HeartbeatClient::<TaskContext, _>::drain_current_messages(context.clone());
let _ = context
.queue_client
.enqueue(Heartbeat {
task_id,
data,
job_id,
machine_id,
machine_name,
})
Expand Down