Fix the logic to get container.id resource attribute #10737
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
laurit
reviewed
Mar 4, 2024
...y/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Mar 4, 2024
...y/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java
Outdated
Show resolved
Hide resolved
laurit
reviewed
Mar 4, 2024
...c/test/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractorTest.java
Outdated
Show resolved
Hide resolved
|
Hi @laurit , I have revised the code according to your comments. |
|
Hi @laurit , I have revised the code according to your comments. |
laurit
reviewed
Mar 5, 2024
...y/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java
Show resolved
Hide resolved
laurit
reviewed
Mar 5, 2024
...y/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java
Outdated
Show resolved
Hide resolved
…ry/instrumentation/resources/CgroupV2ContainerIdExtractor.java Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
|
Hi @laurit , please help review again. |
laurit
reviewed
Mar 5, 2024
...y/src/main/java/io/opentelemetry/instrumentation/resources/CgroupV2ContainerIdExtractor.java
Outdated
Show resolved
Hide resolved
laurit
approved these changes
Mar 5, 2024
|
Are there more steps to have this PR merged? Then when can we see it working in OTel Java auto-instrumentations? |
github-actions bot
pushed a commit
that referenced
this pull request
May 10, 2024
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.