[APM] Use force_synthetic_source in API tests (#144300)

elastic · Nov 1, 2022 · 1acc9a4 · 1acc9a4
1 parent 807b782
commit 1acc9a4
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 34 deletions.
diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/apm/server/index.ts
@@ -54,6 +54,7 @@ const configSchema = schema.object({
     sourcemap: schema.string({ defaultValue: 'apm-*' }),
     onboarding: schema.string({ defaultValue: 'apm-*' }),
   }),
+  forceSyntheticSource: schema.boolean({ defaultValue: false }),
 });
 
 // plugin config

diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts
@@ -54,6 +54,7 @@ describe('APMEventClient', () => {
           indices: {} as any,
           options: {
             includeFrozen: false,
+            forceSyntheticSource: false,
           },
         });
 

diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts
@@ -80,6 +80,7 @@ export interface APMEventClientConfig {
   indices: ApmIndicesConfig;
   options: {
     includeFrozen: boolean;
+    forceSyntheticSource: boolean;
   };
 }
 
@@ -89,13 +90,15 @@ export class APMEventClient {
   private readonly request: KibanaRequest;
   private readonly indices: ApmIndicesConfig;
   private readonly includeFrozen: boolean;
+  private readonly forceSyntheticSource: boolean;
 
   constructor(config: APMEventClientConfig) {
     this.esClient = config.esClient;
     this.debug = config.debug;
     this.request = config.request;
     this.indices = config.indices;
     this.includeFrozen = config.options.includeFrozen;
+    this.forceSyntheticSource = config.options.forceSyntheticSource;
   }
 
   private callAsyncWithDebug<T extends { body: any }>({
@@ -149,11 +152,18 @@ export class APMEventClient {
       this.indices
     );
 
+    const forceSyntheticSourceForThisRequest =
+      this.forceSyntheticSource &&
+      params.apm.events.includes(ProcessorEvent.metric);
+
     const searchParams = {
       ...withProcessorEventFilter,
       ...(this.includeFrozen ? { ignore_throttled: false } : {}),
       ignore_unavailable: true,
       preference: 'any',
+      ...(forceSyntheticSourceForThisRequest
+        ? { force_synthetic_source: true }
+        : {}),
     };
 
     return this.callAsyncWithDebug({

diff --git a/x-pack/plugins/apm/server/lib/helpers/get_apm_event_client.ts b/x-pack/plugins/apm/server/lib/helpers/get_apm_event_client.ts
@@ -36,7 +36,10 @@ export async function getApmEventClient({
       debug: params.query._inspect,
       request,
       indices,
-      options: { includeFrozen },
+      options: {
+        includeFrozen,
+        forceSyntheticSource: config.forceSyntheticSource,
+      },
     });
   });
 }
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
@@ -234,6 +234,7 @@ export class APMPlugin
           indices,
           options: {
             includeFrozen,
+            forceSyntheticSource: currentConfig.forceSyntheticSource,
           },
         });
       },

diff --git a/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json b/x-pack/test/apm_api_integration/common/fixtures/es_archiver/apm_8.0.0/mappings.json
@@ -7196,10 +7196,6 @@
                 "handled": {
                   "type": "boolean"
                 },
-                "message": {
-                  "norms": false,
-                  "type": "text"
-                },
                 "module": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -7232,20 +7228,12 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
-                "message": {
-                  "norms": false,
-                  "type": "text"
-                },
                 "param_message": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 }
               }
             },
-            "message": {
-              "norms": false,
-              "type": "text"
-            },
             "stack_trace": {
               "fields": {
                 "text": {
@@ -8460,10 +8448,6 @@
             }
           }
         },
-        "message": {
-          "norms": false,
-          "type": "text"
-        },
         "metricset": {
           "properties": {
             "name": {

diff --git a/.../test/apm_api_integration/common/fixtures/es_archiver/infra_metrics_and_apm/mappings.json b/.../test/apm_api_integration/common/fixtures/es_archiver/infra_metrics_and_apm/mappings.json
@@ -464,10 +464,6 @@
                 "handled": {
                   "type": "boolean"
                 },
-                "message": {
-                  "norms": false,
-                  "type": "text"
-                },
                 "module": {
                   "ignore_above": 1024,
                   "type": "keyword"
@@ -496,20 +492,12 @@
                   "ignore_above": 1024,
                   "type": "keyword"
                 },
-                "message": {
-                  "norms": false,
-                  "type": "text"
-                },
                 "param_message": {
                   "ignore_above": 1024,
                   "type": "keyword"
                 }
               }
             },
-            "message": {
-              "norms": false,
-              "type": "text"
-            },
             "type": {
               "ignore_above": 1024,
               "type": "keyword"
@@ -1158,10 +1146,6 @@
             }
           }
         },
-        "message": {
-          "norms": false,
-          "type": "text"
-        },
         "network": {
           "properties": {
             "application": {
@@ -17630,4 +17614,4 @@
       }
     }
   }
-}
+}
diff --git a/x-pack/test/apm_api_integration/configs/index.ts b/x-pack/test/apm_api_integration/configs/index.ts
@@ -11,14 +11,21 @@ import { createTestConfig, CreateTestConfig } from '../common/config';
 const apmFtrConfigs = {
   basic: {
     license: 'basic' as const,
+    kibanaConfig: {
+      'xpack.apm.forceSyntheticSource': 'true',
+    },
   },
   trial: {
     license: 'trial' as const,
+    kibanaConfig: {
+      'xpack.apm.forceSyntheticSource': 'true',
+    },
   },
   rules: {
     license: 'trial' as const,
     kibanaConfig: {
       'xpack.ruleRegistry.write.enabled': 'true',
+      'xpack.apm.forceSyntheticSource': 'true',
     },
   },
 };