From 4f5d1433ef05c6637e067e44ecf192aae3f6835f Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Tue, 13 Jan 2026 10:31:20 -0800 Subject: [PATCH 1/2] Support span event by default when application_signals is enabled --- .../otel/exporter/awsxray/translator.go | 1 + .../otel/exporter/awsxray/translator_test.go | 59 +++++++++++++++---- 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/translator/translate/otel/exporter/awsxray/translator.go b/translator/translate/otel/exporter/awsxray/translator.go index dbecebfa37..bc4c5bc0b5 100644 --- a/translator/translate/otel/exporter/awsxray/translator.go +++ b/translator/translate/otel/exporter/awsxray/translator.go @@ -66,6 +66,7 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { if isAppSignals(conf) { cfg.IndexedAttributes = indexedAttributes + cfg.TransitSpansInOtlpFormat = true } c := confmap.NewFromStringMap(map[string]interface{}{ diff --git a/translator/translate/otel/exporter/awsxray/translator_test.go b/translator/translate/otel/exporter/awsxray/translator_test.go index 18d5d58486..8ed254073a 100644 --- a/translator/translate/otel/exporter/awsxray/translator_test.go +++ b/translator/translate/otel/exporter/awsxray/translator_test.go @@ -80,10 +80,11 @@ func TestTranslator(t *testing.T) { "aws.remote.resource.identifier", "aws.remote.resource.type", }, - "certificate_file_path": "/ca/bundle", - "region": "us-east-1", - "role_arn": "global_arn", - "imds_retries": 1, + "certificate_file_path": "/ca/bundle", + "region": "us-east-1", + "role_arn": "global_arn", + "imds_retries": 1, + "transit_spans_in_otlp_format": true, "telemetry": map[string]any{ "enabled": true, "include_metadata": true, @@ -111,10 +112,11 @@ func TestTranslator(t *testing.T) { "aws.remote.resource.identifier", "aws.remote.resource.type", }, - "certificate_file_path": "/ca/bundle", - "region": "us-east-1", - "role_arn": "global_arn", - "imds_retries": 1, + "certificate_file_path": "/ca/bundle", + "region": "us-east-1", + "role_arn": "global_arn", + "imds_retries": 1, + "transit_spans_in_otlp_format": true, "telemetry": map[string]any{ "enabled": true, "include_metadata": true, @@ -142,10 +144,43 @@ func TestTranslator(t *testing.T) { "aws.remote.resource.identifier", "aws.remote.resource.type", }, - "certificate_file_path": "/ca/bundle", - "region": "us-east-1", - "role_arn": "global_arn", - "imds_retries": 1, + "certificate_file_path": "/ca/bundle", + "region": "us-east-1", + "role_arn": "global_arn", + "imds_retries": 1, + "transit_spans_in_otlp_format": true, + "telemetry": map[string]any{ + "enabled": true, + "include_metadata": true, + }, + "middleware": "agenthealth/traces", + }), + mode: config.ModeEC2, + }, + "WithAppSignalsAndTransitOtlpOverrideFalse": { + input: map[string]any{ + "traces": map[string]any{ + "traces_collected": map[string]any{ + "app_signals": map[string]any{}, + }, + "transit_spans_in_otlp_format": false, + }}, + want: confmap.NewFromStringMap(map[string]any{ + "indexed_attributes": []string{ + "aws.local.service", + "aws.local.operation", + "aws.local.environment", + "aws.remote.service", + "aws.remote.operation", + "aws.remote.environment", + "aws.remote.resource.identifier", + "aws.remote.resource.type", + }, + "certificate_file_path": "/ca/bundle", + "region": "us-east-1", + "role_arn": "global_arn", + "imds_retries": 1, + "transit_spans_in_otlp_format": false, "telemetry": map[string]any{ "enabled": true, "include_metadata": true, From 98cee6175296aa7fa15551e2a33f99ac8d8ad68c Mon Sep 17 00:00:00 2001 From: Vastin <3690049+vastin@users.noreply.github.com> Date: Tue, 13 Jan 2026 12:58:39 -0800 Subject: [PATCH 2/2] fix unit test --- .../tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml | 1 + .../tocwconfig/sampleConfig/appsignals_and_eks_config.yaml | 1 + .../tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml | 1 + translator/tocwconfig/sampleConfig/base_appsignals_config.yaml | 1 + .../tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml index b87e7eb9e8..649f721c3a 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml @@ -159,6 +159,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/logs: is_usage_data_enabled: true diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml index 6cfea39dde..39a5409250 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_and_eks_config.yaml @@ -270,6 +270,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/logs: is_usage_data_enabled: true diff --git a/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml index 6cfea39dde..39a5409250 100644 --- a/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml +++ b/translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.yaml @@ -270,6 +270,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/logs: is_usage_data_enabled: true diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml index 1a1c202cf0..daa2dec82d 100644 --- a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml @@ -163,6 +163,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true debug/application_signals: sampling_initial: 2 sampling_thereafter: 500 diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml index 942d0414a3..15d9061562 100644 --- a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml +++ b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml @@ -163,6 +163,7 @@ exporters: telemetry: enabled: true include_metadata: true + transit_spans_in_otlp_format: true extensions: agenthealth/logs: is_usage_data_enabled: true