Skip to content

Set agent name and version conditionally #229

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

Merged
merged 2 commits into from
Sep 12, 2025
Merged

Set agent name and version conditionally #229

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a23717
Set agent name and version conditionally
gregkalapos Sep 10, 2025
0296701
Update resource.go
gregkalapos Sep 10, 2025
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 enrichments/internal/elastic/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,19 @@ func (s *resourceEnrichmentContext) Enrich(resource pcommon.Resource, cfg config
return true
})

// agent.name and version are set by classic Elastic APM Agents - if the value is present, we take it
// otherwise the setAgent[Name|Version] functions are called to derive the values
if cfg.AgentName.Enabled {
s.setAgentName(resource)
if _, exists := resource.Attributes().Get(elasticattr.AgentName); !exists {
s.setAgentName(resource)
}
}
if cfg.AgentVersion.Enabled {
s.setAgentVersion(resource)
if _, exists := resource.Attributes().Get(elasticattr.AgentVersion); !exists {
s.setAgentVersion(resource)
}
}

if cfg.OverrideHostName.Enabled {
s.overrideHostNameWithK8sNodeName(resource)
}
Expand Down