add faas.{name,verson} to tx + txmetrics (#7427)

Author: stuartnelson3

apmpackage/apm/changelog.yml

@@ -9,6 +9,9 @@
  - description: added `span.links` fields to traces and rum_traces data streams
  type: enhancement
  link: https://github.com/elastic/apm-server/pull/7291
+ - description: Added field mapping for `faas.name` and `faas.version` to internal_metrics data stream
+ type: enhancement
+ link: https://github.com/elastic/apm-server/pull/7427
 - version: "8.1.0"
  changes:
  - description: Added field mapping for `faas.coldstart` and `faas.trigger.type`

apmpackage/apm/data_stream/internal_metrics/fields/fields.yml

@@ -15,6 +15,14 @@
  type: keyword
  description: |
  The trigger type.
+ - name: name
+ type: keyword
+ description: |
+ The lambda function name.
+ - name: version
+ type: keyword
+ description: |
+ The lambda function version.
 - name: kubernetes
  title: Kubernetes
  type: group

apmpackage/apm/data_stream/traces/fields/fields.yml

@@ -55,6 +55,14 @@
  type: keyword
  description: |
  The trigger type.
+ - name: name
+ type: keyword
+ description: |
+ The lambda function name.
+ - name: version
+ type: keyword
+ description: |
+ The lambda function version.
 - name: http
  type: group
  fields:

beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json

@@ -725,8 +725,10 @@
  "faas": {
  "coldstart": false,
  "execution": "2e13b309-23e1-417f-8bf7-074fc96bc683",
+ "name": "faasName",
  "trigger.request_id": "FuH2Cir_vHcEMUA=",
- "trigger.type": "http"
+ "trigger.type": "http",
+ "version": "1.0.0"
  },
  "host": {
  "architecture": "x64",

changelogs/head.asciidoc

@@ -21,6 +21,7 @@ See <<apm-server-configuration>> for more information.
 
 [float]
 ==== Intake API Changes
+- Support for `faas.name` and `faas.version` added to intake and transaction metrics {pull}7427[7427]
 
 [float]
 ==== Added

docs/spec/v2/transaction.json

@@ -833,6 +833,13 @@
  "string"
  ]
  },
+ "name": {
+ "description": "The lambda function name.",
+ "type": [
+ "null",
+ "string"
+ ]
+ },
  "trigger": {
  "description": "Trigger attributes.",
  "type": [
@@ -855,6 +862,13 @@
  ]
  }
  }
+ },
+ "version": {
+ "description": "The lambda function version.",
+ "type": [
+ "null",
+ "string"
+ ]
  }
  }
  },

model/apmevent_test.go

@@ -109,6 +109,8 @@ func TestAPMEventFields(t *testing.T) {
 Execution: "execution",
 TriggerType: "http",
 TriggerRequestID: "abc123",
+Name: "faasName",
+Version: "1.0.0",
 },
 Cloud: Cloud{
 Origin: &CloudOrigin{
@@ -184,6 +186,8 @@ func TestAPMEventFields(t *testing.T) {
 "execution": "execution",
 "trigger.type": "http",
 "trigger.request_id": "abc123",
+"name": "faasName",
+"version": "1.0.0",
 },
 "cloud": common.MapStr{
 "origin": common.MapStr{

model/faas.go

@@ -26,6 +26,8 @@ type FAAS struct {
 Execution string
 TriggerType string
 TriggerRequestID string
+Name string
+Version string
 }
 
 func (f *FAAS) fields() common.MapStr {
@@ -35,5 +37,7 @@ func (f *FAAS) fields() common.MapStr {
 fields.maybeSetString("execution", f.Execution)
 fields.maybeSetString("trigger.type", f.TriggerType)
 fields.maybeSetString("trigger.request_id", f.TriggerRequestID)
+fields.maybeSetString("name", f.Name)
+fields.maybeSetString("version", f.Version)
 return common.MapStr(fields)
 }

model/modeldecoder/rumv3/metadata_test.go

@@ -65,6 +65,8 @@ func metadataExceptions(keys ...string) func(key string) bool {
 "FAAS.Execution",
 "FAAS.TriggerType",
 "FAAS.TriggerRequestID",
+"FAAS.Name",
+"FAAS.Version",
 "Experimental",
 "HTTP",
 "Kubernetes",

model/modeldecoder/v2/decoder.go

@@ -243,6 +243,12 @@ func mapToFAASModel(from faas, faas *model.FAAS) {
 if from.Trigger.RequestID.IsSet() {
 faas.TriggerRequestID = from.Trigger.RequestID.Val
 }
+if from.Name.IsSet() {
+faas.Name = from.Name.Val
+}
+if from.Version.IsSet() {
+faas.Version = from.Version.Val
+}
 }
 }