8000 Fix container parse from cgroup file by mariomac · Pull Request #468 · grafana/beyla · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix container parse from cgroup file #468

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

Jump to bottom
Merged
merged 1 commit into from
Nov 27, 2023
Merged

Fix container parse from cgroup file #468

merged 1 commit into from
Nov 27, 2023

Conversation

mariomac
Copy link
Contributor

The previous code assumed a cgroup content like:

0::/docker/<hex stuff>/kubelet.slice/kubelet-kubepods.slice/kubelet-kubepods-besteffort.slice/kubelet-kubepods-besteffort-pod<uuid>.slice/cri-containerd-<containerID>.scope

But we found that for the sidecar deployment case, the cgroup content might be like:

0::/../cri-containerd-<containerID>.scope

This PR also removes the fixtures folder to avoid polluting the codebase with too many fixture files.

@mariomac mariomac requested a review from grcevski as a code owner November 27, 2023 10:35
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (cc0c6b6) 77.17% compared to head (b3d7221) 41.86%.

Additional details and impacted files 
@@             Coverage Diff             @@
##             main     #468       +/-   ##
===========================================
- Coverage   77.17%   41.86%   -35.32%     
===========================================
  Files          65       63        -2     
  Lines        5162     5030      -132     
===========================================
- Hits         3984     2106     -1878     
- Misses        958     2789     +1831     
+ Partials      220      135       -85
Flag Coverage Δ
integration-test ?
unittests 41.86% <ø> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

grcevski
grcevski approved these changes Nov 27, 2023
View reviewed changes
Copy link
Contributor
@grcevski grcevski left a comment

Choose a reason for hiding this comment

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

LGTM!

@mariomac mariomac merged commit 8467e85 into 82A0 grafana:main Nov 27, 2023
@mariomac mariomac deleted the fix-cgroup-read branch November 27, 2023 16:30
mattdurham pushed a commit to mattdurham/beyla that referenced this pull request Jan 22, 2025
@mariomac
Fix container parse from Cgroup (grafana#468)
650e709
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grcevski grcevski grcevski approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mariomac @codecov-commenter @grcevski
0