memfaultd 1.15.0 (Build 2534584)

Author: Memfault Inc

Cargo.lock

@@ -1,3 +1,3 @@
-BUILD ID: 2370319
-GIT COMMIT: 41269b2621
-VERSION: 1.14.0
+BUILD ID: 2534584
+GIT COMMIT: e2c67955b9
+VERSION: 1.15.0

VERSION

@@ -1,6 +1,6 @@
 [package]
 name = "memfault-ssf"
-version = "1.14.0"
+version = "1.15.0"
 edition = "2021"
 description = "Supporting crate for the Memfault memfaultd embedded Linux agent"
 homepage = "https://github.com/memfault/memfaultd"

memfault-ssf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "memfaultc-sys"
-version = "1.14.0"
+version = "1.15.0"
 edition = "2021"
 autobins = false
 description = "Supporting crate for the Memfault memfaultd embedded Linux agent"

memfault-ssf/VERSION

@@ -1,6 +1,6 @@
 [package]
 name = "memfaultd"
-version = "1.14.0"
+version = "1.15.0"
 edition = "2021"
 autobins = false
 rust-version = "1.72"
@@ -28,8 +28,8 @@ name= "mfw"
 path= "src/bin/mfw.rs"
 
 [dependencies]
-memfaultc-sys = { path= "../memfaultc-sys", version = "1.14.0" }
-ssf = { package = "memfault-ssf", path= "../memfault-ssf", version = "1.14.0" }
+memfaultc-sys = { path= "../memfaultc-sys", version = "1.15.0" }
+ssf = { package = "memfault-ssf", path= "../memfault-ssf", version = "1.15.0" }
 argh = "0.1.10"
 cfg-if = "1.0.0"
 chrono = { version = "0.4.23", features = ["serde"]}
@@ -50,7 +50,7 @@ serde_json = "1.0.89"
 serde_repr = "0.1"
 shuteye = "0.3.3"
 signal-hook = "0.3.14"
-stderrlog = "0.5.4"
+stderrlog = "0.6.0"
 strum = { version = "0.24", features = ["derive"] }
 strum_macros = "0.24"
 tempfile = "3.3.0"
@@ -73,6 +73,7 @@ regex= { version = "1.10.2", optional = true}
 nom = "7.1.3"
 sealed_test = "1.1.0"
 zip = { version = "1.1.4", default-features = false, features = ["deflate"]}
+lazy_static = "1.5.0"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 procfs = { version = "0.15.1", optional = true }
@@ -95,8 +96,12 @@ nom = "7.1.3"
 name = "logs_to_metrics"
 harness = false
 
+[[bench]]
+name = "log_level_mapper"
+harness = false
+
 [features]
-default = ["coredump", "collectd", "logging", "log-to-metrics", "systemd", "rust-tls" ]
+default = ["coredump", "logging", "regex", "systemd", "rust-tls"]
 coredump = [
     "memfaultc-sys/coredump",
     "dep:prctl",
@@ -107,13 +112,13 @@ coredump = [
     "dep:goblin",
     "dep:scroll"
 ]
-collectd = []
 swupdate = ["memfaultc-sys/swupdate"]
 logging = ["dep:governor", "dep:rmp-serde", "dep:rmpv"]
 systemd = ["memfaultc-sys/systemd"]
 rust-tls = ["reqwest/rustls-tls"]
 openssl-tls = ["reqwest/native-tls"]
 openssl-vendored-tls = ["reqwest/native-tls-vendored"]
-log-to-metrics = ["dep:regex"]
+regex = ["dep:regex"]
+log-to-metrics = ["regex"]
 experimental = ["mfw"]
 mfw = []

memfaultc-sys/Cargo.toml

@@ -16,7 +16,7 @@ apt install libsystemd-dev libconfig-dev
 #### macOS
 
 ```sh
-brew install libconfig
+brew install pkg-config libconfig
 ```
 
 (note: `libsystemd` is not available on macOS and the build system will not try

memfaultc-sys/VERSION

@@ -0,0 +1,84 @@
+//
+// Copyright (c) Memfault, Inc.
+// See License.txt for details
+use chrono::Utc;
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
+use memfaultd::config::{LevelMappingConfig, LevelMappingRegex};
+use memfaultd::logs::log_entry::{LogData, LogEntry};
+use memfaultd::logs::log_level_mapper::LogLevelMapper;
+
+const BENCH_LEVELS: &[&str] = &[
+    "EMERG", "ALERT", "CRIT", "ERROR", "WARN", "NOTICE", "INFO", "DEBUG",
+];
+
+fn build_log_line(level: &str, message: &str) -> LogEntry {
+    let data = LogData {
+        message: message.to_string(),
+        pid: None,
+        systemd_unit: None,
+        priority: Some(level.to_string()),
+        original_priority: None,
+        extra_fields: Default::default(),
+    };
+
+    LogEntry {
+        ts: Utc::now(),
+        data,
+    }
+}
+
+fn build_regex_string(level: &str) -> String {
+    format!(r"\[.*\] \[{}\]:", level)
+}
+
+fn build_log_mapper() -> LogLevelMapper {
+    let regex = BENCH_LEVELS
+        .iter()
+        .map(|level| build_regex_string(level))
+        .collect::<Vec<_>>();
+
+    let regex = LevelMappingRegex {
+        emergency: Some(regex[0].clone()),
+        alert: Some(regex[1].clone()),
+        critical: Some(regex[2].clone()),
+        error: Some(regex[3].clone()),
+        warning: Some(regex[4].clone()),
+        notice: Some(regex[5].clone()),
+        info: Some(regex[6].clone()),
+        debug: Some(regex[7].clone()),
+    };
+    let level_config = LevelMappingConfig {
+        enable: true,
+        regex: Some(regex),
+    };
+
+    LogLevelMapper::try_from(&level_config).expect("Failed to build log level mapper")
+}
+
+fn map_logs(num_log_lines: u64, mapper: &LogLevelMapper) {
+    for i in 0..num_log_lines {
+        let cur_level_idx = i % BENCH_LEVELS.len() as u64;
+        let cur_level = BENCH_LEVELS[cur_level_idx as usize];
+        let mut log_line = build_log_line(cur_level, "This is a test log message");
+        mapper.map_log(&mut log_line).expect("Error mapping log");
+    }
+}
+
+fn log_mapper_benchmark(c: &mut Criterion) {
+    let mut group = c.benchmark_group("Log Level Mapper");
+    let num_log_lines = [100, 1000];
+    let level_mapper = build_log_mapper();
+
+    for num in num_log_lines {
+        group.throughput(Throughput::Elements(num));
+        group.bench_with_input(BenchmarkId::new("Log Level Mapper", num), &num, |b, num| {
+            // Send metrics to preallocate the metrics hashmap
+            b.iter(|| {
+                map_logs(*num, &level_mapper);
+            })
+        });
+    }
+}
+
+criterion_group!(benches, log_mapper_benchmark);
+criterion_main!(benches);