Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'observability:apmEnableProfilingIntegration': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'observability:apmEnableCriticalPath': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ export interface UsageStats {
'observability:apmServiceInventoryOptimizedSorting': boolean;
'observability:apmTraceExplorerTab': boolean;
'observability:apmEnableCriticalPath': boolean;
'observability:apmEnableProfilingIntegration': boolean;
'securitySolution:enableGroupedNav': boolean;
'securitySolution:showRelatedIntegrations': boolean;
'visualization:visualize:legacyGaugeChartsLibrary': boolean;
Expand Down
6 changes: 6 additions & 0 deletions src/plugins/telemetry/schema/oss_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -9870,6 +9870,12 @@
"description": "Non-default value of setting."
}
},
"observability:apmEnableProfilingIntegration": {
"type": "boolean",
"_meta": {
"description": "Non-default value of setting."
}
},
"observability:apmEnableCriticalPath": {
"type": "boolean",
"_meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
apmEnableServiceMetrics,
apmEnableContinuousRollups,
enableAgentExplorerView,
apmEnableProfilingIntegration,
} from '@kbn/observability-plugin/common';
import { isEmpty } from 'lodash';
import React from 'react';
Expand All @@ -37,6 +38,7 @@ const apmSettingsKeys = [
apmEnableServiceMetrics,
apmEnableContinuousRollups,
enableAgentExplorerView,
apmEnableProfilingIntegration,
];

export function GeneralSettings() {
Expand Down
15 changes: 11 additions & 4 deletions x-pack/plugins/apm/public/hooks/use_profiling_plugin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,15 @@
*/

import { useEffect, useState } from 'react';
import { apmEnableProfilingIntegration } from '@kbn/observability-plugin/common';
import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';

export function useProfilingPlugin() {
const { plugins } = useApmPluginContext();
const { plugins, core } = useApmPluginContext();
const isProfilingIntegrationEnabled = core.uiSettings.get<boolean>(
apmEnableProfilingIntegration,
false
);
const [isProfilingPluginInitialized, setIsProfilingPluginInitialized] =
useState<boolean | undefined>();

Expand All @@ -28,8 +33,10 @@ export function useProfilingPlugin() {

return {
isProfilingPluginInitialized,
profilingLocators: isProfilingPluginInitialized
? plugins.profiling?.locators
: undefined,
profilingLocators:
isProfilingIntegrationEnabled && isProfilingPluginInitialized
? plugins.profiling?.locators
: undefined,
isProfilingIntegrationEnabled,
};
}
1 change: 1 addition & 0 deletions x-pack/plugins/observability/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export {
apmEnableContinuousRollups,
enableCriticalPath,
syntheticsThrottlingEnabled,
apmEnableProfilingIntegration,
} from './ui_settings_keys';

export {
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/observability/common/ui_settings_keys.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ export const apmEnableServiceMetrics = 'observability:apmEnableServiceMetrics';
export const apmEnableContinuousRollups = 'observability:apmEnableContinuousRollups';
export const syntheticsThrottlingEnabled = 'observability:syntheticsThrottlingEnabled';
export const enableLegacyUptimeApp = 'observability:enableLegacyUptimeApp';
export const apmEnableProfilingIntegration = 'observability:apmEnableProfilingIntegration';
10 changes: 10 additions & 0 deletions x-pack/plugins/observability/server/ui_settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import {
enableInfrastructureHostsView,
syntheticsThrottlingEnabled,
enableLegacyUptimeApp,
apmEnableProfilingIntegration,
} from '../common/ui_settings_keys';

const betaLabel = i18n.translate('xpack.observability.uiSettings.betaLabel', {
Expand Down Expand Up @@ -364,6 +365,15 @@ export const uiSettings: Record<string, UiSettings> = {
schema: schema.boolean(),
requiresPageReload: true,
},
[apmEnableProfilingIntegration]: {
category: [observabilityFeatureId],
name: i18n.translate('xpack.observability.apmEnableProfilingIntegration', {
defaultMessage: 'Enable Universal Profiling integration in APM',
}),
value: false,
schema: schema.boolean(),
requiresPageReload: false,
},
};

function throttlingDocsLink({ href }: { href: string }) {
Expand Down