From 03bfc4a6d53d81e7af6158c5fcd3c0e57c99d04f Mon Sep 17 00:00:00 2001
From: Milosz Marcinkowski <milosz.marcinkowski@elastic.co>
Date: Wed, 27 Nov 2024 13:14:12 +0100
Subject: [PATCH] Revert "initialize licensing plugin during start instead of
 setup (deprecated)"

This reverts commit b5a2197d60caee4fad1ae55755acec5ed2aa7375.
---
 .../observability_solution/apm/public/application/index.tsx  | 1 -
 .../apm/public/context/apm_plugin/apm_plugin_context.tsx     | 2 --
 .../apm/public/context/license/license_context.tsx           | 3 ++-
 x-pack/plugins/observability_solution/apm/public/plugin.ts   | 5 +++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/x-pack/plugins/observability_solution/apm/public/application/index.tsx b/x-pack/plugins/observability_solution/apm/public/application/index.tsx
index f9785a136b06e..23dde7de81469 100644
--- a/x-pack/plugins/observability_solution/apm/public/application/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/application/index.tsx
@@ -59,7 +59,6 @@ export const renderApp = ({
     observabilityAIAssistant: pluginsStart.observabilityAIAssistant,
     share: pluginsSetup.share,
     kibanaEnvironment,
-    licensing: pluginsStart.licensing,
   };
 
   // render APM feedback link in global help menu
diff --git a/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx
index 03711b7265e3f..e8ab9530b574e 100644
--- a/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx
@@ -19,7 +19,6 @@ import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 import type { ObservabilityAIAssistantPublicStart } from '@kbn/observability-ai-assistant-plugin/public';
 import { SharePluginSetup } from '@kbn/share-plugin/public';
-import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import type { ApmPluginSetupDeps } from '../../plugin';
 import type { ConfigSchema } from '../..';
 import type { KibanaEnvContext } from '../kibana_environment_context/kibana_environment_context';
@@ -41,7 +40,6 @@ export interface ApmPluginContextValue {
   share: SharePluginSetup;
   kibanaEnvironment: KibanaEnvContext;
   lens: LensPublicStart;
-  licensing: LicensingPluginStart;
 }
 
 export const ApmPluginContext = createContext({} as ApmPluginContextValue);
diff --git a/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx
index 927e4367dd376..569c21637ceff 100644
--- a/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx
@@ -14,7 +14,8 @@ import { InvalidLicenseNotification } from './invalid_license_notification';
 export const LicenseContext = React.createContext<ILicense | undefined>(undefined);
 
 export function LicenseProvider({ children }: { children: React.ReactChild }) {
-  const { licensing } = useApmPluginContext();
+  const { plugins } = useApmPluginContext();
+  const { licensing } = plugins;
   const license = useObservable(licensing.license$);
   // if license is not loaded yet, consider it valid
   const hasInvalidLicense = license?.isActive === false;
diff --git a/x-pack/plugins/observability_solution/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts
index 5a95eb4fea582..ab8b82899551b 100644
--- a/x-pack/plugins/observability_solution/apm/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/apm/public/plugin.ts
@@ -34,6 +34,7 @@ import { Start as InspectorPluginStart } from '@kbn/inspector-plugin/public';
 import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { LensPublicStart } from '@kbn/lens-plugin/public';
 import { LicenseManagementUIPluginSetup } from '@kbn/license-management-plugin/public';
+import type { LicensingPluginSetup } from '@kbn/licensing-plugin/public';
 import type { MapsStartApi } from '@kbn/maps-plugin/public';
 import type { MlPluginSetup, MlPluginStart } from '@kbn/ml-plugin/public';
 import type {
@@ -69,7 +70,6 @@ import { map } from 'rxjs';
 import type { CloudSetup } from '@kbn/cloud-plugin/public';
 import type { ServerlessPluginStart } from '@kbn/serverless/public';
 import { LogsSharedClientStartExports } from '@kbn/logs-shared-plugin/public';
-import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import type { ConfigSchema } from '.';
 import { registerApmRuleTypes } from './components/alerting/rule_types/register_apm_rule_types';
 import { registerEmbeddables } from './embeddable/register_embeddables';
@@ -96,6 +96,7 @@ export interface ApmPluginSetupDeps {
   unifiedSearch: UnifiedSearchPublicPluginStart;
   features: FeaturesPluginSetup;
   home?: HomePublicPluginSetup;
+  licensing: LicensingPluginSetup;
   licenseManagement?: LicenseManagementUIPluginSetup;
   ml?: MlPluginSetup;
   observability: ObservabilityPublicSetup;
@@ -121,7 +122,7 @@ export interface ApmPluginStartDeps {
   embeddable: EmbeddableStart;
   home: void;
   inspector: InspectorPluginStart;
-  licensing: LicensingPluginStart;
+  licensing: void;
   maps?: MapsStartApi;
   ml?: MlPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;