Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions translator/translate/otel/exporter/awsxray/translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{}{
Expand Down
59 changes: 47 additions & 12 deletions translator/translate/otel/exporter/awsxray/translator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading