Skip to content

ref(relay): Bump sysinfo library version #4613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 25, 2025
Merged

ref(relay): Bump sysinfo library version #4613

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
118a2c7
ref(relay): Bump sysinfo library version
iambriccardo Mar 25, 2025
c32b5ad
Fix
iambriccardo Mar 25, 2025
e6a6de9
Fix
iambriccardo Mar 25, 2025
8ec22de
Fix
iambriccardo Mar 25, 2025
e4ec1ac
Fix
iambriccardo Mar 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ syn = { version = "2.0.90" }
synstructure = { version = "0.13.1" }
# This dependency was added through git since we are experimenting with a fork of sysinfo which adds additional
# capabilities of reading cgroups memory stats. Such stats are used in Relay to correctly determine memory usage.
sysinfo = { git = "https://github.com/getsentry/sysinfo.git", rev = "e2e5d530600f96bdd79652c856918da23e5dd938" }
sysinfo = { git = "https://github.com/getsentry/sysinfo.git", rev = "15b3be3273ba286740122fed7bb7dccd2a79dc8f" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the PR is already merged, we can link directly to the upstream repo, update the comment to mention that we're just waiting for a release?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I already added this to the PR but will also mention in code. I also prepared a ticket: https://github.com/getsentry/team-ingest/issues/685

Copy link
Contributor Author

@iambriccardo iambriccardo Mar 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems to not work if I omit rev or just add branch = "master". I have no idea why :/

tempfile = "3.14.0"
thiserror = "1.0.69"
tikv-jemallocator = "0.6.0"
Expand Down
2 changes: 1 addition & 1 deletion relay-server/src/utils/memory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl MemoryStat {

/// Refreshes the memory readings.
fn refresh_memory(system: &mut System) -> Memory {
system.refresh_memory_specifics(MemoryRefreshKind::new().with_ram());
system.refresh_memory_specifics(MemoryRefreshKind::nothing().with_ram());
let memory = match system.cgroup_limits() {
Some(cgroup) => Memory {
used: cgroup.rss,
Expand Down
Loading