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
Allow docker and containerd samplers running together (NR-148791) #1725
Merged
alvarocabanas
merged 18 commits into
master
from
NR-148791_set_docker_socket_check_first
Aug 22, 2023
Merged
Allow docker and containerd samplers running together (NR-148791) #1725
alvarocabanas
merged 18 commits into
master
from
NR-148791_set_docker_socket_check_first
Aug 22, 2023
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
alvarocabanas
changed the title
Nr 148791 allow docker and containerd samplers running together
Allow docker and containerd samplers running together (NR-148791)
Aug 18, 2023
brushknight
reviewed
Aug 21, 2023
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.
Added a few questions
rubenruizdegauna
previously approved these changes
Aug 21, 2023
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.
LGTM 🔥
brushknight
approved these changes
Aug 22, 2023
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.
In latest versions of docker, containerd is also installed under the hood, since it's used by docker. Both Runtimes are working on those machines and containers can be created on both runtimes.
The code has been modified to allow getting info from both runtimes at the same time.
Also there has been added support to containerd for agent verbose mode notification with infra-ctl.