[8.12] [ObsUX] Use Profiling locators instead of hardcoded URL (#173246…

…) (#173352) # Backport This will backport the following commits from `main` to `8.12`: - [[ObsUX] Use Profiling locators instead of hardcoded URL (#173246)](#173246)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  Co-authored-by: Mykola Harmash <[email protected]>
elastic · Dec 14, 2023 · 8cdad12 · 8cdad12
1 parent 7b3e657
commit 8cdad12
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 45 deletions.
diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/flamegraph.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/flamegraph.tsx
@@ -8,6 +8,8 @@
 import React, { useMemo } from 'react';
 import { EuiSpacer } from '@elastic/eui';
 import { EmbeddableFlamegraph } from '@kbn/observability-shared-plugin/public';
+import { i18n } from '@kbn/i18n';
+import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
 import { useAssetDetailsRenderPropsContext } from '../../hooks/use_asset_details_render_props';
 import { useDatePickerContext } from '../../hooks/use_date_picker';
 import { useProfilingFlamegraphData } from '../../hooks/use_profiling_flamegraph_data';
@@ -17,11 +19,17 @@ import { ErrorPrompt } from './error_prompt';
 import { ProfilingLinks } from './profiling_links';
 
 export function Flamegraph() {
+  const { services } = useKibanaContextForPlugin();
   const { asset } = useAssetDetailsRenderPropsContext();
   const { activeTabId } = useTabSwitcherContext();
-  const { getDateRangeInTimestamp } = useDatePickerContext();
+  const { dateRange, getDateRangeInTimestamp } = useDatePickerContext();
   const { from, to } = getDateRangeInTimestamp();
 
+  const profilingLinkLocator = services.observabilityShared.locators.profiling.flamegraphLocator;
+  const profilingLinkLabel = i18n.translate('xpack.infra.flamegraph.profilingAppFlamegraphLink', {
+    defaultMessage: 'Go to Universal Profiling Flamegraph',
+  });
+
   const params = useMemo(
     () => ({
       hostname: asset.name,
@@ -41,7 +49,13 @@ export function Flamegraph() {
 
   return (
     <>
-      <ProfilingLinks profilingPath="flamegraphs" hostname={asset.name} />
+      <ProfilingLinks
+        hostname={asset.name}
+        from={dateRange.from}
+        to={dateRange.to}
+        profilingLinkLocator={profilingLinkLocator}
+        profilingLinkLabel={profilingLinkLabel}
+      />
       <EuiSpacer />
       <EmbeddableFlamegraph data={response ?? undefined} isLoading={loading} height="60vh" />
     </>

diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/functions.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/functions.tsx
@@ -8,6 +8,8 @@
 import React, { useMemo } from 'react';
 import { EmbeddableFunctions } from '@kbn/observability-shared-plugin/public';
 import { EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
 import { useAssetDetailsRenderPropsContext } from '../../hooks/use_asset_details_render_props';
 import { useDatePickerContext } from '../../hooks/use_date_picker';
 import { useProfilingFunctionsData } from '../../hooks/use_profiling_functions_data';
@@ -17,11 +19,17 @@ import { ErrorPrompt } from './error_prompt';
 import { ProfilingLinks } from './profiling_links';
 
 export function Functions() {
+  const { services } = useKibanaContextForPlugin();
   const { asset } = useAssetDetailsRenderPropsContext();
   const { activeTabId } = useTabSwitcherContext();
-  const { getDateRangeInTimestamp } = useDatePickerContext();
+  const { dateRange, getDateRangeInTimestamp } = useDatePickerContext();
   const { from, to } = getDateRangeInTimestamp();
 
+  const profilingLinkLocator = services.observabilityShared.locators.profiling.topNFunctionsLocator;
+  const profilingLinkLabel = i18n.translate('xpack.infra.flamegraph.profilingAppTopFunctionsLink', {
+    defaultMessage: 'Go to Universal Profiling Functions',
+  });
+
   const params = useMemo(
     () => ({
       hostname: asset.name,
@@ -44,7 +52,13 @@ export function Functions() {
 
   return (
     <>
-      <ProfilingLinks profilingPath="functions" hostname={asset.name} />
+      <ProfilingLinks
+        hostname={asset.name}
+        from={dateRange.from}
+        to={dateRange.to}
+        profilingLinkLocator={profilingLinkLocator}
+        profilingLinkLabel={profilingLinkLabel}
+      />
       <EuiSpacer />
       <EmbeddableFunctions
         data={response ?? undefined}

diff --git a/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/profiling_links.tsx b/x-pack/plugins/infra/public/components/asset_details/tabs/profiling/profiling_links.tsx
@@ -6,36 +6,34 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
+import { FlamegraphLocator } from '@kbn/observability-shared-plugin/public/locators/profiling/flamegraph_locator';
+import { TopNFunctionsLocator } from '@kbn/observability-shared-plugin/public/locators/profiling/topn_functions_locator';
 import { HOST_FIELD } from '../../../../../common/constants';
-import { useKibanaContextForPlugin } from '../../../../hooks/use_kibana';
 
 const PROFILING_FEEDBACK_URL = 'https://ela.st/profiling-feedback';
 
-export type ProfilingPath = 'flamegraphs' | 'functions';
-
 interface Props {
   hostname: string;
-  profilingPath: ProfilingPath;
+  from: string;
+  to: string;
+  profilingLinkLocator: FlamegraphLocator | TopNFunctionsLocator;
+  profilingLinkLabel: string;
 }
 
-export function ProfilingLinks({ hostname, profilingPath }: Props) {
-  const { services } = useKibanaContextForPlugin();
-  const queryParams = new URLSearchParams({
+export function ProfilingLinks({
+  hostname,
+  from,
+  to,
+  profilingLinkLocator,
+  profilingLinkLabel,
+}: Props) {
+  const profilingLinkURL = profilingLinkLocator.getRedirectUrl({
     kuery: `${HOST_FIELD}:"${hostname}"`,
+    rangeFrom: from,
+    rangeTo: to,
   });
-  const profilingLinkURL = services.http.basePath.prepend(
-    `/app/profiling/${profilingPath}?${queryParams}`
-  );
-  const profilingLinkLabel =
-    profilingPath === 'flamegraphs'
-      ? i18n.translate('xpack.infra.flamegraph.profilingAppFlamegraphLink', {
-          defaultMessage: 'Go to Universal Profiling Flamegraph',
-        })
-      : i18n.translate('xpack.infra.flamegraph.profilingAppFunctionsLink', {
-          defaultMessage: 'Go to Universal Profiling Functions',
-        });
 
   return (
     <EuiFlexGroup justifyContent="flexEnd">

diff --git a/x-pack/plugins/observability_shared/public/plugin.ts b/x-pack/plugins/observability_shared/public/plugin.ts
@@ -5,19 +5,32 @@
  * 2.0.
  */
 
-import { BehaviorSubject } from 'rxjs';
-import type { CoreStart, Plugin, CoreSetup } from '@kbn/core/public';
-import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
 import { CasesUiStart } from '@kbn/cases-plugin/public';
-import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
 import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
-import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
-import { createNavigationRegistry } from './components/page_template/helpers/navigation_registry';
+import type { GuidedOnboardingPluginStart } from '@kbn/guided-onboarding-plugin/public';
+import type {
+  BrowserUrlService,
+  SharePluginSetup,
+  SharePluginStart,
+} from '@kbn/share-plugin/public';
+import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import { BehaviorSubject } from 'rxjs';
 import { createLazyObservabilityPageTemplate } from './components/page_template';
+import { createNavigationRegistry } from './components/page_template/helpers/navigation_registry';
+import {
+  type FlamegraphLocator,
+  FlamegraphLocatorDefinition,
+} from './locators/profiling/flamegraph_locator';
+import {
+  type StacktracesLocator,
+  StacktracesLocatorDefinition,
+} from './locators/profiling/stacktraces_locator';
+import {
+  type TopNFunctionsLocator,
+  TopNFunctionsLocatorDefinition,
+} from './locators/profiling/topn_functions_locator';
 import { updateGlobalNavigation } from './services/update_global_navigation';
-import { FlamegraphLocatorDefinition } from './locators/profiling/flamegraph_locator';
-import { TopNFunctionsLocatorDefinition } from './locators/profiling/topn_functions_locator';
-import { StacktracesLocatorDefinition } from './locators/profiling/stacktraces_locator';
 
 export interface ObservabilitySharedSetup {
   share: SharePluginSetup;
@@ -36,6 +49,14 @@ export type ObservabilitySharedPluginSetup = ReturnType<ObservabilitySharedPlugi
 export type ObservabilitySharedPluginStart = ReturnType<ObservabilitySharedPlugin['start']>;
 export type ProfilingLocators = ObservabilitySharedPluginSetup['locators']['profiling'];
 
+interface ObservabilitySharedLocators {
+  profiling: {
+    flamegraphLocator: FlamegraphLocator;
+    topNFunctionsLocator: TopNFunctionsLocator;
+    stacktracesLocator: StacktracesLocator;
+  };
+}
+
 export class ObservabilitySharedPlugin implements Plugin {
   private readonly navigationRegistry = createNavigationRegistry();
   private isSidebarEnabled$: BehaviorSubject<boolean>;
@@ -46,19 +67,7 @@ export class ObservabilitySharedPlugin implements Plugin {
 
   public setup(coreSetup: CoreSetup, pluginsSetup: ObservabilitySharedSetup) {
     return {
-      locators: {
-        profiling: {
-          flamegraphLocator: pluginsSetup.share.url.locators.create(
-            new FlamegraphLocatorDefinition()
-          ),
-          topNFunctionsLocator: pluginsSetup.share.url.locators.create(
-            new TopNFunctionsLocatorDefinition()
-          ),
-          stacktracesLocator: pluginsSetup.share.url.locators.create(
-            new StacktracesLocatorDefinition()
-          ),
-        },
-      },
+      locators: this.createLocators(pluginsSetup.share.url),
       navigation: {
         registerSections: this.navigationRegistry.registerSections,
       },
@@ -79,6 +88,7 @@ export class ObservabilitySharedPlugin implements Plugin {
     });
 
     return {
+      locators: this.createLocators(plugins.share.url),
       navigation: {
         PageTemplate,
         registerSections: this.navigationRegistry.registerSections,
@@ -89,4 +99,14 @@ export class ObservabilitySharedPlugin implements Plugin {
   }
 
   public stop() {}
+
+  private createLocators(urlService: BrowserUrlService): ObservabilitySharedLocators {
+    return {
+      profiling: {
+        flamegraphLocator: urlService.locators.create(new FlamegraphLocatorDefinition()),
+        topNFunctionsLocator: urlService.locators.create(new TopNFunctionsLocatorDefinition()),
+        stacktracesLocator: urlService.locators.create(new StacktracesLocatorDefinition()),
+      },
+    };
+  }
 }