ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-18 04:38:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

add roles to agent & supervisor (#527)

Browse Source
This commit is contained in:
bmc-msft
2021-02-10 15:56:22 -05:00
committed by GitHub
parent b488811cfa
commit f8046934e9
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/agent/onefuzz-agent/src/tasks/config.rs
View File

@ -5,7 +5,7 @@
use crate::tasks::{analysis, coverage, fuzz, heartbeat::*, merge, report};
use anyhow::Result;
use onefuzz::machine_id::{get_machine_id, get_scaleset_name};
use onefuzz_telemetry::{self as telemetry, Event::task_start, EventData};
use onefuzz_telemetry::{self as telemetry, Event::task_start, EventData, Role};
use reqwest::Url;
use serde::{self, Deserialize};
use std::path::PathBuf;
@ -151,6 +151,7 @@ impl Config {
telemetry::set_property(EventData::MachineId(get_machine_id().await?));
telemetry::set_property(EventData::Version(env!("ONEFUZZ_VERSION").to_string()));
telemetry::set_property(EventData::InstanceId(self.common().instance_id));
telemetry::set_property(EventData::Role(Role::Agent));
let scaleset = get_scaleset_name().await?;
if let Some(scaleset_name) = &scaleset {
telemetry::set_property(EventData::ScalesetId(scaleset_name.to_string()));

3
src/agent/onefuzz-supervisor/src/main.rs
View File

@ -26,7 +26,7 @@ use onefuzz::{
machine_id::{get_machine_id, get_scaleset_name},
process::ExitStatus,
};
use onefuzz_telemetry::{self as telemetry, EventData};
use onefuzz_telemetry::{self as telemetry, EventData, Role};
use structopt::StructOpt;
pub mod agent;
@ -171,6 +171,7 @@ async fn run_agent(config: StaticConfig) -> Result<()> {
telemetry::set_property(EventData::InstanceId(config.instance_id));
telemetry::set_property(EventData::MachineId(get_machine_id().await?));
telemetry::set_property(EventData::Version(env!("ONEFUZZ_VERSION").to_string()));
telemetry::set_property(EventData::Role(Role::Supervisor));
let scaleset = get_scaleset_name().await?;
if let Some(scaleset_name) = &scaleset {
telemetry::set_property(EventData::ScalesetId(scaleset_name.to_string()));

4
src/agent/onefuzz-telemetry/src/lib.rs
View File

@ -14,13 +14,17 @@ pub enum ClientType {
#[derive(Clone, Debug, PartialEq)]
pub enum Role {
Agent,
Proxy,
Supervisor,
}
impl Role {
pub fn as_str(&self) -> &'static str {
match self {
Self::Agent => "agent",
Self::Proxy => "proxy",
Self::Supervisor => "supervisor",
}
}
}