-
Notifications
You must be signed in to change notification settings - Fork 15
feat: support additional cgroup formats for container-id parsing #222
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
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
edb4f89
Update docker container ID test to use a UUID that's 64 hex-chars lon…
zacharycmontoya bb3d458
Rename container::find_docker_container_id to container::find_contain…
zacharycmontoya 2174c80
Add other cgroup file examples from the .NET Tracer
zacharycmontoya 136d4cc
Fix formatting
zacharycmontoya 43f214a
Add temporary logging to stdout and stderr for the container-id parsing
zacharycmontoya d6e9297
This doesn't pass unit tests, but now I am writing some more helpful …
zacharycmontoya 6251ac4
Remove the host namespace check since it stops us from working on Doc…
zacharycmontoya 7fb67c9
Also remove the eager cgroup lookup because that's stopping us from c…
zacharycmontoya 70d6db4
Refactor to better align with Java implementation
zacharycmontoya f0abaad
Remove all uses of logger now that we're done debugging system-tests …
zacharycmontoya 565c4e0
Put back the get_cgroup_version and add temporary logging to confirm …
zacharycmontoya 587405f
Restore the cgroup logic, but also include TMPFS_MAGIC as a valid val…
zacharycmontoya 08909b1
Remove logging (again) and reduce the diff
zacharycmontoya 376793e
Restore the previous substring approach and execute this first before…
zacharycmontoya 039883a
Apply suggestions from code review
zacharycmontoya d8576b9
Move the regex string literals closer to their usage
zacharycmontoya 9d1946b
Fix formatting
zacharycmontoya File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’m not quite sure I understand the reasoning behind moving this here, could you explain the reasoning?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's two reasons why I did this:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't investigated too much, however, IIRC this function can fails in docker in docker setup.
dd-trace-cpp/src/datadog/platform_util.cpp
Lines 313 to 316 in 31f263f