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

(cherry picked from commit 4ff43c9)

# Conflicts:
#	apmpackage/apm/changelog.yml
#	changelogs/head.asciidoc

apmpackage/apm/changelog.yml

@@ -15,12 +15,15 @@
     - 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
+<<<<<<< HEAD
     - description: removed `observer.version_major` field
       type: enhancement
       link: https://github.com/elastic/apm-server/pull/7399
     - description: added field mapping for `url.original` to traces, rum_traces, app_logs, and error_logs
       type: bugfix
       link: https://github.com/elastic/apm-server/pull/7698
+=======
+>>>>>>> 4ff43c91 (add faas.{name,verson} to tx + txmetrics (#7427))
 - version: "8.1.0"
   changes:
     - description: Added field mapping for `faas.coldstart` and `faas.trigger.type`

changelogs/head.asciidoc

@@ -0,0 +1,34 @@
+[[release-notes-head]]
+== APM version HEAD
+
+https://github.com/elastic/apm-server/compare/8.0\...main[View commits]
+
+Starting in version 8.0.0, {fleet} uses the APM integration to set up and manage APM index templates,
+ILM policies, and ingest pipelines. APM Server will only send data to {es} _after_ the APM integration has been installed.
+See <<apm-server-configuration>> for more information.
+
+[float]
+==== Breaking Changes
+- APM Server now emits events with `event.duration`, and renames the field to `<event>.duration.us` in an ingest pipeline {pull}7261[7261]
+
+[float]
+==== Bug fixes
+- Fix infinite loop in tail-based sampling subscriber causing high CPU and repeated Elasticsearch searches {pull}7211[7211]
+- Do not overwrite `service version` if no transaction/error/... specific `service.name` is givven {pull}7281[7281]
+- Fix panic when processing OpenTelemetry histogram metrics without bounds {pull}7316[7316]
+- Fix mixing of labels across OpenTelemetry log records {pull}7358[7358]
+- Fix waiting for events to be flushed when shutting down APM Server {pull}7352[7352]
+
+[float]
+==== Intake API Changes
+- Support for `faas.name` and `faas.version` added to intake and transaction metrics {pull}7427[7427]
+
+[float]
+==== Added
+- `apm-server` artifacts now have the apm java-attacher.jar packaged alongside them {pull}6593[6593]
+- Run the java attacher jar when configured and not in a cloud environment {pull}6617[6617]
+- Added several dimensions to the aggregated transaction metrics {pull}7033[7033]
+- Implemented translation of OpenTelemetry host system metrics (CPU utilization / Memory usage) {pull}7090[7090]
+- Added support for storing OpenTelemetry span links as `span.links` {pull}7291[7291]
+- seccomp is disabled by default {pull}7308[7308]
+- Added data stream namespace configuration for standalone with `apm-server.data_streams.namespace` {pull}7314[7314]