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

address telemetry log message locality (#736)

Browse Source
This commit is contained in:
bmc-msft
2021-03-26 18:45:36 -04:00
committed by GitHub
parent 5c149413a5
commit dc9b6fa1b0
4 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -492,23 +492,22 @@ pub fn set_property(entry: EventData) {
}
}
fn local_log_event(event: &Event, properties: &[EventData]) {
let as_values = properties
pub fn format_events(events: &[EventData]) -> String {
events
.iter()
.map(|x| x.as_values())
.map(|(x, y)| format!("{}:{}", x, y))
.collect::<Vec<String>>()
.join(" ");
log::log!(log::Level::Info, "{} {}", event.as_str(), as_values);
.join(" ")
}
pub fn track_event(event: Event, properties: Vec<EventData>) {
pub fn track_event(event: &Event, properties: &[EventData]) {
use appinsights::telemetry::Telemetry;
if let Some(client) = client(ClientType::Instance) {
let mut evt = appinsights::telemetry::EventTelemetry::new(event.as_str());
let props = evt.properties_mut();
for property in &properties {
for property in properties {
let (name, val) = property.as_values();
props.insert(name.to_string(), val);
}
@ -519,7 +518,7 @@ pub fn track_event(event: Event, properties: Vec<EventData>) {
let mut evt = appinsights::telemetry::EventTelemetry::new(event.as_str());
let props = evt.properties_mut();
for property in &properties {
for property in properties {
if property.can_share_with_microsoft() {
let (name, val) = property.as_values();
props.insert(name.to_string(), val);
@ -527,7 +526,6 @@ pub fn track_event(event: Event, properties: Vec<EventData>) {
}
client.track(evt);
}
local_log_event(&event, &properties);
}
pub fn to_log_level(level: &appinsights::telemetry::SeverityLevel) -> log::Level {
@ -540,18 +538,24 @@ pub fn to_log_level(level: &appinsights::telemetry::SeverityLevel) -> log::Level
}
}
pub fn should_log(level: &appinsights::telemetry::SeverityLevel) -> bool {
to_log_level(level) <= log::max_level()
}
pub fn log_message(level: appinsights::telemetry::SeverityLevel, msg: String) {
let log_level = to_log_level(&level);
log::log!(log_level, "{}", msg);
if let Some(client) = client(ClientType::Instance) {
client.track_trace(msg, level);
}
}
#[macro_export]
macro_rules! log_events {
($name: expr; $events: expr) => {{
onefuzz_telemetry::track_event(&$name, &$events);
log::info!(
"{} {}",
$name.as_str(),
onefuzz_telemetry::format_events(&$events)
);
}};
}
#[macro_export]
macro_rules! event {
($name: expr ; $($k: path = $v: expr),*) => {{
@ -562,15 +566,17 @@ macro_rules! event {
})*;
onefuzz_telemetry::track_event($name, events);
log_events!($name; events);
}};
}
#[macro_export]
macro_rules! log {
($level: expr, $($arg: tt)+) => {{
if onefuzz_telemetry::should_log(&$level) {
let log_level = onefuzz_telemetry::to_log_level(&$level);
if log_level <= log::max_level() {
let msg = format!("{}", format_args!($($arg)+));
log::log!(log_level, "{}", msg);
onefuzz_telemetry::log_message($level, msg.to_string());
}
}};