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

[CONTINT-3905] Make sure we retrieve the cgroup inode when the cid is not found #302

Merged
merged 2 commits into from Mar 8, 2024

Conversation

AliDatadog
Copy link
Contributor

This PR fixes an issue where the cgroup inode when the container id is "".

During testing of the last commit of this PR, we found out that the inode was sent and container tags was finally retrieved.

But actually, it was only because we had another bug in container id resolution that was fixed here. We were overriding a faulty container-id. We shouldn't override the container-id (actually it's not problematic). But we should at least retrieve the container-id when it's not found.

The new test cases should cover everything

@AliDatadog AliDatadog requested a review from a team as a code owner March 7, 2024 10:12
return
}
containerID = readMountinfo(selfMountInfoPath)
if containerID != "" {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The bug is just this line. All the rest is about moving stuff around to add unit tests

vboulineau
vboulineau previously approved these changes Mar 7, 2024
@AliDatadog AliDatadog changed the title Make sure we retrieve the cgroup inode when the cid is not found [CONTINT-3905] Make sure we retrieve the cgroup inode when the cid is not found Mar 7, 2024
@AliDatadog AliDatadog merged commit 9d92025 into master Mar 8, 2024
38 checks passed
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.

None yet

3 participants