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

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

View File

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

View File

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

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_TOOLS = "C:\onefuzz\tools"
$env:ASAN_SYMBOLIZER_PATH = "llvm-symbolizer"
$env:RUST_LOG = "info"
$logFile = "C:\onefuzz.log"
function log ($message) {