Creating CustomMetrics for Rust CustomEvents

src/agent/onefuzz-task/src/tasks/config.rs

@@ -228,12 +228,15 @@ impl Config {
         match self {
             Config::GenericGenerator(c) => {
                 event!(task_start; EventData::Type = event_type, EventData::ToolName = c.generator_exe.clone());
+                metric!(task_start; 1.0; EventData::Type = event_type, EventData::ToolName = c.generator_exe.clone());
             }
             Config::GenericAnalysis(c) => {
                 event!(task_start; EventData::Type = event_type, EventData::ToolName = c.analyzer_exe.clone());
+                metric!(task_start; 1.0; EventData::Type = event_type, EventData::ToolName = c.analyzer_exe.clone());
             }
             _ => {
                 event!(task_start; EventData::Type = event_type);
+                metric!(task_start; 1.0; EventData::Type = event_type);
             }
         }
     }

src/agent/onefuzz-task/src/tasks/coverage/generic.rs

@@ -376,6 +376,7 @@ impl<'a> TaskContext<'a> {
                     if entry.file_type().await?.is_file() {
                         if let Err(e) = self.record_input(&entry.path()).await {
                             event!(coverage_failed; EventData::Path = entry.path().display().to_string());
+                            metric!(coverage_failed; 1.0; EventData::Path = entry.path().display().to_string());
                             warn!(
                                 "ignoring error recording coverage for input: {}, error: {}",
                                 entry.path().display(),
@@ -407,6 +408,7 @@ impl<'a> TaskContext<'a> {
 
         let s = CoverageStats::new(&self.coverage);
         event!(coverage_data; Covered = s.covered, Features = s.features, Rate = s.rate);
+        metric!(coverage_data; 1.0; Covered = s.covered, Features = s.features, Rate = s.rate);
 
         Ok(())
     }

src/agent/onefuzz-task/src/tasks/fuzz/libfuzzer/common.rs

@@ -383,6 +383,12 @@ impl TotalStats {
             EventData::Count = self.count,
             EventData::ExecsSecond = self.execs_sec
         );
+        metric!(
+            runtime_stats;
+            1.0;
+            EventData::Count = self.count,
+            EventData::ExecsSecond = self.execs_sec
+        );
     }
 }
 

src/agent/onefuzz-task/src/tasks/report/crash_report.rs

@@ -124,7 +124,8 @@ impl RegressionReport {
         };
 
         if upload_or_save_local(&self, &name, regression_reports).await? {
-            event!(event; EventData::Path = name);
+            event!(event; EventData::Path = name.clone());
+            metric!(event; 1.0; EventData::Path = name.clone());
         }
         Ok(())
     }
@@ -155,14 +156,16 @@ impl CrashTestResult {
                 if let Some(unique_reports) = unique_reports {
                     let name = report.unique_blob_name();
                     if upload_or_save_local(&report, &name, unique_reports).await? {
-                        event!(new_unique_report; EventData::Path = name);
+                        event!(new_unique_report; EventData::Path = report.unique_blob_name());
+                        metric!(new_unique_report; 1.0; EventData::Path = report.unique_blob_name());
                     }
                 }
 
                 if let Some(reports) = reports {
                     let name = report.blob_name();
                     if upload_or_save_local(&report, &name, reports).await? {
-                        event!(new_report; EventData::Path = name);
+                        event!(new_report; EventData::Path = report.blob_name());
+                        metric!(new_report; 1.0; EventData::Path = report.blob_name());
                     }
                 }
             }
@@ -171,7 +174,8 @@ impl CrashTestResult {
                 if let Some(no_repro) = no_repro {
                     let name = report.blob_name();
                     if upload_or_save_local(&report, &name, no_repro).await? {
-                        event!(new_unable_to_reproduce; EventData::Path = name);
+                        event!(new_unable_to_reproduce; EventData::Path = report.blob_name());
+                        metric!(new_unable_to_reproduce; 1.0; EventData::Path = report.blob_name());
                     }
                 }
             }

src/agent/onefuzz-telemetry/src/lib.rs

@@ -515,6 +515,33 @@ pub fn track_event(event: &Event, properties: &[EventData]) {
     try_broadcast_event(chrono::Utc::now(), event, properties);
 }
 
+pub fn track_metric(metric: &Event, value: f64, properties: &[EventData]) {
+    use appinsights::telemetry::Telemetry;
+
+    if let Some(client) = client(ClientType::Instance) {
+        let mut mtr = appinsights::telemetry::MetricTelemetry::new(metric.as_str(), value);
+        let props = mtr.properties_mut();
+        for property in properties {
+            let (name, val) = property.as_values();
+            props.insert(name.to_string(), val);
+        }
+        client.track(mtr);
+    }
+
+    if let Some(client) = client(ClientType::Microsoft) {
+        let mut mtr = appinsights::telemetry::MetricTelemetry::new(metric.as_str(), value);
+        let props = mtr.properties_mut();
+
+        for property in properties {
+            if property.can_share_with_microsoft() {
+                let (name, val) = property.as_values();
+                props.insert(name.to_string(), val);
+            }
+        }
+        client.track(mtr);
+    }
+}
+
 pub fn to_log_level(level: &appinsights::telemetry::SeverityLevel) -> log::Level {
     match level {
         Verbose => log::Level::Debug,
@@ -551,6 +578,27 @@ macro_rules! event {
     }};
 }
 
+#[macro_export]
+macro_rules! log_metrics {
+    ($name: expr; $value: expr; $metrics: expr) => {{
+        onefuzz_telemetry::track_metric(&$name, $value, &$metrics);
+    }};
+}
+
+#[macro_export]
+macro_rules! metric {
+    ($name: expr ; $value: expr ; $($k: path = $v: expr),*) => {{
+        let mut metrics = Vec::new();
+
+        $({
+            metrics.push($k(From::from($v)));
+
+        })*;
+
+        log_metrics!($name; $value; metrics);
+    }};
+}
+
 #[macro_export]
 macro_rules! log {
     ($level: expr, $($arg: tt)+) => {{
@@ -597,11 +645,3 @@ macro_rules! critical {
         onefuzz_telemetry::log!(onefuzz_telemetry::Critical, $($arg)+);
     }}
 }
-
-#[macro_export]
-macro_rules! metric {
-    ($name: expr, $value: expr) => {{
-        let client = onefuzz_telemetry::client(onefuzz_telemetry::ClientType::Instance);
-        client.track_metric($name.into(), $value);
-    }};
-}

src/agent/onefuzz/src/syncdir.rs

@@ -253,19 +253,21 @@ impl SyncedDir {
                 let file_name = item
                     .file_name()
                     .ok_or_else(|| anyhow!("invalid file path"))?;
-                let file_name_str = file_name.to_string_lossy();
+                let file_name_event_str = file_name.to_string_lossy();
+                let file_name_str_metric_str = file_name.to_string_lossy();
 
                 // explicitly ignore azcopy temporary files
                 // https://github.com/Azure/azure-storage-azcopy/blob/main/ste/xfer-remoteToLocal-file.go#L35
-                if file_name_str.starts_with(".azDownload-") {
+                if file_name_event_str.starts_with(".azDownload-") {
                     continue;
                 }
 
-                if ignore_dotfiles && file_name_str.starts_with('.') {
+                if ignore_dotfiles && file_name_event_str.starts_with('.') {
                     continue;
                 }
 
-                event!(event.clone(); EventData::Path = file_name_str);
+                event!(event.clone(); EventData::Path = file_name_event_str);
+                metric!(event.clone(); 1.0; EventData::Path = file_name_str_metric_str);
                 let destination = path.join(file_name);
                 if let Err(err) = fs::copy(&item, &destination).await {
                     let error_message = format!(
@@ -288,19 +290,21 @@ impl SyncedDir {
                 let file_name = item
                     .file_name()
                     .ok_or_else(|| anyhow!("invalid file path"))?;
-                let file_name_str = file_name.to_string_lossy();
+                let file_name_event_str = file_name.to_string_lossy();
+                let file_name_str_metric_str = file_name.to_string_lossy();
 
                 // explicitly ignore azcopy temporary files
                 // https://github.com/Azure/azure-storage-azcopy/blob/main/ste/xfer-remoteToLocal-file.go#L35
-                if file_name_str.starts_with(".azDownload-") {
+                if file_name_event_str.starts_with(".azDownload-") {
                     continue;
                 }
 
-                if ignore_dotfiles && file_name_str.starts_with('.') {
+                if ignore_dotfiles && file_name_event_str.starts_with('.') {
                     continue;
                 }
 
-                event!(event.clone(); EventData::Path = file_name_str);
+                event!(event.clone(); EventData::Path = file_name_event_str);
+                metric!(event.clone(); 1.0; EventData::Path = file_name_str_metric_str);
                 if let Err(err) = uploader.upload(item.clone()).await {
                     let error_message = format!(
                         "Couldn't upload file.  path:{} dir:{} err:{:?}",