[APM] Ensure correct encoding of body in callApi

x-pack/legacy/plugins/apm/public/services/__test__/callApi.test.ts

@@ -20,6 +20,9 @@ describe('callApi', () => {
     http = ({
       get: jest.fn().mockReturnValue({
         my_key: 'hello_world'
+      }),
+      post: jest.fn().mockReturnValue({
+        my_key: 'hello_world'
       })
     } as unknown) as HttpMock;
 
@@ -32,6 +35,54 @@ describe('callApi', () => {
     clearCache();
   });
 
+  describe('encoding', () => {
+    describe('when getting', () => {
+      it('it should correctly encode the request parameters', async () => {
+        await callApi(http, {
+          pathname: `/api/kibana`,
+          query: { start: '2010', end: '2011' }
+        });
+
+        expect(http.get).toHaveBeenCalledTimes(1);
+
+        expect(http.get).toHaveBeenCalledWith('/api/kibana', {
+          query: {
+            start: '2010',
+            end: '2011'
+          }
+        });
+      });
+    });
+    describe('when posting', () => {
+      it('it should correctly encode the request parameters', async () => {
+        await callApi(http, {
+          method: 'POST',
+          pathname: `/api/kibana`,
+          query: { start: '2010', end: '2011' },
+          body: {
+            foo: {
+              bar: 1
+            }
+          }
+        });
+
+        expect(http.post).toHaveBeenCalledTimes(1);
+
+        expect(http.post).toHaveBeenCalledWith('/api/kibana', {
+          query: {
+            start: '2010',
+            end: '2011'
+          },
+          body: JSON.stringify({
+            foo: {
+              bar: 1
+            }
+          })
+        });
+      });
+    });
+  });
+
   describe('apm_debug', () => {
     beforeEach(() => {
       sessionStorage.setItem('apm_debug', 'true');

x-pack/legacy/plugins/apm/public/services/rest/callApi.ts

@@ -9,21 +9,24 @@ import LRU from 'lru-cache';
 import hash from 'object-hash';
 import { HttpServiceBase, HttpFetchOptions } from 'kibana/public';
 
-export type FetchOptions = HttpFetchOptions & {
+export type FetchOptions = Omit<HttpFetchOptions, 'body'> & {
   pathname: string;
   forceCache?: boolean;
   method?: string;
+  body?: object;
 };
 
 function fetchOptionsWithDebug(fetchOptions: FetchOptions) {
   const debugEnabled =
     sessionStorage.getItem('apm_debug') === 'true' &&
     startsWith(fetchOptions.pathname, '/api/apm');
 
-  const isGet = !fetchOptions.method || fetchOptions.method === 'GET';
+  const isGetRequest = !fetchOptions.method || fetchOptions.method === 'GET';
+
+  const { body, ...rest } = fetchOptions;
 
   // Need an empty body to pass route validation
-  const body = isGet
+  const bodyObject = isGetRequest
     ? {}
     : {
         body: JSON.stringify(
@@ -32,8 +35,8 @@ function fetchOptionsWithDebug(fetchOptions: FetchOptions) {
       };
 
   return {
-    ...fetchOptions,
-    ...body,
+    ...rest,
+    ...bodyObject,
     query: {
       ...fetchOptions.query,
       ...(debugEnabled ? { _debug: true } : {})

x-pack/legacy/plugins/apm/public/services/rest/ml.ts

@@ -61,7 +61,7 @@ export async function startMLJob({
   return callApi<StartedMLJobApiResponse>(http, {
     method: 'POST',
     pathname: `/api/ml/modules/setup/apm_transaction`,
-    body: JSON.stringify({
+    body: {
       prefix: getMlPrefix(serviceName, transactionType),
       groups,
       indexPatternName: transactionIndices,
@@ -71,7 +71,7 @@ export async function startMLJob({
           filter
         }
       }
-    })
+    }
   });
 }
 

x-pack/legacy/plugins/apm/public/services/rest/watcher.js

@@ -10,6 +10,6 @@ export async function createWatch(id, watch) {
   return callApi({
     method: 'PUT',
     pathname: `/api/watcher/watch/${id}`,
-    body: JSON.stringify({ type: 'json', id, watch })
+    body: { type: 'json', id, watch }
   });
 }