Added support for transaction.name in an error object to the intake API (#6539)

* Added support for transaction.name to the intake API

* Added #6539 to the changelog

* Improved Changelog

(cherry picked from commit fe1db82)

Author: tobiasstadler

changelogs/head.asciidoc

@@ -36,6 +36,7 @@ https://github.com/elastic/apm-server/compare/7.15\...master[View commits]
 - `context.message.routing_key` was added to the intake API {pull}6177[6177]
 - `transaction.dropped_spans_stats` was added to the intake API {pull}6200[6200]
 - map incoming OTel spans from agent bridges to apm spans/transactions {pull}6308[6308]
+- `transaction.name` was added to the error objects in the intake API {pull}6539[6539]
 
 [float]
 ==== Added

docs/spec/rumv3/error.json

@@ -695,6 +695,14 @@
         "object"
       ],
       "properties": {
+        "n": {
+          "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.",
+          "type": [
+            "null",
+            "string"
+          ],
+          "maxLength": 1024
+        },
         "sm": {
           "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.",
           "type": [

docs/spec/v2/error.json

@@ -1096,6 +1096,14 @@
         "object"
       ],
       "properties": {
+        "name": {
+          "description": "Name is the generic designation of a transaction in the scope of a single service, eg: 'GET /users/:id'.",
+          "type": [
+            "null",
+            "string"
+          ],
+          "maxLength": 1024
+        },
         "sampled": {
           "description": "Sampled indicates whether or not the full information for a transaction is captured. If a transaction is unsampled no spans and less context information will be reported.",
           "type": [

model/modeldecoder/rumv3/decoder.go

@@ -249,6 +249,9 @@ func mapToErrorModel(from *errorEvent, event *model.APMEvent) {
 		if from.Transaction.Sampled.IsSet() {
 			event.Transaction.Sampled = from.Transaction.Sampled.Val
 		}
+		if from.Transaction.Name.IsSet() {
+			event.Transaction.Name = from.Transaction.Name.Val
+		}
 		if from.Transaction.Type.IsSet() {
 			event.Transaction.Type = from.Transaction.Type.Val
 		}

model/modeldecoder/rumv3/error_test.go

@@ -201,4 +201,12 @@ func TestDecodeMapToErrorModel(t *testing.T) {
 		mapToErrorModel(&input, &out)
 		assert.Equal(t, "123", out.Error.Exception.Code)
 	})
+
+	t.Run("transaction-name", func(t *testing.T) {
+		var input errorEvent
+		var out model.APMEvent
+		input.Transaction.Name.Set("My Transaction")
+		mapToErrorModel(&input, &out)
+		assert.Equal(t, "My Transaction", out.Transaction.Name)
+	})
 }

model/modeldecoder/rumv3/model.go

@@ -233,6 +233,9 @@ type errorTransactionRef struct {
 	// is captured. If a transaction is unsampled no spans and less context
 	// information will be reported.
 	Sampled nullable.Bool `json:"sm"`
+	// Name is the generic designation of a transaction in the scope of a
+	// single service, eg: 'GET /users/:id'.
+	Name nullable.String `json:"n" validate:"maxLength=1024"`
 	// Type expresses the correlated transaction's type as keyword that has
 	// specific relevance within the service's domain,
 	// eg: 'request', 'backgroundjob'.

model/modeldecoder/rumv3/model_generated.go

@@ -396,6 +396,9 @@ func mapToErrorModel(from *errorEvent, event *model.APMEvent) {
 		if from.Transaction.Sampled.IsSet() {
 			event.Transaction.Sampled = from.Transaction.Sampled.Val
 		}
+		if from.Transaction.Name.IsSet() {
+			event.Transaction.Name = from.Transaction.Name.Val
+		}
 		if from.Transaction.Type.IsSet() {
 			event.Transaction.Type = from.Transaction.Type.Val
 		}

model/modeldecoder/v2/decoder.go

@@ -197,4 +197,12 @@ func TestDecodeMapToErrorModel(t *testing.T) {
 		mapToErrorModel(&input, &out)
 		assert.Equal(t, "123", out.Error.Exception.Code)
 	})
+
+	t.Run("transaction-name", func(t *testing.T) {
+		var input errorEvent
+		var out model.APMEvent
+		input.Transaction.Name.Set("My Transaction")
+		mapToErrorModel(&input, &out)
+		assert.Equal(t, "My Transaction", out.Transaction.Name)
+	})
 }

model/modeldecoder/v2/error_test.go

@@ -398,6 +398,9 @@ type errorTransactionRef struct {
 	// is captured. If a transaction is unsampled no spans and less context
 	// information will be reported.
 	Sampled nullable.Bool `json:"sampled"`
+	// Name is the generic designation of a transaction in the scope of a
+	// single service, eg: 'GET /users/:id'.
+	Name nullable.String `json:"name" validate:"maxLength=1024"`
 	// Type expresses the correlated transaction's type as keyword that has
 	// specific relevance within the service's domain,
 	// eg: 'request', 'backgroundjob'.