Fix the logic to get container.id resource attribute #10737
Merged
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.
As described in #10719, the container.id resource attribute returned by ContainerResource.java does not work for a lot of container environments. CgroupV1ContainerIdExtractor.java is OK. The problem is at CgroupV2ContainerIdExtractor.java. When the "/proc/self/cgroup" file does not include the container.id, with the "/proc/self/mountinfo" file, the CgroupV2ContainerIdExtractor.java usually returns a wrong value.
I refined the logic and added 4 new typical test scenarios besides the existing 2.