Skip to content
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
merged 18 commits into from Aug 22, 2023

Conversation

alvarocabanas
Copy link
Contributor

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.

@alvarocabanas alvarocabanas requested a review from a team as a code owner August 18, 2023 07:24
@alvarocabanas 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
@alvarocabanas alvarocabanas marked this pull request as draft August 18, 2023 08:34
@alvarocabanas alvarocabanas marked this pull request as ready for review August 18, 2023 09:31
Copy link
Contributor

@brushknight brushknight left a 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

pkg/ctl/sender/client_container_windows.go Show resolved Hide resolved
pkg/metrics/process/sampler_darwin.go Show resolved Hide resolved
Copy link
Contributor

@rubenruizdegauna rubenruizdegauna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🔥

@alvarocabanas alvarocabanas merged commit 18e9c1c into master Aug 22, 2023
25 checks passed
@alvarocabanas alvarocabanas deleted the NR-148791_set_docker_socket_check_first branch August 22, 2023 13:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants