7.x revert breaking commit, go 1.16.5 update, beats update (#5590)

* Revert "[7.x] Update to elastic/beats@2871d29be93a (backport #5454) (#5589)"

This reverts commit 4269aee.

* Update go version to 1.16.5

* Update to elastic/beats@9361be46ebf2

* update tests to new ecs version

* fix broken test due to elastic/beats#25219

* update python tests to new ecs version

* make update

Co-authored-by: Andrew Wilkins <[email protected]>

Author: simitt

NOTICE.txt

@@ -73,6 +73,12 @@
   type: keyword
   description: Cloud region name
   ignore_above: 1024
+- name: cloud.service.name
+  level: extended
+  type: keyword
+  description: |
+    Cloud service name, intended to distinguish services running on different platforms within a provider.
+  ignore_above: 1024
 - name: container.id
   type: keyword
   description: |

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

@@ -1,9 +1,3 @@
-- name: cloud.service.name
-  level: extended
-  type: keyword
-  description: |
-    Cloud service name, intended to distinguish services running on different platforms within a provider.
-  ignore_above: 1024
 - name: experimental
   type: object
   description: Additional experimental data sent by the agents.

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

@@ -73,6 +73,12 @@
   type: keyword
   description: Cloud region name
   ignore_above: 1024
+- name: cloud.service.name
+  level: extended
+  type: keyword
+  description: |
+    Cloud service name, intended to distinguish services running on different platforms within a provider.
+  ignore_above: 1024
 - name: container.id
   type: keyword
   description: |

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

@@ -1,9 +1,3 @@
-- name: cloud.service.name
-  level: extended
-  type: keyword
-  description: |
-    Cloud service name, intended to distinguish services running on different platforms within a provider.
-  ignore_above: 1024
 - name: error.culprit
   type: keyword
   description: Function call which was the primary perpetrator of this event.

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

@@ -73,6 +73,12 @@
   type: keyword
   description: Cloud region name
   ignore_above: 1024
+- name: cloud.service.name
+  level: extended
+  type: keyword
+  description: |
+    Cloud service name, intended to distinguish services running on different platforms within a provider.
+  ignore_above: 1024
 - name: container.id
   type: keyword
   description: |

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

@@ -1,9 +1,3 @@
-- name: cloud.service.name
-  level: extended
-  type: keyword
-  description: |
-    Cloud service name, intended to distinguish services running on different platforms within a provider.
-  ignore_above: 1024
 - name: experimental
   type: object
   description: Additional experimental data sent by the agents.

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

@@ -73,6 +73,12 @@
   type: keyword
   description: Cloud region name
   ignore_above: 1024
+- name: cloud.service.name
+  level: extended
+  type: keyword
+  description: |
+    Cloud service name, intended to distinguish services running on different platforms within a provider.
+  ignore_above: 1024
 - name: container.id
   type: keyword
   description: |

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

@@ -1,9 +1,3 @@
-- name: cloud.service.name
-  level: extended
-  type: keyword
-  description: |
-    Cloud service name, intended to distinguish services running on different platforms within a provider.
-  ignore_above: 1024
 - name: experimental
   type: object
   description: Additional experimental data sent by the agents.

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

@@ -73,6 +73,12 @@
   type: keyword
   description: Cloud region name
   ignore_above: 1024
+- name: cloud.service.name
+  level: extended
+  type: keyword
+  description: |
+    Cloud service name, intended to distinguish services running on different platforms within a provider.
+  ignore_above: 1024
 - name: container.id
   type: keyword
   description: |