Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #1358
This PR adds support for getting the containerId from a docker container with Linux cgroup v2.
Previously, the containerId was grabbed from
proc/self/cgroup
for containers with cgroup V1. Now, the id is grabbed fromproc/self/mountinfo
, with fallthrough toproc/self/cgroup
if that file is missing.proc/self/mountinfo
. Because this solution is a bit hacky, there isn't clear documentation about what's supposed to be in there in different environments/providers. The matching logic may need to be updated in the future.