Skip to content

APM: Avoid container ID resolution in non-container envs (APMS-18824) #47892

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.

Sign up for GitHub

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

Draft
ajgajg1134 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

APM: Avoid container ID resolution in non-container envs (APMS-18824) #47892

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bbd4fd
temp commit to hide tagger OriginDetection in non-containers
ajgajg1134 Mar 16, 2026
d21f277
APM: avoid container id res in non container envs
ajgajg1134 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions comp/trace/config/impl/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,15 @@ func prepareConfig(c corecompcfg.Component, tagger tagger.Component, ipc ipc.Com
cfg.ContainerTags = func(cid string) ([]string, error) {
return tagger.Tag(types.NewEntityID(types.ContainerID, cid), types.HighCardinality)
}
cfg.ContainerIDFromOriginInfo = func(originInfo origindetection.OriginInfo) (string, error) {
return tagger.GenerateContainerIDFromOriginInfo(originInfo)
if env.IsContainerized() {
cfg.ContainerIDFromOriginInfo = func(originInfo origindetection.OriginInfo) (string, error) {
return tagger.GenerateContainerIDFromOriginInfo(originInfo)
}
} else {
// In non-containerized environments, we will never be able to generate a container ID from the origin info, so don't bother the remote tagger.
cfg.ContainerIDFromOriginInfo = func(originInfo origindetection.OriginInfo) (string, error) {
Copy link
Contributor

@ichinaski ichinaski Mar 16, 2026

Choose a reason for hiding this comment

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

I believe this would work, but maybe we can even create a noop ID Provider for situations where IsContainerized() is false? The current one would not use the origin info features, but would still look into headers for container info: https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/api/container_linux.go#L136-L181

return "", nil
}
}
cfg.ContainerProcRoot = coreConfigObject.GetString("container_proc_root")
cfg.AuthToken = ipc.GetAuthToken()
Expand Down
Loading