Set agent name and version conditionally #229
Merged
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.
agent.nameis a required field in Kibana - without that the APM UI throws an exception.Via the
elasticapmintakereceiver these fields are set and we get the values out of the box (elastic APM Agents send those values) - and the processor just disabled these 2 fields: https://github.com/gregkalapos/opentelemetry-collector-components/blob/main/processor/elasticapmprocessor/processor.go#L69-L70For OTel SDKs via the OTLP receiver, we just called the
s.setAgentNameands.setAgentVersionfunctions to calculate those - because the lines below for disabling the fields are only active for ecs mode.This breaks when OTel SDKs are used in
ecsmode ("internal linked" to internal issue below for more details).The idea:
opentelemetry-libhere we calculate these 2 fields when they are not present - otherwise just take them as-is.p.enricher.Config.Resource.Agent[Name|version].Enabled = falselines for ecs mode - update: PR in the other repo: [elasticapmprocessor] - do not disable AgentName and AgentVersion in ECS mode opentelemetry-collector-components#758This way, we handle it like this:
elasticapmintakereceiver: values are present, just take them as is