From 7a23717c4e98148804bb0747340a2c9f40c52dc8 Mon Sep 17 00:00:00 2001 From: Greg Kalapos Date: Wed, 10 Sep 2025 16:25:27 +0200 Subject: [PATCH 1/2] Set agent name and version conditionally --- enrichments/internal/elastic/resource.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/enrichments/internal/elastic/resource.go b/enrichments/internal/elastic/resource.go index 5ab2b3a..47bf186 100644 --- a/enrichments/internal/elastic/resource.go +++ b/enrichments/internal/elastic/resource.go @@ -72,12 +72,21 @@ 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) } From 02967016be0c7cca0dd8a5931cd98ea550adb43c Mon Sep 17 00:00:00 2001 From: Greg Kalapos Date: Wed, 10 Sep 2025 17:18:46 +0200 Subject: [PATCH 2/2] Update resource.go --- enrichments/internal/elastic/resource.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/enrichments/internal/elastic/resource.go b/enrichments/internal/elastic/resource.go index 47bf186..b38a493 100644 --- a/enrichments/internal/elastic/resource.go +++ b/enrichments/internal/elastic/resource.go @@ -75,13 +75,11 @@ func (s *resourceEnrichmentContext) Enrich(resource pcommon.Resource, cfg config // 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) }