Support span event by default when application_signals is enabled

Author: vastin

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{}{

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,