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

Filter agent app-insights logs based on log::max_level (#125)

Browse Source
This commit is contained in:
bmc-msft
2020-10-09 13:52:14 -04:00
committed by GitHub
parent f43c44e55c
commit 69832f727c
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/agent/onefuzz-agent/src/tasks/fuzz/supervisor.rs
View File

@ -9,7 +9,6 @@ use crate::tasks::{
utils::{self, CheckNotify}, utils::{self, CheckNotify},
}; };
use anyhow::{Error, Result}; use anyhow::{Error, Result};
use appinsights::telemetry::SeverityLevel;
use onefuzz::{ use onefuzz::{
expand::Expand, expand::Expand,
fs::{has_files, set_executable, OwnedDir}, fs::{has_files, set_executable, OwnedDir},

35
src/agent/onefuzz/src/telemetry.rs
View File

@ -341,25 +341,26 @@ macro_rules! event {
#[macro_export] #[macro_export]
macro_rules! log { macro_rules! log {
($level: expr, $msg: expr) => {{ ($level: expr, $msg: expr) => {{
use appinsights::telemetry::SeverityLevel; use appinsights::telemetry::SeverityLevel::{
use SeverityLevel::*; Critical, Error, Information, Verbose, Warning,
};
{ let log_level = match $level {
let log_level = match $level { Verbose => log::Level::Debug,
SeverityLevel::Verbose => log::Level::Debug, Information => log::Level::Info,
SeverityLevel::Information => log::Level::Info, Warning => log::Level::Warn,
SeverityLevel::Warning => log::Level::Warn, Error => log::Level::Error,
SeverityLevel::Error => log::Level::Error, Critical => log::Level::Error,
SeverityLevel::Critical => log::Level::Error, };
};
let log_msg = $msg.to_string(); // while log::log will filter based on log level, the telemetry
// client does *not*.
log::log!(log_level, "{}", log_msg) if log_level <= log::max_level() {
} log::log!(log_level, "{}", $msg.to_string());
if let Some(client) = $crate::telemetry::client($crate::telemetry::ClientType::Instance)
if let Some(client) = $crate::telemetry::client($crate::telemetry::ClientType::Instance) { {
client.track_trace($msg, $level); client.track_trace($msg, $level);
}
} }
}}; }};
} }

1
src/runtime-tools/win64/onefuzz.ps1
View File

@ -5,6 +5,7 @@ $env:Path += ";C:\Program Files (x86)\Windows Kits\10\Debuggers\x64\;C:\onefuzz\
$env:ONEFUZZ_ROOT = "C:\onefuzz" $env:ONEFUZZ_ROOT = "C:\onefuzz"
$env:ONEFUZZ_TOOLS = "C:\onefuzz\tools" $env:ONEFUZZ_TOOLS = "C:\onefuzz\tools"
$env:ASAN_SYMBOLIZER_PATH = "llvm-symbolizer" $env:ASAN_SYMBOLIZER_PATH = "llvm-symbolizer"
$env:RUST_LOG = "info"
$logFile = "C:\onefuzz.log" $logFile = "C:\onefuzz.log"
function log ($message) { function log ($message) {