Sets up APM with new shared Kibana core context

x-pack/legacy/plugins/apm/public/components/app/GlobalHelpExtension/index.tsx

@@ -10,14 +10,14 @@ import React, { Fragment } from 'react';
 import styled from 'styled-components';
 import url from 'url';
 import { px, units } from '../../../style/variables';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 
 const Container = styled.div`
   margin: ${px(units.minus)} 0;
 `;
 
 export const GlobalHelpExtension: React.SFC = () => {
-  const core = useCore();
+  const core = useKibanaCore();
 
   return (
     <Fragment>

x-pack/legacy/plugins/apm/public/components/app/Main/UpdateBreadcrumbs.tsx

@@ -8,7 +8,7 @@ import { Location } from 'history';
 import { last } from 'lodash';
 import React from 'react';
 import { InternalCoreStart } from 'src/core/public';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 import { getAPMHref } from '../../shared/Links/apm/APMLink';
 import { Breadcrumb, ProvideBreadcrumbs } from './ProvideBreadcrumbs';
 import { routes } from './route_config';
@@ -45,7 +45,7 @@ class UpdateBreadcrumbsComponent extends React.Component<Props> {
 }
 
 export function UpdateBreadcrumbs() {
-  const core = useCore();
+  const core = useKibanaCore();
   return (
     <ProvideBreadcrumbs
       routes={routes}

x-pack/legacy/plugins/apm/public/components/app/Main/__test__/UpdateBreadcrumbs.test.js

@@ -8,7 +8,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { UpdateBreadcrumbs } from '../UpdateBreadcrumbs';
-import * as hooks from '../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 
 jest.mock('ui/kfetch');
 jest.mock('ui/index_patterns');
@@ -20,7 +20,7 @@ const coreMock = {
   }
 };
 
-jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
+jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
 
 function expectBreadcrumbToMatchSnapshot(route) {
   mount(

x-pack/legacy/plugins/apm/public/components/app/Main/useUpdateBadgeEffect.ts

@@ -7,10 +7,10 @@
 import { i18n } from '@kbn/i18n';
 import { useEffect } from 'react';
 import { capabilities } from 'ui/capabilities';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 
 export const useUpdateBadgeEffect = () => {
-  const { chrome } = useCore();
+  const { chrome } = useKibanaCore();
 
   useEffect(() => {
     const uiCapabilities = capabilities.get();

x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/WatcherFlyout.tsx

@@ -32,11 +32,11 @@ import React, { Component } from 'react';
 import styled from 'styled-components';
 import { toastNotifications } from 'ui/notify';
 import { InternalCoreStart } from 'src/core/public';
+import { KibanaCoreContext } from '../../../../../../observability/public';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { KibanaLink } from '../../../shared/Links/KibanaLink';
 import { createErrorGroupWatch, Schedule } from './createErrorGroupWatch';
 import { ElasticDocsLink } from '../../../shared/Links/ElasticDocsLink';
-import { CoreContext } from '../../../../context/CoreContext';
 
 type ScheduleKey = keyof Schedule;
 
@@ -83,7 +83,8 @@ export class WatcherFlyout extends Component<
   WatcherFlyoutProps,
   WatcherFlyoutState
 > {
-  static contextType = CoreContext;
+  static contextType = KibanaCoreContext;
+  context!: React.ContextType<typeof KibanaCoreContext>;
   public state: WatcherFlyoutState = {
     schedule: 'daily',
     threshold: 10,
@@ -156,7 +157,7 @@ export class WatcherFlyout extends Component<
   };
 
   public createWatch = () => {
-    const core: InternalCoreStart = this.context;
+    const core = this.context;
     const { serviceName } = this.props.urlParams;
 
     if (!serviceName) {
@@ -278,7 +279,7 @@ export class WatcherFlyout extends Component<
       return null;
     }
 
-    const core: InternalCoreStart = this.context;
+    const core = this.context;
     const userTimezoneSetting = getUserTimezone(core);
     const dailyTime = this.state.daily;
     const inputTime = `${dailyTime}Z`; // Add tz to make into UTC

x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceIntegrations/index.tsx

@@ -13,13 +13,12 @@ import {
 import { i18n } from '@kbn/i18n';
 import { memoize } from 'lodash';
 import React, { Fragment } from 'react';
-import { InternalCoreStart } from 'src/core/public';
 import { idx } from '@kbn/elastic-idx';
+import { KibanaCoreContext } from '../../../../../../observability/public';
 import { IUrlParams } from '../../../../context/UrlParamsContext/types';
 import { LicenseContext } from '../../../../context/LicenseContext';
 import { MachineLearningFlyout } from './MachineLearningFlyout';
 import { WatcherFlyout } from './WatcherFlyout';
-import { CoreContext } from '../../../../context/CoreContext';
 
 interface Props {
   urlParams: IUrlParams;
@@ -31,7 +30,9 @@ interface State {
 type FlyoutName = null | 'ML' | 'Watcher';
 
 export class ServiceIntegrations extends React.Component<Props, State> {
-  static contextType = CoreContext;
+  static contextType = KibanaCoreContext;
+  context!: React.ContextType<typeof KibanaCoreContext>;
+
   public state: State = { isPopoverOpen: false, activeFlyout: null };
 
   public getPanelItems = memoize((mlAvailable: boolean | undefined) => {
@@ -67,7 +68,7 @@ export class ServiceIntegrations extends React.Component<Props, State> {
   };
 
   public getWatcherPanelItems = () => {
-    const core: InternalCoreStart = this.context;
+    const core = this.context;
 
     return [
       {

x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/__test__/ServiceOverview.test.tsx

@@ -11,7 +11,7 @@ import { toastNotifications } from 'ui/notify';
 import * as callApmApi from '../../../../services/rest/callApmApi';
 import { ServiceOverview } from '..';
 import * as urlParamsHooks from '../../../../hooks/useUrlParams';
-import * as coreHooks from '../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 import * as useLocalUIFilters from '../../../../hooks/useLocalUIFilters';
 import { FETCH_STATUS } from '../../../../hooks/useFetcher';
@@ -39,7 +39,7 @@ describe('Service Overview -> View', () => {
         end: 'myEnd'
       }
     });
-    spyOn(coreHooks, 'useCore').and.returnValue(coreMock);
+    spyOn(kibanaCore, 'useKibanaCore').and.returnValue(coreMock);
 
     jest.spyOn(useLocalUIFilters, 'useLocalUIFilters').mockReturnValue({
       filters: [],

x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/index.tsx

@@ -15,7 +15,7 @@ import { NoServicesMessage } from './NoServicesMessage';
 import { ServiceList } from './ServiceList';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { useTrackPageview } from '../../../../../infra/public';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 import { PROJECTION } from '../../../../common/projections/typings';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { callApmApi } from '../../../services/rest/callApmApi';
@@ -29,7 +29,7 @@ const initalData = {
 let hasDisplayedToast = false;
 
 export function ServiceOverview() {
-  const core = useCore();
+  const core = useKibanaCore();
   const {
     urlParams: { start, end },
     uiFilters

x-pack/legacy/plugins/apm/public/components/shared/KueryBar/index.tsx

@@ -27,7 +27,7 @@ import { useUrlParams } from '../../../hooks/useUrlParams';
 import { history } from '../../../utils/history';
 import { useMatchedRoutes } from '../../../hooks/useMatchedRoutes';
 import { RouteName } from '../../app/Main/route_config/route_names';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 import { getAPMIndexPattern } from '../../../services/rest/savedObjects';
 
 const Container = styled.div`
@@ -86,7 +86,7 @@ function getSuggestions(
 }
 
 export function KueryBar() {
-  const core = useCore();
+  const core = useKibanaCore();
   const [state, setState] = useState<State>({
     indexPattern: null,
     suggestions: [],

x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/DiscoverLink.tsx

@@ -11,7 +11,7 @@ import rison, { RisonValue } from 'rison-node';
 import { useAPMIndexPattern } from '../../../../hooks/useAPMIndexPattern';
 import { useLocation } from '../../../../hooks/useLocation';
 import { getTimepickerRisonData } from '../rison_helpers';
-import { useCore } from '../../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../../observability/public';
 
 interface Props {
   query: {
@@ -31,7 +31,7 @@ interface Props {
 }
 
 export function DiscoverLink({ query = {}, ...rest }: Props) {
-  const core = useCore();
+  const core = useKibanaCore();
   const apmIndexPattern = useAPMIndexPattern();
   const location = useLocation();
 

x-pack/legacy/plugins/apm/public/components/shared/Links/DiscoverLinks/__test__/DiscoverLinks.integration.test.tsx

@@ -14,7 +14,7 @@ import { getRenderedHref } from '../../../../../utils/testHelpers';
 import { DiscoverErrorLink } from '../DiscoverErrorLink';
 import { DiscoverSpanLink } from '../DiscoverSpanLink';
 import { DiscoverTransactionLink } from '../DiscoverTransactionLink';
-import * as hooks from '../../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 
 jest.mock('ui/kfetch');
@@ -34,7 +34,7 @@ beforeAll(() => {
     }
   } as unknown) as InternalCoreStart;
 
-  jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
+  jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
 });
 
 afterAll(() => {

x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.test.tsx

@@ -8,7 +8,7 @@ import { Location } from 'history';
 import React from 'react';
 import { getRenderedHref } from '../../../utils/testHelpers';
 import { InfraLink } from './InfraLink';
-import * as hooks from '../../../hooks/useCore';
+import * as kibanaCore from '../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 
 const coreMock = ({
@@ -19,7 +19,7 @@ const coreMock = ({
   }
 } as unknown) as InternalCoreStart;
 
-jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
+jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
 
 test('InfraLink produces the correct URL', async () => {
   const href = await getRenderedHref(

x-pack/legacy/plugins/apm/public/components/shared/Links/InfraLink.tsx

@@ -9,7 +9,7 @@ import { compact } from 'lodash';
 import React from 'react';
 import url from 'url';
 import { fromQuery } from './url_helpers';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 
 interface InfraQueryParams {
   time?: number;
@@ -24,7 +24,7 @@ interface Props extends EuiLinkAnchorProps {
 }
 
 export function InfraLink({ path, query = {}, ...rest }: Props) {
-  const core = useCore();
+  const core = useKibanaCore();
   const nextSearch = fromQuery(query);
   const href = url.format({
     pathname: core.http.basePath.prepend('/app/infra'),

x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.test.tsx

@@ -8,7 +8,7 @@ import { Location } from 'history';
 import React from 'react';
 import { getRenderedHref } from '../../../utils/testHelpers';
 import { KibanaLink } from './KibanaLink';
-import * as hooks from '../../../hooks/useCore';
+import * as kibanaCore from '../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 
 describe('KibanaLink', () => {
@@ -21,7 +21,7 @@ describe('KibanaLink', () => {
       }
     } as unknown) as InternalCoreStart;
 
-    jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
+    jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
   });
 
   afterEach(() => {

x-pack/legacy/plugins/apm/public/components/shared/Links/KibanaLink.tsx

@@ -7,15 +7,15 @@
 import { EuiLink, EuiLinkAnchorProps } from '@elastic/eui';
 import React from 'react';
 import url from 'url';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 
 interface Props extends EuiLinkAnchorProps {
   path?: string;
   children?: React.ReactNode;
 }
 
 export function KibanaLink({ path, ...rest }: Props) {
-  const core = useCore();
+  const core = useKibanaCore();
   const href = url.format({
     pathname: core.http.basePath.prepend('/app/kibana'),
     hash: path

x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLJobLink.test.tsx

@@ -8,7 +8,7 @@ import { Location } from 'history';
 import React from 'react';
 import { getRenderedHref } from '../../../../utils/testHelpers';
 import { MLJobLink } from './MLJobLink';
-import * as hooks from '../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 
 describe('MLJobLink', () => {
@@ -21,7 +21,7 @@ describe('MLJobLink', () => {
       }
     } as unknown) as InternalCoreStart;
 
-    spyOn(hooks, 'useCore').and.returnValue(coreMock);
+    spyOn(kibanaCore, 'useKibanaCore').and.returnValue(coreMock);
   });
 
   afterEach(() => {

x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.test.tsx

@@ -9,7 +9,7 @@ import React from 'react';
 import { getRenderedHref } from '../../../../utils/testHelpers';
 import { MLLink } from './MLLink';
 import * as savedObjects from '../../../../services/rest/savedObjects';
-import * as hooks from '../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 import { InternalCoreStart } from 'src/core/public';
 
 jest.mock('ui/kfetch');
@@ -22,7 +22,7 @@ const coreMock = ({
   }
 } as unknown) as InternalCoreStart;
 
-jest.spyOn(hooks, 'useCore').mockReturnValue(coreMock);
+jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
 
 jest
   .spyOn(savedObjects, 'getAPMIndexPattern')

x-pack/legacy/plugins/apm/public/components/shared/Links/MachineLearningLinks/MLLink.tsx

@@ -10,7 +10,7 @@ import url from 'url';
 import rison, { RisonValue } from 'rison-node';
 import { useLocation } from '../../../../hooks/useLocation';
 import { getTimepickerRisonData, TimepickerRisonData } from '../rison_helpers';
-import { useCore } from '../../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../../observability/public';
 
 interface MlRisonData {
   ml?: {
@@ -25,7 +25,7 @@ interface Props {
 }
 
 export function MLLink({ children, path = '', query = {} }: Props) {
-  const core = useCore();
+  const core = useKibanaCore();
   const location = useLocation();
 
   const risonQuery: MlRisonData & TimepickerRisonData = getTimepickerRisonData(

x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx

@@ -24,7 +24,7 @@ import { DiscoverTransactionLink } from '../Links/DiscoverLinks/DiscoverTransact
 import { InfraLink } from '../Links/InfraLink';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { fromQuery } from '../Links/url_helpers';
-import { useCore } from '../../../hooks/useCore';
+import { useKibanaCore } from '../../../../../observability/public';
 
 function getInfraMetricsQuery(transaction: Transaction) {
   const plus5 = new Date(transaction['@timestamp']);
@@ -66,7 +66,7 @@ export const TransactionActionMenu: FunctionComponent<Props> = (
 ) => {
   const { transaction } = props;
 
-  const core = useCore();
+  const core = useKibanaCore();
 
   const [isOpen, setIsOpen] = useState(false);
 

x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx

@@ -11,7 +11,7 @@ import { TransactionActionMenu } from '../TransactionActionMenu';
 import { Transaction } from '../../../../../typings/es_schemas/ui/Transaction';
 import * as Transactions from './mockData';
 import * as apmIndexPatternHooks from '../../../../hooks/useAPMIndexPattern';
-import * as coreHoooks from '../../../../hooks/useCore';
+import * as kibanaCore from '../../../../../../observability/public/context/kibana_core';
 import { ISavedObject } from '../../../../services/rest/savedObjects';
 import { InternalCoreStart } from 'src/core/public';
 
@@ -40,7 +40,7 @@ describe('TransactionActionMenu component', () => {
     jest
       .spyOn(apmIndexPatternHooks, 'useAPMIndexPattern')
       .mockReturnValue({ id: 'foo' } as ISavedObject);
-    jest.spyOn(coreHoooks, 'useCore').mockReturnValue(coreMock);
+    jest.spyOn(kibanaCore, 'useKibanaCore').mockReturnValue(coreMock);
   });
 
   afterEach(() => {