From 0f28bdb9cb6acbe20e658eae6357d9e1e68a2851 Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Tue, 3 Mar 2026 15:45:58 -0800 Subject: [PATCH 1/3] [receiver/elasticapmintake] Update mappings for attributes to use OTel semconv Mapping updated for `service.language.name`, `service.language.version`, `service.runtime.name`, and `service.runtime.version` --- .../mappers/intakeV2ToDerivedFields.go | 7 - .../intakeV2ToElasticSpecificFields.go | 4 - .../internal/mappers/intakeV2ToSemConv.go | 24 +- .../testdata/errors_expected.yaml | 123 ++++--- .../testdata/hostdata_expected.yaml | 17 +- .../testdata/invalid_ids_expected.yaml | 42 ++- .../language_name_mapping_expected.yaml | 11 +- .../testdata/logs_expected.yaml | 300 ++++++++---------- .../testdata/metricsets_expected.yaml | 35 +- .../testdata/spans_expected.yaml | 210 ++++++------ .../testdata/transactions_expected.yaml | 145 ++++----- .../testdata/transactions_spans_expected.yaml | 233 ++++++-------- .../testdata/unknown-span-type_expected.yaml | 74 ++--- 13 files changed, 527 insertions(+), 698 deletions(-) diff --git a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToDerivedFields.go b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToDerivedFields.go index c237ee288..8de92e8d1 100644 --- a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToDerivedFields.go +++ b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToDerivedFields.go @@ -105,13 +105,6 @@ func SetDerivedResourceAttributes(event *modelpb.APMEvent, attributes pcommon.Ma attributes.PutStr(elasticattr.AgentName, event.Agent.Name) attributes.PutStr(elasticattr.AgentVersion, event.Agent.Version) } - - if event.Service != nil { - if event.Service.Language != nil { - putNonEmptyStr(attributes, elasticattr.ServiceLanguageName, event.Service.Language.Name) - putNonEmptyStr(attributes, elasticattr.ServiceLanguageVersion, event.Service.Language.Version) - } - } } // SetDerivedFieldsForMetrics sets fields that are NOT part of OTel for metrics. These fields are derived by the Enrichment lib in case of OTLP input diff --git a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go index eb0d14bea..5746252f5 100644 --- a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go +++ b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go @@ -413,10 +413,6 @@ func SetElasticSpecificResourceAttributes(event *modelpb.APMEvent, attributesMap putNonEmptyStr(attributesMap, elasticattr.ServiceFrameworkName, event.Service.Framework.Name) putNonEmptyStr(attributesMap, elasticattr.ServiceFrameworkVersion, event.Service.Framework.Version) } - if event.Service.Runtime != nil { - putNonEmptyStr(attributesMap, elasticattr.ServiceRuntimeName, event.Service.Runtime.Name) - putNonEmptyStr(attributesMap, elasticattr.ServiceRuntimeVersion, event.Service.Runtime.Version) - } if event.Service.Origin != nil { putNonEmptyStr(attributesMap, elasticattr.ServiceOriginID, event.Service.Origin.Id) putNonEmptyStr(attributesMap, elasticattr.ServiceOriginName, event.Service.Origin.Name) diff --git a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go index f6f599afe..3a698bec0 100644 --- a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go +++ b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go @@ -20,8 +20,6 @@ package mappers // import "github.com/elastic/opentelemetry-collector-components/receiver/elasticapmintakereceiver/internal/mappers" import ( - "strings" - "go.opentelemetry.io/collector/pdata/pcommon" semconv22 "go.opentelemetry.io/otel/semconv/v1.22.0" semconv "go.opentelemetry.io/otel/semconv/v1.27.0" @@ -34,8 +32,13 @@ func TranslateToOtelResourceAttributes(event *modelpb.APMEvent, attributes pcomm if event.Service != nil { putNonEmptyStr(attributes, string(semconv.ServiceNameKey), event.Service.Name) putNonEmptyStr(attributes, string(semconv.ServiceVersionKey), event.Service.Version) - if event.Service.Language != nil && event.Service.Language.Name != "" { - attributes.PutStr(string(semconv.TelemetrySDKLanguageKey), translateElasticServiceLanguageToOtelSdkLanguage(event.Service.Language.Name)) + if event.Service.Language != nil { + putNonEmptyStr(attributes, string(semconv.TelemetrySDKLanguageKey), event.Service.Language.Name) + putNonEmptyStr(attributes, string(semconv.TelemetrySDKVersionKey), event.Service.Language.Version) + } + if event.Service.Runtime != nil { + putNonEmptyStr(attributes, string(semconv.ProcessRuntimeNameKey), event.Service.Runtime.Name) + putNonEmptyStr(attributes, string(semconv.ProcessRuntimeVersionKey), event.Service.Runtime.Version) } attributes.PutStr(string(semconv.TelemetrySDKNameKey), "ElasticAPM") if event.Service.Environment != "" { @@ -70,19 +73,6 @@ func TranslateToOtelResourceAttributes(event *modelpb.APMEvent, attributes pcomm translateFaasAttributes(event, attributes) } -// SemConv defines a well known list of values of telemetry.sdk.language: https://opentelemetry.io/docs/specs/semconv/attributes-registry/telemetry/ -// The classic Elastic APM Agents report values that may not be in the SemConv well known list. -// This method maps those values to the closest SemConv well known value. -func translateElasticServiceLanguageToOtelSdkLanguage(language string) string { - language_lower_case := strings.ToLower(language) - switch language_lower_case { - case "c#": - return "dotnet" - default: - return language_lower_case - } -} - // TranslateIntakeV2TransactionToOTelAttributes translates transaction attributes from the Elastic APM model to SemConv attributes func TranslateIntakeV2TransactionToOTelAttributes(event *modelpb.APMEvent, attributes pcommon.Map) { translateHttpAttributes(event, attributes) diff --git a/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml b/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml index 791afa2c9..bcf029261 100644 --- a/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml @@ -7,6 +7,15 @@ resourceLogs: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "1.2" + - key: process.runtime.name + value: + stringValue: node.js + - key: process.runtime.version + value: + stringValue: 1.2.3 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -91,12 +100,6 @@ resourceLogs: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "1.2" - key: cloud.account.name value: stringValue: account_name @@ -127,12 +130,6 @@ resourceLogs: - key: service.framework.version value: stringValue: "1" - - key: service.runtime.name - value: - stringValue: node.js - - key: service.runtime.version - value: - stringValue: 1.2.3 - key: service.origin.id value: stringValue: 1234567890abcdef @@ -457,15 +454,15 @@ resourceLogs: value: kvlistValue: values: + - key: GATEWAY_INTERFACE + value: + stringValue: CGI/1.1 - key: SOME_NUMERIC_VALUE value: doubleValue: 123 - key: SERVER_SOFTWARE value: stringValue: nginx - - key: GATEWAY_INTERFACE - value: - stringValue: CGI/1.1 - key: http.request.cookies value: kvlistValue: @@ -504,12 +501,6 @@ resourceLogs: value: kvlistValue: values: - - key: my_key - value: - doubleValue: 1 - - key: some_other_value - value: - stringValue: foo bar - key: and_objects value: kvlistValue: @@ -520,6 +511,12 @@ resourceLogs: values: - stringValue: bar - stringValue: baz + - key: my_key + value: + doubleValue: 1 + - key: some_other_value + value: + stringValue: foo bar - key: error.log.message value: stringValue: My service could not talk to the database named foobar @@ -659,6 +656,15 @@ resourceLogs: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -737,12 +743,6 @@ resourceLogs: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -773,12 +773,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -836,6 +830,15 @@ resourceLogs: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -914,12 +917,6 @@ resourceLogs: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -950,12 +947,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1004,6 +995,15 @@ resourceLogs: - key: telemetry.sdk.language value: stringValue: ruby + - key: telemetry.sdk.version + value: + stringValue: "2.5" + - key: process.runtime.name + value: + stringValue: cruby + - key: process.runtime.version + value: + stringValue: "2.5" - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1082,12 +1082,6 @@ resourceLogs: - key: agent.version value: stringValue: 2.1.3 - - key: service.language.name - value: - stringValue: ruby - - key: service.language.version - value: - stringValue: "2.5" - key: cloud.account.name value: stringValue: account_name @@ -1118,12 +1112,6 @@ resourceLogs: - key: service.framework.version value: stringValue: "5.0" - - key: service.runtime.name - value: - stringValue: cruby - - key: service.runtime.version - value: - stringValue: "2.5" - key: host.os.platform value: stringValue: darwin @@ -1176,6 +1164,15 @@ resourceLogs: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1254,12 +1251,6 @@ resourceLogs: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -1290,12 +1281,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin diff --git a/receiver/elasticapmintakereceiver/testdata/hostdata_expected.yaml b/receiver/elasticapmintakereceiver/testdata/hostdata_expected.yaml index 523c99edf..f5a7ea88d 100644 --- a/receiver/elasticapmintakereceiver/testdata/hostdata_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/hostdata_expected.yaml @@ -6,7 +6,13 @@ resourceSpans: stringValue: SampleAspNetCoreApp - key: telemetry.sdk.language value: - stringValue: dotnet + stringValue: C# + - key: process.runtime.name + value: + stringValue: .NET 8 + - key: process.runtime.version + value: + stringValue: 8.0.5 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -28,9 +34,6 @@ resourceSpans: - key: agent.version value: stringValue: 1.30.2-canary.0.4+3386ba62c316b311cf1da30278ce927a6735f2ce - - key: service.language.name - value: - stringValue: C# - key: agent.activation_method value: stringValue: nuget @@ -40,12 +43,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 8.0.0.0 - - key: service.runtime.name - value: - stringValue: .NET 8 - - key: service.runtime.version - value: - stringValue: 8.0.5 - key: host.hostname value: stringValue: gregs-mbp-2 diff --git a/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml b/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml index 70ae8948e..29c735e37 100644 --- a/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml @@ -10,6 +10,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -85,12 +94,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -118,12 +121,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -175,6 +172,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -250,12 +256,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -283,12 +283,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin diff --git a/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml b/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml index 18cb1915d..238cf6e7b 100644 --- a/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml @@ -9,7 +9,10 @@ resourceSpans: stringValue: 5.1.3 - key: telemetry.sdk.language value: - stringValue: dotnet + stringValue: C# + - key: telemetry.sdk.version + value: + stringValue: "5" - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -34,12 +37,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: C# - - key: service.language.version - value: - stringValue: "5" - key: agent.activation_method value: stringValue: some_activation_method diff --git a/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml b/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml index 99babdd57..afcdd98b7 100644 --- a/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml @@ -9,7 +9,16 @@ resourceLogs: stringValue: 4.3.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -22,12 +31,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -69,12 +72,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: agent.ephemeral_id value: stringValue: e71be9ac-93b0-44b9-a997-5638f6ccfc36 @@ -87,15 +84,12 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux + - key: host.hostname + value: + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental @@ -124,7 +118,16 @@ resourceLogs: stringValue: 4.3.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -137,9 +140,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -181,12 +181,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: agent.ephemeral_id value: stringValue: e71be9ac-93b0-44b9-a997-5638f6ccfc36 @@ -199,21 +193,18 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux - - key: labels.ab_testing + - key: host.hostname value: - stringValue: "true" + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental + - key: labels.ab_testing + value: + stringValue: "true" - key: numeric_labels.segment value: doubleValue: 5 @@ -237,7 +228,16 @@ resourceLogs: stringValue: 4.3.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -250,9 +250,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -294,12 +291,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: agent.ephemeral_id value: stringValue: e71be9ac-93b0-44b9-a997-5638f6ccfc36 @@ -312,15 +303,12 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux + - key: host.hostname + value: + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental @@ -350,7 +338,16 @@ resourceLogs: stringValue: 4.3.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -363,9 +360,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -413,12 +407,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.execution value: stringValue: 6f7f0961f83442118a7af6fe80b88d56 @@ -434,15 +422,12 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux + - key: host.hostname + value: + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental @@ -472,7 +457,16 @@ resourceLogs: stringValue: v1.0.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -485,9 +479,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -535,12 +526,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.execution value: stringValue: 6f7f0961f83442118a7af6fe80b88d56 @@ -556,30 +541,27 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux + - key: host.hostname + value: + stringValue: 8ec7ceb99074 - key: labels.str value: stringValue: str - key: labels.bool value: stringValue: "true" - - key: labels.key with spaces + - key: labels.ab_testing value: - stringValue: value with spaces + stringValue: "true" - key: labels.group value: stringValue: experimental - - key: labels.ab_testing + - key: labels.key with spaces value: - stringValue: "true" + stringValue: value with spaces - key: numeric_labels.float value: doubleValue: 1.1 @@ -631,7 +613,16 @@ resourceLogs: stringValue: v1.0.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -644,9 +635,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -694,12 +682,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.execution value: stringValue: 6f7f0961f83442118a7af6fe80b88d56 @@ -715,18 +697,12 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux - - key: labels.group + - key: host.hostname value: - stringValue: experimental + stringValue: 8ec7ceb99074 - key: labels.ab_testing value: stringValue: "true" @@ -736,15 +712,18 @@ resourceLogs: - key: labels.bool value: stringValue: "true" + - key: labels.group + value: + stringValue: experimental + - key: numeric_labels.segment + value: + doubleValue: 5 - key: numeric_labels.int value: doubleValue: 1 - key: numeric_labels.float value: doubleValue: 1.1 - - key: numeric_labels.segment - value: - doubleValue: 5 scopeLogs: - logRecords: - attributes: @@ -787,7 +766,16 @@ resourceLogs: stringValue: v1.0.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -800,9 +788,6 @@ resourceLogs: - key: service.instance.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -850,12 +835,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.execution value: stringValue: 6f7f0961f83442118a7af6fe80b88d56 @@ -871,27 +850,24 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux - - key: labels.str - value: - stringValue: str - - key: labels.bool + - key: host.hostname value: - stringValue: "true" + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental - key: labels.ab_testing value: stringValue: "true" + - key: labels.str + value: + stringValue: str + - key: labels.bool + value: + stringValue: "true" - key: numeric_labels.segment value: doubleValue: 5 @@ -943,7 +919,16 @@ resourceLogs: stringValue: v1.0.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -956,9 +941,6 @@ resourceLogs: - key: service.instance.id value: stringValue: svc-node-name - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -1009,12 +991,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.trigger.request_id value: stringValue: request-id-xyz789 @@ -1033,21 +1009,18 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux - - key: labels.group + - key: host.hostname value: - stringValue: experimental + stringValue: 8ec7ceb99074 - key: labels.ab_testing value: stringValue: "true" + - key: labels.group + value: + stringValue: experimental - key: numeric_labels.segment value: doubleValue: 5 @@ -1093,7 +1066,16 @@ resourceLogs: stringValue: v1.0.0 - key: telemetry.sdk.language value: - stringValue: java + stringValue: Java + - key: telemetry.sdk.version + value: + stringValue: 10.0.2 + - key: process.runtime.name + value: + stringValue: Java + - key: process.runtime.version + value: + stringValue: 10.0.2 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1106,9 +1088,6 @@ resourceLogs: - key: service.instance.id value: stringValue: svc-node-name - - key: host.hostname - value: - stringValue: 8ec7ceb99074 - key: host.name value: stringValue: host1 @@ -1159,12 +1138,6 @@ resourceLogs: - key: agent.version value: stringValue: 1.10.0 - - key: service.language.name - value: - stringValue: Java - - key: service.language.version - value: - stringValue: 10.0.2 - key: faas.trigger.request_id value: stringValue: request-id-xyz789 @@ -1183,15 +1156,12 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: service.runtime.name - value: - stringValue: Java - - key: service.runtime.version - value: - stringValue: 10.0.2 - key: host.os.platform value: stringValue: Linux + - key: host.hostname + value: + stringValue: 8ec7ceb99074 - key: labels.group value: stringValue: experimental diff --git a/receiver/elasticapmintakereceiver/testdata/metricsets_expected.yaml b/receiver/elasticapmintakereceiver/testdata/metricsets_expected.yaml index eb9c92685..f8bc745fc 100644 --- a/receiver/elasticapmintakereceiver/testdata/metricsets_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/metricsets_expected.yaml @@ -25,9 +25,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: node-1 - - key: service.language.name - value: - stringValue: ecmascript - key: service.name value: stringValue: 1234_service-12a3 @@ -93,9 +90,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: node-1 - - key: service.language.name - value: - stringValue: ecmascript - key: service.name value: stringValue: 1234_service-12a3 @@ -124,16 +118,16 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpuacct.total.ns + name: system.process.cgroup.cpu.stats.throttled.ns - gauge: dataPoints: - - asDouble: 1024 + - asDouble: 2048 attributes: - key: processor.event value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.cfs.period.us + name: system.process.cgroup.cpuacct.id - gauge: dataPoints: - asDouble: 2048 @@ -142,16 +136,16 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.id + name: system.process.cgroup.cpuacct.total.ns - gauge: dataPoints: - - asDouble: 2048 + - asDouble: 1024 attributes: - key: processor.event value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.cfs.quota.us + name: system.process.cgroup.cpu.cfs.period.us - gauge: dataPoints: - asDouble: 2048 @@ -160,7 +154,7 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.stats.periods + name: system.process.cgroup.cpu.id - gauge: dataPoints: - asDouble: 2048 @@ -169,7 +163,7 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.stats.throttled.periods + name: system.process.cgroup.cpu.cfs.quota.us - gauge: dataPoints: - asDouble: 2048 @@ -178,7 +172,7 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpu.stats.throttled.ns + name: system.process.cgroup.cpu.stats.periods - gauge: dataPoints: - asDouble: 2048 @@ -187,7 +181,7 @@ resourceMetrics: value: stringValue: metric timeUnixNano: "1496170421367000000" - name: system.process.cgroup.cpuacct.id + name: system.process.cgroup.cpu.stats.throttled.periods scope: {} - resource: attributes: @@ -215,9 +209,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: node-1 - - key: service.language.name - value: - stringValue: ecmascript - key: service.name value: stringValue: 1234_service-12a3 @@ -292,9 +283,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: node-1 - - key: service.language.name - value: - stringValue: ecmascript - key: service.name value: stringValue: 1234_service-12a3 @@ -407,9 +395,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: node-1 - - key: service.language.name - value: - stringValue: ecmascript - key: service.name value: stringValue: 1234_service-12a3 diff --git a/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml b/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml index 3ff0d631b..ec5cf5daf 100644 --- a/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml @@ -10,6 +10,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -82,12 +91,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -115,12 +118,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -202,6 +199,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node.js + - key: process.runtime.version + value: + stringValue: 1.2.3 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -274,12 +280,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -307,12 +307,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.0.0 - - key: service.runtime.name - value: - stringValue: node.js - - key: service.runtime.version - value: - stringValue: 1.2.3 - key: service.origin.id value: stringValue: 1234567890abcdef @@ -389,6 +383,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -461,12 +464,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -494,12 +491,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -573,6 +564,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -645,12 +645,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -678,12 +672,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -748,6 +736,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -820,12 +817,6 @@ resourceSpans: - key: agent.version value: stringValue: "2.2" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -856,12 +847,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1076,6 +1061,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1148,12 +1142,6 @@ resourceSpans: - key: agent.version value: stringValue: "2.2" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -1184,12 +1172,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1400,6 +1382,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1472,12 +1463,6 @@ resourceSpans: - key: agent.version value: stringValue: "2.2" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -1508,12 +1493,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1729,6 +1708,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1801,12 +1789,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -1834,12 +1816,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1930,6 +1906,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -2002,12 +1987,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -2035,12 +2014,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -2151,6 +2124,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -2223,12 +2205,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -2256,12 +2232,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin diff --git a/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml b/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml index 29e0bf516..a4154838a 100644 --- a/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml @@ -10,6 +10,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -85,12 +94,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -118,12 +121,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -193,6 +190,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: "7.0" - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -274,12 +280,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -307,12 +307,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: "7.0" - key: host.os.platform value: stringValue: darwin @@ -331,12 +325,12 @@ resourceSpans: - key: labels.tag4 value: stringValue: "false" - - key: numeric_labels.tag3 - value: - doubleValue: 12.45 - key: numeric_labels.tag2 value: doubleValue: 12 + - key: numeric_labels.tag3 + value: + doubleValue: 12.45 scopeSpans: - scope: {} spans: @@ -408,6 +402,17 @@ resourceSpans: value: kvlistValue: values: + - key: User-Agent + value: + arrayValue: + values: + - stringValue: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36 + - stringValue: Mozilla Chrome Edge + - key: Content-Type + value: + arrayValue: + values: + - stringValue: text/html - key: Cookie value: arrayValue: @@ -425,17 +430,6 @@ resourceSpans: - stringValue: foo - stringValue: bar - stringValue: baz - - key: User-Agent - value: - arrayValue: - values: - - stringValue: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36 - - stringValue: Mozilla Chrome Edge - - key: Content-Type - value: - arrayValue: - values: - - stringValue: text/html - key: http.request.env value: kvlistValue: @@ -453,19 +447,22 @@ resourceSpans: value: kvlistValue: values: + - key: c1 + value: + stringValue: v1 - key: c2 value: stringValue: v2 - key: c3 value: doubleValue: 3 - - key: c1 - value: - stringValue: v1 - key: http.request.body.original value: kvlistValue: values: + - key: str + value: + stringValue: hello world - key: additional value: kvlistValue: @@ -476,9 +473,6 @@ resourceSpans: - key: req value: stringValue: additional information - - key: str - value: - stringValue: hello world - key: http.request.referrer value: stringValue: http://localhost:8000/test/e2e/ @@ -547,6 +541,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ruby + - key: telemetry.sdk.version + value: + stringValue: "2.5" + - key: process.runtime.name + value: + stringValue: cruby + - key: process.runtime.version + value: + stringValue: "2.5" - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -622,12 +625,6 @@ resourceSpans: - key: agent.version value: stringValue: "2.2" - - key: service.language.name - value: - stringValue: ruby - - key: service.language.version - value: - stringValue: "2.5" - key: cloud.account.name value: stringValue: account_name @@ -658,12 +655,6 @@ resourceSpans: - key: service.framework.version value: stringValue: "5.0" - - key: service.runtime.name - value: - stringValue: cruby - - key: service.runtime.version - value: - stringValue: "2.5" - key: host.os.platform value: stringValue: darwin @@ -768,6 +759,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -843,12 +843,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.account.name value: stringValue: account_name @@ -876,12 +870,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -971,6 +959,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1058,12 +1055,6 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: cloud.origin.account.id value: stringValue: abc123 @@ -1109,12 +1100,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: service.origin.id value: stringValue: abc123 diff --git a/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml b/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml index d359012cc..e564ec675 100644 --- a/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml @@ -7,6 +7,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: javascript + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -70,36 +79,24 @@ resourceSpans: - key: agent.version value: stringValue: "1.3" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: javascript - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com - - key: labels.organization_uuid - value: - stringValue: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 - key: labels.bool_error value: stringValue: "false" + - key: labels.organization_uuid + value: + stringValue: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 - key: numeric_labels.number_code value: doubleValue: 2 @@ -171,6 +168,16 @@ resourceSpans: value: kvlistValue: values: + - key: Cookie + value: + arrayValue: + values: + - stringValue: c1=v1,c2=v2,c3=3 + - key: Some-Other-Header + value: + arrayValue: + values: + - stringValue: foo - key: Array value: arrayValue: @@ -188,29 +195,19 @@ resourceSpans: arrayValue: values: - stringValue: text/html - - key: Cookie - value: - arrayValue: - values: - - stringValue: c1=v1,c2=v2,c3=3 - - key: Some-Other-Header - value: - arrayValue: - values: - - stringValue: foo - key: http.request.env value: kvlistValue: values: - - key: SERVER_SOFTWARE - value: - stringValue: nginx - key: GATEWAY_INTERFACE value: stringValue: CGI/1.1 - key: SOME_NUMERIC_VALUE value: doubleValue: 123 + - key: SERVER_SOFTWARE + value: + stringValue: nginx - key: http.request.cookies value: kvlistValue: @@ -228,19 +225,19 @@ resourceSpans: value: kvlistValue: values: - - key: str - value: - stringValue: hello world - key: additional value: kvlistValue: values: - - key: bar - value: - doubleValue: 123 - key: req value: stringValue: additional information + - key: bar + value: + doubleValue: 123 + - key: str + value: + stringValue: hello world - key: http.request.referrer value: stringValue: http://localhost:8000/test/e2e/ @@ -330,6 +327,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -384,24 +390,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -555,6 +549,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -609,24 +612,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -685,6 +676,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -739,24 +739,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -818,6 +806,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -872,24 +869,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -950,6 +935,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1004,24 +998,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1079,6 +1061,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1133,24 +1124,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1205,6 +1184,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1259,24 +1247,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin @@ -1334,6 +1310,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: javascript + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -1388,24 +1373,12 @@ resourceSpans: - key: agent.version value: stringValue: "1.3" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: javascript - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin diff --git a/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml b/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml index d79593140..f350ab185 100644 --- a/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml @@ -7,6 +7,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: javascript + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -64,33 +73,21 @@ resourceSpans: - key: agent.version value: stringValue: "1.3" - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: javascript - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin - - key: labels.organization_uuid - value: - stringValue: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 - key: labels.bool_error value: stringValue: "false" + - key: labels.organization_uuid + value: + stringValue: 9f0e9d64-c185-4d21-a6f4-4673ed561ec8 - key: numeric_labels.number_code value: doubleValue: 2 @@ -162,16 +159,6 @@ resourceSpans: value: kvlistValue: values: - - key: Cookie - value: - arrayValue: - values: - - stringValue: c1=v1,c2=v2,c3=3 - - key: Some-Other-Header - value: - arrayValue: - values: - - stringValue: foo - key: Array value: arrayValue: @@ -189,19 +176,29 @@ resourceSpans: arrayValue: values: - stringValue: text/html + - key: Cookie + value: + arrayValue: + values: + - stringValue: c1=v1,c2=v2,c3=3 + - key: Some-Other-Header + value: + arrayValue: + values: + - stringValue: foo - key: http.request.env value: kvlistValue: values: + - key: GATEWAY_INTERFACE + value: + stringValue: CGI/1.1 - key: SOME_NUMERIC_VALUE value: doubleValue: 123 - key: SERVER_SOFTWARE value: stringValue: nginx - - key: GATEWAY_INTERFACE - value: - stringValue: CGI/1.1 - key: http.request.cookies value: kvlistValue: @@ -321,6 +318,15 @@ resourceSpans: - key: telemetry.sdk.language value: stringValue: ecmascript + - key: telemetry.sdk.version + value: + stringValue: "8" + - key: process.runtime.name + value: + stringValue: node + - key: process.runtime.version + value: + stringValue: 8.0.0 - key: telemetry.sdk.name value: stringValue: ElasticAPM @@ -375,24 +381,12 @@ resourceSpans: - key: agent.version value: stringValue: 3.14.0 - - key: service.language.name - value: - stringValue: ecmascript - - key: service.language.version - value: - stringValue: "8" - key: service.framework.name value: stringValue: Express - key: service.framework.version value: stringValue: 1.2.3 - - key: service.runtime.name - value: - stringValue: node - - key: service.runtime.version - value: - stringValue: 8.0.0 - key: host.os.platform value: stringValue: darwin From f8ffc61c6ed48dbf6f238c0236fa8412af26546c Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Wed, 4 Mar 2026 06:15:51 -0800 Subject: [PATCH 2/3] [processor/elasticapmprocessor] Align ECS translation with semconv for language/runtime attributes Replace legacy service.language.* and service.runtime.* support with semconv equivalents (telemetry.sdk.*, process.runtime.*) in the elasticapmprocessor ECS translation. --- internal/elasticattr/attributes.go | 6 --- .../internal/ecs/ecs_translation.go | 11 ++-- .../internal/ecs/ecs_translation_test.go | 52 +++++++++++++++++++ .../testdata/ecs/elastic_log/output.yaml | 8 +-- .../testdata/ecs/elastic_metric/output.yaml | 24 ++++----- .../testdata/ecs/elastic_span_db/output.yaml | 8 +-- 6 files changed, 76 insertions(+), 33 deletions(-) diff --git a/internal/elasticattr/attributes.go b/internal/elasticattr/attributes.go index 1161723b4..cc140df51 100644 --- a/internal/elasticattr/attributes.go +++ b/internal/elasticattr/attributes.go @@ -43,12 +43,6 @@ const ( FaaSTriggerRequestID = "faas.trigger.request_id" HostHostName = "host.hostname" HostOSPlatform = "host.os.platform" - ProcessRuntimeName = "process.runtime.name" - ProcessRuntimeVersion = "process.runtime.version" - ServiceLanguageName = "service.language.name" - ServiceLanguageVersion = "service.language.version" - ServiceRuntimeName = "service.runtime.name" - ServiceRuntimeVersion = "service.runtime.version" ServiceOriginID = "service.origin.id" ServiceOriginName = "service.origin.name" ServiceOriginVersion = "service.origin.version" diff --git a/processor/elasticapmprocessor/internal/ecs/ecs_translation.go b/processor/elasticapmprocessor/internal/ecs/ecs_translation.go index 99d5410fd..d86475907 100644 --- a/processor/elasticapmprocessor/internal/ecs/ecs_translation.go +++ b/processor/elasticapmprocessor/internal/ecs/ecs_translation.go @@ -21,10 +21,11 @@ import ( "strconv" "strings" - "github.com/elastic/opentelemetry-collector-components/internal/elasticattr" "go.opentelemetry.io/collector/pdata/pcommon" semconv26 "go.opentelemetry.io/otel/semconv/v1.26.0" semconv "go.opentelemetry.io/otel/semconv/v1.27.0" + + "github.com/elastic/opentelemetry-collector-components/internal/elasticattr" ) // Supported ECS resource attributes @@ -181,12 +182,8 @@ func isSupportedAttribute(attr string) bool { string(semconv.ServiceVersionKey), string(semconv.ServiceInstanceIDKey), string(semconv.ServiceNamespaceKey), - elasticattr.ServiceLanguageName, - elasticattr.ServiceLanguageVersion, elasticattr.ServiceFrameworkName, elasticattr.ServiceFrameworkVersion, - elasticattr.ServiceRuntimeName, - elasticattr.ServiceRuntimeVersion, elasticattr.ServiceOriginID, elasticattr.ServiceOriginName, elasticattr.ServiceOriginVersion, @@ -256,8 +253,8 @@ func isSupportedAttribute(attr string) bool { string(semconv.ProcessExecutableNameKey), string(semconv.ProcessCommandLineKey), string(semconv.ProcessExecutablePathKey), - elasticattr.ProcessRuntimeName, - elasticattr.ProcessRuntimeVersion, + string(semconv.ProcessRuntimeNameKey), + string(semconv.ProcessRuntimeVersionKey), string(semconv.ProcessOwnerKey): return true diff --git a/processor/elasticapmprocessor/internal/ecs/ecs_translation_test.go b/processor/elasticapmprocessor/internal/ecs/ecs_translation_test.go index 3bad27525..7947e165e 100644 --- a/processor/elasticapmprocessor/internal/ecs/ecs_translation_test.go +++ b/processor/elasticapmprocessor/internal/ecs/ecs_translation_test.go @@ -117,6 +117,58 @@ func TestTranslateResourceMetadata(t *testing.T) { wantKey: "labels.x_y_z_w", wantAbsent: `x.y*z"w`, }, + { + name: "supported telemetry sdk language", + inputKey: string(semconv.TelemetrySDKLanguageKey), + inputVal: "dotnet", + wantKey: string(semconv.TelemetrySDKLanguageKey), + }, + { + name: "supported telemetry sdk version", + inputKey: string(semconv.TelemetrySDKVersionKey), + inputVal: "8.0.0", + wantKey: string(semconv.TelemetrySDKVersionKey), + }, + { + name: "supported process runtime name", + inputKey: string(semconv.ProcessRuntimeNameKey), + inputVal: "node", + wantKey: string(semconv.ProcessRuntimeNameKey), + }, + { + name: "supported process runtime version", + inputKey: string(semconv.ProcessRuntimeVersionKey), + inputVal: "20.11.1", + wantKey: string(semconv.ProcessRuntimeVersionKey), + }, + { + name: "legacy service language name moved to labels", + inputKey: "service.language.name", + inputVal: "ecmascript", + wantKey: "labels.service_language_name", + wantAbsent: "service.language.name", + }, + { + name: "legacy service language version moved to labels", + inputKey: "service.language.version", + inputVal: "20", + wantKey: "labels.service_language_version", + wantAbsent: "service.language.version", + }, + { + name: "legacy service runtime name moved to labels", + inputKey: "service.runtime.name", + inputVal: "node", + wantKey: "labels.service_runtime_name", + wantAbsent: "service.runtime.name", + }, + { + name: "legacy service runtime version moved to labels", + inputKey: "service.runtime.version", + inputVal: "20.11.1", + wantKey: "labels.service_runtime_version", + wantAbsent: "service.runtime.version", + }, } for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml index c68430729..0794f4a8d 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml @@ -44,10 +44,10 @@ resourceLogs: - key: service.namespace value: stringValue: production - - key: service.language.name + - key: labels.service_language_name value: stringValue: go - - key: service.language.version + - key: labels.service_language_version value: stringValue: 1.21.0 - key: service.framework.name @@ -56,10 +56,10 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.9.0 - - key: service.runtime.name + - key: labels.service_runtime_name value: stringValue: go - - key: service.runtime.version + - key: labels.service_runtime_version value: stringValue: go1.21.0 - key: service.origin.id diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml index b00f2d2a3..f1ca1167e 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml @@ -179,6 +179,18 @@ resourceMetrics: - key: labels.other_value value: stringValue: foo + - key: labels.service_language_name + value: + stringValue: go + - key: labels.service_language_version + value: + stringValue: 1.21.0 + - key: labels.service_runtime_name + value: + stringValue: go + - key: labels.service_runtime_version + value: + stringValue: go1.21.0 - key: labels.unsupported_key value: stringValue: foo @@ -257,12 +269,6 @@ resourceMetrics: - key: service.instance.id value: stringValue: instance-123 - - key: service.language.name - value: - stringValue: go - - key: service.language.version - value: - stringValue: 1.21.0 - key: service.name value: stringValue: test-service @@ -278,12 +284,6 @@ resourceMetrics: - key: service.origin.version value: stringValue: 2.0.0 - - key: service.runtime.name - value: - stringValue: go - - key: service.runtime.version - value: - stringValue: go1.21.0 - key: service.target.name value: stringValue: target-service diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml index 8b46a1855..5f06ada74 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml @@ -41,10 +41,10 @@ resourceSpans: - key: service.namespace value: stringValue: production - - key: service.language.name + - key: labels.service_language_name value: stringValue: go - - key: service.language.version + - key: labels.service_language_version value: stringValue: 1.21.0 - key: service.framework.name @@ -53,10 +53,10 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.9.0 - - key: service.runtime.name + - key: labels.service_runtime_name value: stringValue: go - - key: service.runtime.version + - key: labels.service_runtime_version value: stringValue: go1.21.0 - key: service.origin.id From 5e6a9cefb2c23573671f3f6b7626cbb94d853f5b Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Thu, 5 Mar 2026 13:06:19 -0800 Subject: [PATCH 3/3] [receiver/elasticapmintake][processor/elasticapmprocessor] Update to map `host.os.platform` to semconv `os.type` This is required since the `connector/elasticapm` expects the semconv representation --- internal/elasticattr/attributes.go | 1 - .../internal/ecs/ecs_translation.go | 3 +- .../testdata/ecs/elastic_log/input.yaml | 4 -- .../testdata/ecs/elastic_log/output.yaml | 3 - .../testdata/ecs/elastic_metric/input.yaml | 4 -- .../testdata/ecs/elastic_metric/output.yaml | 3 - .../testdata/ecs/elastic_span_db/input.yaml | 4 -- .../testdata/ecs/elastic_span_db/output.yaml | 3 - .../intakeV2ToElasticSpecificFields.go | 3 - .../internal/mappers/intakeV2ToSemConv.go | 1 + .../testdata/errors_expected.yaml | 30 +++++----- .../testdata/invalid_ids_expected.yaml | 12 ++-- .../language_name_mapping_expected.yaml | 6 +- .../testdata/logs_expected.yaml | 54 ++++++++--------- .../testdata/spans_expected.yaml | 60 +++++++++---------- .../testdata/transactions_expected.yaml | 30 +++++----- .../testdata/transactions_spans_expected.yaml | 54 ++++++++--------- .../testdata/unknown-span-type_expected.yaml | 12 ++-- 18 files changed, 131 insertions(+), 156 deletions(-) diff --git a/internal/elasticattr/attributes.go b/internal/elasticattr/attributes.go index cc140df51..ca5971a68 100644 --- a/internal/elasticattr/attributes.go +++ b/internal/elasticattr/attributes.go @@ -42,7 +42,6 @@ const ( FaaSExecution = "faas.execution" FaaSTriggerRequestID = "faas.trigger.request_id" HostHostName = "host.hostname" - HostOSPlatform = "host.os.platform" ServiceOriginID = "service.origin.id" ServiceOriginName = "service.origin.name" ServiceOriginVersion = "service.origin.version" diff --git a/processor/elasticapmprocessor/internal/ecs/ecs_translation.go b/processor/elasticapmprocessor/internal/ecs/ecs_translation.go index d86475907..94eb17f6a 100644 --- a/processor/elasticapmprocessor/internal/ecs/ecs_translation.go +++ b/processor/elasticapmprocessor/internal/ecs/ecs_translation.go @@ -243,8 +243,7 @@ func isSupportedAttribute(attr string) bool { string(semconv.HostIDKey), string(semconv.HostTypeKey), string(semconv.HostArchKey), - string(semconv.HostIPKey), - elasticattr.HostOSPlatform: + string(semconv.HostIPKey): return true // process.* diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_log/input.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_log/input.yaml index 89e8d2b7c..40f5415ba 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_log/input.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_log/input.yaml @@ -189,10 +189,6 @@ resourceLogs: - key: host.arch value: stringValue: amd64 - # host.* elastic attributes - - key: host.os.platform - value: - stringValue: linux # process.* attributes - key: process.pid value: diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml index 0794f4a8d..78280fecd 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_log/output.yaml @@ -179,9 +179,6 @@ resourceLogs: - key: host.arch value: stringValue: amd64 - - key: host.os.platform - value: - stringValue: linux - key: process.pid value: intValue: "12345" diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/input.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/input.yaml index 01281e4df..6c8463f02 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/input.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/input.yaml @@ -186,10 +186,6 @@ resourceMetrics: - key: host.arch value: stringValue: amd64 - # host.* elastic attributes - - key: host.os.platform - value: - stringValue: linux # process.* attributes - key: process.pid value: diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml index f1ca1167e..5edc94042 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_metric/output.yaml @@ -145,9 +145,6 @@ resourceMetrics: - key: host.name value: stringValue: node-1 - - key: host.os.platform - value: - stringValue: linux - key: host.type value: stringValue: t3.medium diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/input.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/input.yaml index 4474f6e40..b75561028 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/input.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/input.yaml @@ -189,10 +189,6 @@ resourceSpans: - key: host.arch value: stringValue: amd64 - # host.* elastic attributes - - key: host.os.platform - value: - stringValue: linux # process.* attributes - key: process.pid value: diff --git a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml index 5f06ada74..bf5323a01 100644 --- a/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml +++ b/processor/elasticapmprocessor/testdata/ecs/elastic_span_db/output.yaml @@ -179,9 +179,6 @@ resourceSpans: - key: host.arch value: stringValue: amd64 - - key: host.os.platform - value: - stringValue: linux - key: process.pid value: intValue: "12345" diff --git a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go index 5746252f5..ac84db101 100644 --- a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go +++ b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToElasticSpecificFields.go @@ -421,9 +421,6 @@ func SetElasticSpecificResourceAttributes(event *modelpb.APMEvent, attributesMap } if event.Host != nil { - if event.Host.Os != nil { - putNonEmptyStr(attributesMap, elasticattr.HostOSPlatform, event.Host.Os.Platform) - } putNonEmptyStr(attributesMap, elasticattr.HostHostName, event.Host.Hostname) } diff --git a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go index 3a698bec0..bc81dca8a 100644 --- a/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go +++ b/receiver/elasticapmintakereceiver/internal/mappers/intakeV2ToSemConv.go @@ -56,6 +56,7 @@ func TranslateToOtelResourceAttributes(event *modelpb.APMEvent, attributes pcomm putNonEmptyStr(attributes, string(semconv.HostArchKey), event.Host.Architecture) if event.Host.Os != nil { putNonEmptyStr(attributes, string(semconv.OSNameKey), event.Host.Os.Name) + putNonEmptyStr(attributes, string(semconv.OSTypeKey), event.Host.Os.Platform) putNonEmptyStr(attributes, string(semconv.OSVersionKey), event.Host.Os.Version) } } diff --git a/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml b/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml index bcf029261..6fdaf5596 100644 --- a/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/errors_expected.yaml @@ -34,6 +34,9 @@ resourceLogs: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: user_agent.original value: stringValue: Mozilla Chrome Edge @@ -139,9 +142,6 @@ resourceLogs: - key: service.origin.version value: stringValue: 1.0.0 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: myhostname @@ -683,6 +683,9 @@ resourceLogs: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -773,9 +776,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: myhostname @@ -857,6 +857,9 @@ resourceLogs: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -947,9 +950,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: myhostname @@ -1022,6 +1022,9 @@ resourceLogs: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1112,9 +1115,6 @@ resourceLogs: - key: service.framework.version value: stringValue: "5.0" - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: myhostname @@ -1191,6 +1191,9 @@ resourceLogs: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1281,9 +1284,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: myhostname diff --git a/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml b/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml index 29c735e37..47a81719e 100644 --- a/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/invalid_ids_expected.yaml @@ -34,6 +34,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -121,9 +124,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: labels.tag1 value: stringValue: one @@ -196,6 +196,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -283,9 +286,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: labels.tag1 value: stringValue: one diff --git a/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml b/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml index 238cf6e7b..171b7f772 100644 --- a/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/language_name_mapping_expected.yaml @@ -28,6 +28,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -40,9 +43,6 @@ resourceSpans: - key: agent.activation_method value: stringValue: some_activation_method - - key: host.os.platform - value: - stringValue: darwin scopeSpans: - scope: {} spans: diff --git a/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml b/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml index afcdd98b7..7e1c4b13d 100644 --- a/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/logs_expected.yaml @@ -37,6 +37,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -84,9 +87,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -146,6 +146,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -193,9 +196,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -256,6 +256,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -303,9 +306,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -366,6 +366,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -422,9 +425,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -485,6 +485,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -541,9 +544,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -641,6 +641,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -697,9 +700,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -794,6 +794,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -850,9 +853,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -947,6 +947,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -1009,9 +1012,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 @@ -1094,6 +1094,9 @@ resourceLogs: - key: host.arch value: stringValue: amd64 + - key: os.type + value: + stringValue: Linux - key: container.id value: stringValue: 8ec7ceb990749e79b37f6dc6cd3628633618d6ce412553a552a0fa6b69419ad4 @@ -1156,9 +1159,6 @@ resourceLogs: - key: service.framework.version value: stringValue: 5.0.0 - - key: host.os.platform - value: - stringValue: Linux - key: host.hostname value: stringValue: 8ec7ceb99074 diff --git a/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml b/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml index ec5cf5daf..77d3dc972 100644 --- a/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/spans_expected.yaml @@ -31,6 +31,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -118,9 +121,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -220,6 +220,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -316,9 +319,6 @@ resourceSpans: - key: service.origin.version value: stringValue: 1.0.0 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -404,6 +404,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -491,9 +494,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -585,6 +585,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -672,9 +675,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -757,6 +757,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -847,9 +850,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1082,6 +1082,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1172,9 +1175,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1403,6 +1403,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1493,9 +1496,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1729,6 +1729,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1816,9 +1819,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1927,6 +1927,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -2014,9 +2017,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -2145,6 +2145,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -2232,9 +2235,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com diff --git a/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml b/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml index a4154838a..674754e47 100644 --- a/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/transactions_expected.yaml @@ -34,6 +34,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -121,9 +124,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -214,6 +214,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: user_agent.original value: stringValue: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36, Mozilla Chrome Edge @@ -307,9 +310,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -565,6 +565,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -655,9 +658,6 @@ resourceSpans: - key: service.framework.version value: stringValue: "5.0" - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -783,6 +783,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -870,9 +873,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -983,6 +983,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: cloud.provider value: stringValue: cloud_provider @@ -1109,9 +1112,6 @@ resourceSpans: - key: service.origin.version value: stringValue: "1.0" - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com diff --git a/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml b/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml index e564ec675..23696079e 100644 --- a/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/transactions_spans_expected.yaml @@ -31,6 +31,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: user_agent.original value: stringValue: Mozilla Chrome Edge @@ -85,9 +88,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -348,6 +348,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -396,9 +399,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -570,6 +570,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -618,9 +621,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -697,6 +697,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -745,9 +748,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -827,6 +827,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -875,9 +878,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -956,6 +956,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -1004,9 +1007,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1082,6 +1082,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -1130,9 +1133,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1205,6 +1205,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -1253,9 +1256,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com @@ -1331,6 +1331,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -1379,9 +1382,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: host.hostname value: stringValue: prod1.example.com diff --git a/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml b/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml index f350ab185..567dd1812 100644 --- a/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml +++ b/receiver/elasticapmintakereceiver/testdata/unknown-span-type_expected.yaml @@ -31,6 +31,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: user_agent.original value: stringValue: Mozilla Chrome Edge @@ -79,9 +82,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: labels.bool_error value: stringValue: "false" @@ -339,6 +339,9 @@ resourceSpans: - key: host.arch value: stringValue: x64 + - key: os.type + value: + stringValue: darwin - key: container.id value: stringValue: container-id @@ -387,9 +390,6 @@ resourceSpans: - key: service.framework.version value: stringValue: 1.2.3 - - key: host.os.platform - value: - stringValue: darwin - key: labels.span_tag value: stringValue: something