Fixes container detector for systemd & cgroupv1 with Docker #3429
+25
−2
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.
Description
Running the container detector on certain Docker setups returns the incorrect container.id.
For example:
08767a667f35c8505cbf40d14e931ef6db5b0210329cf193b15ba9d605.scope
where it should be7be92808767a667f35c8505cbf40d14e931ef6db5b0210329cf193b15ba9d605
I believe this is from some combination of Cgroups v1 and systemd cgroup driver.
The output I have included in the test can be reproduced:
For the fix, I borrowed the regex which is used by opentelemetry-go uses for parsing the container ID from this file: https://github.com/open-telemetry/opentelemetry-go/blob/7639c93baffc820f9f19ab1f9d1c085b0b45e071/sdk/resource/container.go#L21
Fixes # (issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Start up a container:
Before change:
After change:
Does This PR Require a Core Repo Change?
Checklist:
See contributing.md for styleguide, changelog guidelines, and more.