Skip to content

Commit a6c7f36

Browse files
author
Memfault Inc.
committed
memfaultd 1.25.1 (Build 3441432)
1 parent 5c24744 commit a6c7f36

File tree

10 files changed

+38
-22
lines changed

10 files changed

+38
-22
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to
77
[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
88

9+
## [1.25.1] - 2025-11-12
10+
11+
This is a patch release fixing a bug introduced in 1.25.0 affecting disk
12+
statsitics.
13+
14+
### Fixed
15+
16+
- Fixed a bug with disk statistics (`bytes_written`, `lifetime_remaining`, etc.)
17+
that would prevent them from being captured in certain kernel versions.
18+
919
## [1.25.0] - 2025-11-04
1020

1121
This release adds some new clippy configs, as well as the ability to filter
@@ -1533,3 +1543,5 @@ package][nginx-pid-report] for a discussion on the topic.
15331543
https://github.com/memfault/memfault-linux-sdk/releases/tag/1.24.0-kirkstone
15341544
[1.25.0]:
15351545
https://github.com/memfault/memfault-linux-sdk/releases/tag/1.25.0-kirkstone
1546+
[1.25.1]:
1547+
https://github.com/memfault/memfault-linux-sdk/releases/tag/1.25.1-kirkstone

‎Cargo.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD ID: 3429408
2-
GIT COMMIT: 33c69d158d
3-
VERSION: 1.25.0
1+
BUILD ID: 3441432
2+
GIT COMMIT: 12e53c1861
3+
VERSION: 1.25.1

‎memfault-ssf/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "memfault-ssf"
3-
version = "1.25.0"
3+
version = "1.25.1"
44
edition = "2021"
55
description = "Supporting crate for the Memfault memfaultd embedded Linux agent"
66
homepage = "https://github.com/memfault/memfaultd"

‎memfault-ssf/VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD ID: 3429408
2-
GIT COMMIT: 33c69d158d
3-
VERSION: 1.25.0
1+
BUILD ID: 3441432
2+
GIT COMMIT: 12e53c1861
3+
VERSION: 1.25.1

‎memfaultc-sys/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "memfaultc-sys"
3-
version = "1.25.0"
3+
version = "1.25.1"
44
edition = "2021"
55
autobins = false
66
description = "Supporting crate for the Memfault memfaultd embedded Linux agent"

‎memfaultc-sys/VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD ID: 3429408
2-
GIT COMMIT: 33c69d158d
3-
VERSION: 1.25.0
1+
BUILD ID: 3441432
2+
GIT COMMIT: 12e53c1861
3+
VERSION: 1.25.1

‎memfaultd/Cargo.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "memfaultd"
3-
version = "1.25.0"
3+
version = "1.25.1"
44
edition = "2021"
55
autobins = false
66
rust-version = "1.80"
@@ -28,8 +28,8 @@ name= "mfw"
2828
path= "src/bin/mfw.rs"
2929

3030
[dependencies]
31-
memfaultc-sys = { path= "../memfaultc-sys", version = "1.25.0" }
32-
ssf = { package = "memfault-ssf", path= "../memfault-ssf", version = "1.25.0" }
31+
memfaultc-sys = { path= "../memfaultc-sys", version = "1.25.1" }
32+
ssf = { package = "memfault-ssf", path= "../memfault-ssf", version = "1.25.1" }
3333
argh = "0.1.10"
3434
cfg-if = "1.0.0"
3535
chrono = { version = "0.4.23", features = ["serde"]}

‎memfaultd/VERSION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BUILD ID: 3429408
2-
GIT COMMIT: 33c69d158d
3-
VERSION: 1.25.0
1+
BUILD ID: 3441432
2+
GIT COMMIT: 12e53c1861
3+
VERSION: 1.25.1

‎memfaultd/src/mmc.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,11 @@ impl TryFrom<String> for MmcLifeTime {
251251
return Err(eyre!("Invalid number of lifetime values"));
252252
}
253253

254-
let raw_lifetime_a = u8::from_str_radix(tokens[0], 16)?;
255-
let raw_lifetime_b = u8::from_str_radix(tokens[1], 16)?;
254+
let stripped_lifetime_a = tokens[0].strip_prefix("0x").unwrap_or(tokens[0]);
255+
let stripped_lifetime_b = tokens[1].strip_prefix("0x").unwrap_or(tokens[1]);
256+
257+
let raw_lifetime_a = u8::from_str_radix(stripped_lifetime_a, 16)?;
258+
let raw_lifetime_b = u8::from_str_radix(stripped_lifetime_b, 16)?;
256259

257260
let lifetime_a_pct = raw_lifetime_to_pct(raw_lifetime_a);
258261
let lifetime_b_pct = raw_lifetime_to_pct(raw_lifetime_b);
@@ -407,6 +410,7 @@ mod test {
407410
#[case(String::from("4 5\n"), Ok(MmcLifeTime::new(Some(30), Some(40))))]
408411
#[case(String::from("\t4 5"), Ok(MmcLifeTime::new(Some(30), Some(40))))]
409412
#[case(String::from("4 5"), Ok(MmcLifeTime::new(Some(30), Some(40))))]
413+
#[case(String::from("0x4 0x5"), Ok(MmcLifeTime::new(Some(30), Some(40))))]
410414
fn test_lifetime_from_sysfs_string(
411415
#[case] input_string: String,
412416
#[case] expected: Result<MmcLifeTime>,

0 commit comments

Comments
 (0)