Skip to content
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.

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

fix: Use original regex to get container id from cgroup v1 in fallback case #2263

Merged
merged 2 commits into from Feb 23, 2024

Conversation

nr-ahemsath
Copy link
Member

Fixes #2256 by adding additional logic to try and parse the container ID out of cgroup v1 data if the newer regex fails to find anything. Includes a new unit test to verify the intended result.

Copy link
Member

@tippmar-nr tippmar-nr left a comment

Choose a reason for hiding this comment

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

Looks good!

@nr-ahemsath nr-ahemsath enabled auto-merge (squash) February 23, 2024 00:12
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.07%. Comparing base (1632adb) to head (06a960e).
Report is 2 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2263      +/-   ##
==========================================
- Coverage   81.09%   81.07%   -0.03%     
==========================================
  Files         396      396              
  Lines       24739    24749      +10     
  Branches     2999     2993       -6     
==========================================
+ Hits        20062    20065       +3     
- Misses       3889     3895       +6     
- Partials      788      789       +1     
Files Coverage Δ
...gent/NewRelic/Agent/Core/Utilization/VendorInfo.cs 83.73% <100.00%> (+0.25%) ⬆️

... and 3 files with indirect coverage changes

@nr-ahemsath nr-ahemsath merged commit 9ecb88d into main Feb 23, 2024
77 checks passed
@nr-ahemsath nr-ahemsath deleted the bugfix/cgroups-v1-fallback branch February 23, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fall back to less restrictive Container ID check if not found
4 participants