model: Align labels field with ECS

apmpackage/apm/data_stream/app_metrics/fields/ecs.yml

@@ -68,12 +68,13 @@
   name: host.name
 - external: ecs
   name: host.os.platform
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: observer.hostname
 - external: ecs

apmpackage/apm/data_stream/app_metrics/fields/fields.yml

@@ -248,3 +248,8 @@
                 The total virtual memory the process has.
               metric_type: gauge
               unit: byte
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/app_metrics/manifest.yml

@@ -16,3 +16,8 @@ elasticsearch:
         - histogram:
             mapping:
               type: histogram
+        - numeric_labels:
+            path_match: numeric_labels.*
+            mapping:
+              type: scaled_float
+              scaling_factor: 1000000

apmpackage/apm/data_stream/error_logs/fields/ecs.yml

@@ -76,12 +76,13 @@
   name: http.response.status_code
 - external: ecs
   name: http.version
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: message
 - external: ecs

apmpackage/apm/data_stream/error_logs/fields/fields.yml

@@ -224,3 +224,8 @@
       type: keyword
       description: |
         Keyword of specific relevance in the service's domain (eg. 'request', 'backgroundjob', etc)
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/error_logs/manifest.yml

@@ -10,3 +10,9 @@ elasticsearch:
       # ad-hoc searches on HTTP request headers without incurring storage cost
       # for users who do not need this capability.
       dynamic: false
+      dynamic_templates:
+        - numeric_labels:
+            path_match: numeric_labels.*
+            mapping:
+              type: scaled_float
+              scaling_factor: 1000000

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

@@ -68,12 +68,13 @@
   name: host.name
 - external: ecs
   name: host.os.platform
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: observer.hostname
 - external: ecs

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

@@ -203,3 +203,8 @@
       type: keyword
       description: |
         Keyword of specific relevance in the service's domain (eg. 'request', 'backgroundjob', etc)
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/profile_metrics/fields/ecs.yml

@@ -58,12 +58,13 @@
   name: host.name
 - external: ecs
   name: host.os.platform
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: observer.hostname
 - external: ecs

apmpackage/apm/data_stream/profile_metrics/fields/fields.yml

@@ -200,3 +200,8 @@
           type: keyword
           description: |
             Version of the runtime used.
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/profile_metrics/manifest.yml

@@ -8,3 +8,9 @@ elasticsearch:
       # Profile metrics currently must be dynamically
       # mapped, as pprof metric names may be customised.
       dynamic: true
+      dynamic_templates:
+        - numeric_labels:
+            path_match: numeric_labels.*
+            mapping:
+              type: scaled_float
+              scaling_factor: 1000000

apmpackage/apm/data_stream/rum_traces/fields/ecs.yml

@@ -76,12 +76,13 @@
   name: http.response.status_code
 - external: ecs
   name: http.version
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: observer.hostname
 - external: ecs

apmpackage/apm/data_stream/rum_traces/fields/fields.yml

@@ -420,3 +420,8 @@
       type: keyword
       description: |
         Keyword of specific relevance in the service's domain (eg. 'request', 'backgroundjob', etc)
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/rum_traces/manifest.yml

@@ -10,3 +10,9 @@ elasticsearch:
       # ad-hoc searches on HTTP request headers without incurring storage cost
       # for users who do not need this capability.
       dynamic: false
+      dynamic_templates:
+        - numeric_labels:
+            path_match: numeric_labels.*
+            mapping:
+              type: scaled_float
+              scaling_factor: 1000000

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

@@ -76,12 +76,13 @@
   name: http.response.status_code
 - external: ecs
   name: http.version
-# TODO: change labels to be ECS compliant in 8.0 (https://github.com/elastic/apm-server/issues/3873)
+# Ideally, we'd reference the ecs field "labels" and set the dynamic field to
+# true to overwrite any settings that might be set at the data stream level.
 - name: labels
   type: object
-  description: |
-    A flat mapping of user-defined labels with string, boolean or number values.
   dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels.
 - external: ecs
   name: observer.hostname
 - external: ecs

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

@@ -420,3 +420,8 @@
       type: keyword
       description: |
         Keyword of specific relevance in the service's domain (eg. 'request', 'backgroundjob', etc)
+- name: numeric_labels
+  type: object
+  dynamic: true
+  description: |
+    Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float.

apmpackage/apm/data_stream/traces/manifest.yml

@@ -10,3 +10,9 @@ elasticsearch:
       # ad-hoc searches on HTTP request headers without incurring storage cost
       # for users who do not need this capability.
       dynamic: false
+      dynamic_templates:
+        - numeric_labels:
+            path_match: numeric_labels.*
+            mapping:
+              type: scaled_float
+              scaling_factor: 1000000

apmpackage/apm/docs/README.md

@@ -113,13 +113,14 @@ Traces are written to `traces-apm-*` data streams, except for RUM traces, which
 | kubernetes.node.name | Kubernetes node name | keyword |
 | kubernetes.pod.name | Kubernetes pod name | keyword |
 | kubernetes.pod.uid | Kubernetes Pod UID | keyword |
-| labels | A flat mapping of user-defined labels with string, boolean or number values. | object |
+| labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels. | object |
 | network.carrier.icc | ISO country code, eg. US | keyword |
 | network.carrier.mcc | Mobile country code | keyword |
 | network.carrier.mnc | Mobile network code | keyword |
 | network.carrier.name | Carrier name, eg. Vodafone, T-Mobile, etc. | keyword |
 | network.connection.subtype | Detailed network connection sub-type, e.g. "LTE", "CDMA" | keyword |
 | network.connection.type | Network connection type, eg. "wifi", "cell" | keyword |
+| numeric_labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float. | object |
 | observer.ephemeral_id | Ephemeral identifier of the APM Server. | keyword |
 | observer.hostname | Hostname of the observer. | keyword |
 | observer.id | Unique identifier of the APM Server. | keyword |
@@ -265,9 +266,10 @@ Application metrics are written to service-specific `metrics-apm.app.*-*` data s
 | kubernetes.node.name | Kubernetes node name | keyword |  |  |
 | kubernetes.pod.name | Kubernetes pod name | keyword |  |  |
 | kubernetes.pod.uid | Kubernetes Pod UID | keyword |  |  |
-| labels | A flat mapping of user-defined labels with string, boolean or number values. | object |  |  |
+| labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels. | object |  |  |
 | metricset.name | Name of the set of metrics. | keyword |  |  |
 | network.connection.type | Network connection type, eg. "wifi", "cell" | keyword |  |  |
+| numeric_labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float. | object |  |  |
 | observer.ephemeral_id | Ephemeral identifier of the APM Server. | keyword |  |  |
 | observer.hostname | Hostname of the observer. | keyword |  |  |
 | observer.id | Unique identifier of the APM Server. | keyword |  |  |
@@ -380,9 +382,10 @@ Internal metrics are written to `metrics-apm.internal-*` data streams.
 | kubernetes.node.name | Kubernetes node name | keyword |  |
 | kubernetes.pod.name | Kubernetes pod name | keyword |  |
 | kubernetes.pod.uid | Kubernetes Pod UID | keyword |  |
-| labels | A flat mapping of user-defined labels with string, boolean or number values. | object |  |
+| labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels. | object |  |
 | metricset.name | Name of the set of metrics. | keyword |  |
 | network.connection.type | Network connection type, eg. "wifi", "cell" | keyword |  |
+| numeric_labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float. | object |  |
 | observer.ephemeral_id | Ephemeral identifier of the APM Server. | keyword |  |
 | observer.hostname | Hostname of the observer. | keyword |  |
 | observer.id | Unique identifier of the APM Server. | keyword |  |
@@ -513,14 +516,15 @@ Application errors are written to `logs-apm.error.*` data stream.
 | kubernetes.node.name | Kubernetes node name | keyword |
 | kubernetes.pod.name | Kubernetes pod name | keyword |
 | kubernetes.pod.uid | Kubernetes Pod UID | keyword |
-| labels | A flat mapping of user-defined labels with string, boolean or number values. | object |
+| labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as keyword. Example: `docker` and `k8s` labels. | object |
 | message | For log events the message field contains the log message, optimized for viewing in a log viewer. For structured logs without an original message field, other fields can be concatenated to form a human-readable summary of the event. If multiple messages exist, they can be combined into one message. | match_only_text |
 | network.carrier.icc | ISO country code, eg. US | keyword |
 | network.carrier.mcc | Mobile country code | keyword |
 | network.carrier.mnc | Mobile network code | keyword |
 | network.carrier.name | Carrier name, eg. Vodafone, T-Mobile, etc. | keyword |
 | network.connection.subtype | Detailed network connection sub-type, e.g. "LTE", "CDMA" | keyword |
 | network.connection.type | Network connection type, eg. "wifi", "cell" | keyword |
+| numeric_labels | Custom key/value pairs. Can be used to add meta information to events. Should not contain nested objects. All values are stored as scaled_float. | object |
 | observer.ephemeral_id | Ephemeral identifier of the APM Server. | keyword |
 | observer.hostname | Hostname of the observer. | keyword |
 | observer.id | Unique identifier of the APM Server. | keyword |

beater/beater_test.go

@@ -182,7 +182,7 @@ func newTestBeater(
 					if event.Labels == nil {
 						event.Labels = common.MapStr{}
 					}
-					event.Labels["wrapped_reporter"] = true
+					event.Labels["wrapped_reporter"] = "true"
 				}
 				return nil
 			}

beater/test_approved_es_documents/TestPublishIntegrationEvents.approved.json

@@ -210,12 +210,14 @@
                 }
             },
             "labels": {
-                "ab_testing": true,
+                "ab_testing": "true",
                 "group": "experimental",
-                "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8",
-                "segment": 5
+                "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8"
             },
             "message": "Request method 'POST' not supported",
+            "numeric_labels": {
+                "segment": 5
+            },
             "observer": {
                 "ephemeral_id": "00000000-0000-0000-0000-000000000000",
                 "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",
@@ -343,8 +345,10 @@
                 }
             },
             "labels": {
-                "ab_testing": true,
-                "group": "experimental",
+                "ab_testing": "true",
+                "group": "experimental"
+            },
+            "numeric_labels": {
                 "segment": 5
             },
             "observer": {
@@ -540,11 +544,13 @@
                 }
             },
             "labels": {
-                "ab_testing": true,
+                "ab_testing": "true",
                 "group": "experimental",
                 "organization_uuid": "9f0e9d64-c185-4d21-a6f4-4673ed561ec8",
-                "segment": 5,
-                "wrapped_reporter": true
+                "wrapped_reporter": "true"
+            },
+            "numeric_labels": {
+                "segment": 5
             },
             "observer": {
                 "ephemeral_id": "00000000-0000-0000-0000-000000000000",
@@ -677,13 +683,15 @@
                 }
             },
             "labels": {
-                "ab_testing": true,
-                "code": 200,
+                "ab_testing": "true",
                 "group": "experimental",
-                "segment": 5,
-                "success": true
+                "success": "true"
             },
             "metricset.name": "span_breakdown",
+            "numeric_labels": {
+                "code": 200,
+                "segment": 5
+            },
             "observer": {
                 "ephemeral_id": "00000000-0000-0000-0000-000000000000",
                 "id": "fbba762a-14dd-412c-b7e9-b79f903eb492",