Review feedback

Author: dgieselaar

x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx

@@ -71,6 +71,9 @@ export class Plugin {
     );
 
     // create static index pattern and store as saved object. Not needed by APM UI but for legacy reasons in Discover, Dashboard etc.
-    createStaticIndexPattern(core.http);
+    createStaticIndexPattern(core.http).catch(e => {
+      // eslint-disable-next-line no-console
+      console.log('Error fetching static index pattern', e);
+    });
   }
 }

x-pack/legacy/plugins/apm/server/lib/apm_telemetry/index.ts

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Server } from 'hapi';
 import { countBy } from 'lodash';
 import { SavedObjectAttributes } from 'src/core/server';
 import { isAgentName } from '../../../common/agent_name';
@@ -13,15 +12,7 @@ import {
   APM_SERVICES_TELEMETRY_SAVED_OBJECT_TYPE,
   APM_SERVICES_TELEMETRY_SAVED_OBJECT_ID
 } from '../../../common/apm_saved_object_constants';
-
-type ServerWithUsageCollector = Server & {
-  usage: {
-    collectorSet: {
-      makeUsageCollector: (options: unknown) => unknown;
-      register: (options: unknown) => unknown;
-    };
-  };
-};
+import { APMLegacyServer } from '../../routes/typings';
 
 export function createApmTelementry(
   agentNames: string[] = []
@@ -34,7 +25,7 @@ export function createApmTelementry(
 }
 
 export async function storeApmServicesTelemetry(
-  server: ServerWithUsageCollector,
+  server: APMLegacyServer,
   apmTelemetry: SavedObjectAttributes
 ) {
   try {
@@ -52,7 +43,7 @@ export async function storeApmServicesTelemetry(
   }
 }
 
-export function makeApmUsageCollector(server: ServerWithUsageCollector) {
+export function makeApmUsageCollector(server: APMLegacyServer) {
   const apmUsageCollector = server.usage.collectorSet.makeUsageCollector({
     type: 'apm',
     fetch: async () => {

x-pack/legacy/plugins/apm/server/lib/helpers/saved_objects_client.ts

@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Server } from 'hapi';
+import { APMLegacyServer } from '../../routes/typings';
 
-export function getInternalSavedObjectsClient(server: Server) {
+export function getInternalSavedObjectsClient(server: APMLegacyServer) {
   const { SavedObjectsClient, getSavedObjectsRepository } = server.savedObjects;
   const { callWithInternalUser } = server.plugins.elasticsearch.getCluster(
     'admin'

x-pack/legacy/plugins/apm/server/routes/index_pattern.ts

@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import * as t from 'io-ts';
-import Boom from 'boom';
 import { createStaticIndexPattern } from '../lib/index_pattern/create_static_index_pattern';
 import { createRoute } from './create_route';
 import { setupRequest } from '../lib/helpers/setup_request';
@@ -17,7 +16,7 @@ export const staticIndexPatternRoute = createRoute(() => ({
     await createStaticIndexPattern(setup, context);
 
     // send empty response regardless of outcome
-    throw Boom.notFound();
+    return undefined;
   }
 }));
 

x-pack/legacy/plugins/apm/server/routes/typings.ts

@@ -49,14 +49,26 @@ export interface Route<
   }) => Promise<TReturn>;
 }
 
+export type APMLegacyServer = Pick<Server, 'usage' | 'savedObjects' | 'log'> & {
+  usage: {
+    collectorSet: {
+      makeUsageCollector: (options: unknown) => unknown;
+      register: (options: unknown) => unknown;
+    };
+  };
+  plugins: {
+    elasticsearch: Server['plugins']['elasticsearch'];
+  };
+};
+
 export type APMRequestHandlerContext<
   TDecodedParams extends { [key in keyof Params]: any } = {}
 > = RequestHandlerContext & {
   params: { query: { _debug: boolean } } & TDecodedParams;
   config: APMConfig;
   logger: Logger;
   __LEGACY: {
-    server: Server;
+    server: APMLegacyServer;
   };
 };