From d4fa5edafdd1fa4473fb982f06b624719c3ea2cb Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 1 Apr 2020 12:39:24 +0200
Subject: [PATCH] [APM] Ensure telemetry data matches SO/telemetry mapping
 (#61957)

* [APM] Ensure telemetry data matches SO/telemetry mapping

Closes #61802.

* Correct mapping for dotnet data
---
 x-pack/legacy/plugins/apm/mappings.json                   | 8 ++++++++
 .../lib/apm_telemetry/collect_data_telemetry/tasks.ts     | 2 +-
 x-pack/plugins/apm/server/lib/apm_telemetry/types.ts      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/apm/mappings.json b/x-pack/legacy/plugins/apm/mappings.json
index 1e906dd2a5967..6ca9f13792085 100644
--- a/x-pack/legacy/plugins/apm/mappings.json
+++ b/x-pack/legacy/plugins/apm/mappings.json
@@ -33,9 +33,17 @@
                   },
                   "language": {
                     "properties": {
+                      "composite": {
+                        "type": "keyword",
+                        "ignore_above": 1024
+                      },
                       "name": {
                         "type": "keyword",
                         "ignore_above": 1024
+                      },
+                      "version": {
+                        "type": "keyword",
+                        "ignore_above": 1024
                       }
                     }
                   },
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index 415076b6ae116..85f233de2086d 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -236,7 +236,7 @@ export const tasks: TelemetryTask[] = [
         .map(part => Number(part));
 
       return {
-        versions: {
+        version: {
           apm_server: {
             major,
             minor,
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
index f68dc517a2227..14807d50f3c31 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts
@@ -18,7 +18,7 @@ export type TimeframeMapAll = Pick<TimeframeMap, 'all'>;
 export type APMDataTelemetry = DeepPartial<{
   has_any_services: boolean;
   services_per_agent: Record<AgentName, number>;
-  versions: {
+  version: {
     apm_server: {
       minor: number;
       major: number;