Skip to content
3 changes: 0 additions & 3 deletions docs/reference/advanced-settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,6 @@ $$$observability-enable-inspect-es-queries$$$`observability:enableInspectEsQueri
$$$observability-apm-enable-service-groups$$$`observability:enableServiceGroups`
: [preview] When enabled, allows users to create Service Groups from the APM Service Inventory page.

$$$observability-apm-trace-explorer-tab$$$`observability:apmTraceExplorerTab`
: [preview] Enable the APM Trace Explorer feature, that allows you to search and inspect traces with KQL or EQL.

$$$observability-infrastructure-profiling-integration$$$`observability:enableInfrastructureProfilingIntegration`
: [preview] Enables the Profiling view in Host details within Infrastructure.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ export const OBSERVABILITY_APM_SERVICE_GROUP_MAX_NUMBER_OF_SERVCIE_ID =
'observability:apmServiceGroupMaxNumberOfServices';
export const OBSERVABILITY_APM_SERVICE_INVENTORY_OPTIMIZED_SORTING_ID =
'observability:apmServiceInventoryOptimizedSorting';
export const OBSERVABILITY_APM_TRACE_EXPLORER_TAB_ID = 'observability:apmTraceExplorerTab';
export const OBSERVABILITY_ENABLE_AWS_LAMBDA_METRICS_ID = 'observability:enableAwsLambdaMetrics';
export const OBSERVABILITY_ENABLE_COMPARISON_BY_DEFAULT_ID =
'observability:enableComparisonByDefault';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [
settings.OBSERVABILITY_APM_AGENT_EXPLORER_VIEW_ID,
settings.OBSERVABILITY_APM_PROGRESSIVE_LOADING_ID,
settings.OBSERVABILITY_APM_SERVICE_INVENTORY_OPTIMIZED_SORTING_ID,
settings.OBSERVABILITY_APM_TRACE_EXPLORER_TAB_ID,
settings.OBSERVABILITY_ENABLE_AWS_LAMBDA_METRICS_ID,
settings.OBSERVABILITY_APM_ENABLE_CRITICAL_PATH_ID,
settings.OBSERVABILITY_ENABLE_INFRASTRUCTURE_ASSET_CUSTOM_DASHBOARDS_ID,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,6 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'observability:apmTraceExplorerTab': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
},
'observability:apmEnableProfilingIntegration': {
type: 'boolean',
_meta: { description: 'Non-default value of setting.' },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ export interface UsageStats {
'observability:apmProgressiveLoading': string;
'observability:apmServiceGroupMaxNumberOfServices': number;
'observability:apmServiceInventoryOptimizedSorting': boolean;
'observability:apmTraceExplorerTab': boolean;
'observability:apmEnableCriticalPath': boolean;
'observability:apmEnableProfilingIntegration': boolean;
'observability:entityCentricExperience': boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11451,12 +11451,6 @@
"description": "Non-default value of setting."
}
},
"observability:apmTraceExplorerTab": {
"type": "boolean",
"_meta": {
"description": "Non-default value of setting."
}
},
"observability:apmEnableProfilingIntegration": {
"type": "boolean",
"_meta": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31949,8 +31949,6 @@
"xpack.observability.apmProgressiveLoadingQualityOff": "Désactivé",
"xpack.observability.apmServiceInventoryOptimizedSorting": "Optimiser les performances de chargement des listes de services dans APM",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} Tri par défaut des pages d'inventaire et de stockage des services APM (pour les services hors Machine Learning), en fonction du nom de service.",
"xpack.observability.apmTraceExplorerTab": "Explorateur de traces APM",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} Activer la fonctionnalité Explorateur de traces APM, qui vous permet de rechercher et d'inspecter les traces avec KQL ou EQL. {link}",
"xpack.observability.app.starterPrompts.explainRules.prompt": "Pouvez-vous expliquer les types de règles disponibles ?",
"xpack.observability.app.starterPrompts.explainRules.title": "Expliquer",
"xpack.observability.applyTo": "Appliquer à",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31927,8 +31927,6 @@
"xpack.observability.apmProgressiveLoadingQualityOff": "オフ",
"xpack.observability.apmServiceInventoryOptimizedSorting": "APMでサービスリストの読み込みパフォーマンスを最適化",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} サービス名によるデフォルトAPMサービスインベントリおよびストレージエクスプローラーページの並べ替え(機械学習が適用されていないサービス)。",
"xpack.observability.apmTraceExplorerTab": "APMトレースエクスプローラー",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} APMトレースエクスプローラー機能を有効にし、KQLまたはEQLでトレースを検索、検査できます。{link}",
"xpack.observability.app.starterPrompts.explainRules.prompt": "使用可能なルールタイプを説明できますか?",
"xpack.observability.app.starterPrompts.explainRules.title": "説明",
"xpack.observability.applyTo": "適用",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31982,8 +31982,6 @@
"xpack.observability.apmProgressiveLoadingQualityOff": "关闭",
"xpack.observability.apmServiceInventoryOptimizedSorting": "优化 APM 中的服务列表加载性能",
"xpack.observability.apmServiceInventoryOptimizedSortingDescription": "{technicalPreviewLabel} 默认 APM 服务库存和 Storage Explorer 页面排序(对于未应用 Machine Learning 的服务)将按服务名称排序。",
"xpack.observability.apmTraceExplorerTab": "APM Trace Explorer",
"xpack.observability.apmTraceExplorerTabDescription": "{technicalPreviewLabel} 启用 APM Trace Explorer 功能,它允许您通过 KQL 或 EQL 搜索和检查跟踪。{link}",
"xpack.observability.app.starterPrompts.explainRules.prompt": "是否可以解释可用的规则类型?",
"xpack.observability.app.starterPrompts.explainRules.title": "解释",
"xpack.observability.applyTo": "应用于",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ describe('Trace Explorer', () => {
to: new Date(end).getTime(),
})
);

cy.updateAdvancedSettings({
'observability:apmTraceExplorerTab': true,
});
});

after(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
EuiFlexGroup,
EuiFlexItem,
EuiIcon,
EuiLink,
EuiPagination,
EuiPanel,
EuiSkeletonText,
Expand Down Expand Up @@ -40,7 +39,6 @@ import { useAnyOfApmParams } from '../../../../hooks/use_apm_params';
import { useApmRouter } from '../../../../hooks/use_apm_router';
import type { FETCH_STATUS } from '../../../../hooks/use_fetcher';
import { isPending, isSuccess } from '../../../../hooks/use_fetcher';
import { useTraceExplorerEnabledSetting } from '../../../../hooks/use_trace_explorer_enabled_setting';
import type { APIReturnType } from '../../../../services/rest/create_call_apm_api';
import { TransactionDetailLink } from '../../../shared/links/apm/transaction_detail_link';
import { DiscoverErrorLink } from '../../../shared/links/discover_links/discover_error_link';
Expand Down Expand Up @@ -97,8 +95,6 @@ export function ErrorSampleDetails({

const router = useApmRouter();

const isTraceExplorerEnabled = useTraceExplorerEnabledSetting();

const {
path: { groupId },
query,
Expand Down Expand Up @@ -216,22 +212,6 @@ export function ErrorSampleDetails({
/>
)}
</EuiFlexItem>
{isTraceExplorerEnabled && (
<EuiFlexItem grow={false}>
<EuiLink data-test-subj="apmErrorSampleDetailsLink" href={traceExplorerLink}>
<EuiFlexGroup alignItems="center" gutterSize="s">
<EuiFlexItem>
<EuiIcon type="apmTrace" />
</EuiFlexItem>
<EuiFlexItem css={{ whiteSpace: 'nowrap' }}>
{i18n.translate('xpack.apm.errorSampleDetails.viewOccurrencesInTraceExplorer', {
defaultMessage: 'Explore traces with this error',
})}
</EuiFlexItem>
</EuiFlexGroup>
</EuiLink>
</EuiFlexItem>
)}
{externalContextMenuItems.value?.length ? (
<ErrorUiActionsContextMenu items={externalContextMenuItems.value} />
) : undefined}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import { isEqual } from 'lodash';
import type { CSSProperties, ReactNode } from 'react';
import React, { createContext, memo, useEffect, useRef, useState } from 'react';
import { useEuiTheme } from '@elastic/eui';
import { useTraceExplorerEnabledSetting } from '../../../hooks/use_trace_explorer_enabled_setting';
import { getCytoscapeOptions } from './cytoscape_options';
import { useCytoscapeEventHandlers } from './use_cytoscape_event_handlers';

Expand Down Expand Up @@ -51,9 +50,8 @@ function useCytoscape(options: cytoscape.CytoscapeOptions) {

function CytoscapeComponent({ children, elements, height, serviceName, style }: CytoscapeProps) {
const { euiTheme } = useEuiTheme();
const isTraceExplorerEnabled = useTraceExplorerEnabledSetting();
const [ref, cy] = useCytoscape({
...getCytoscapeOptions(euiTheme, isTraceExplorerEnabled),
...getCytoscapeOptions(euiTheme),
elements,
});
useCytoscapeEventHandlers({ cy, serviceName, euiTheme });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,7 @@ function isService(el: cytoscape.NodeSingular) {
return el.data(SERVICE_NAME) !== undefined;
}

const getStyle = (
euiTheme: EuiThemeComputed,
isTraceExplorerEnabled: boolean
): cytoscape.StylesheetJson => {
const getStyle = (euiTheme: EuiThemeComputed): cytoscape.StylesheetJson => {
const lineColor = euiTheme.colors.mediumShade;
return [
{
Expand Down Expand Up @@ -196,20 +193,6 @@ const getStyle = (
'target-arrow-color': euiTheme.colors.darkShade,
},
},
...(isTraceExplorerEnabled
? [
{
selector: 'edge.hover',
style: {
width: 4,
'z-index': zIndexEdgeHover,
'line-color': euiTheme.colors.darkShade,
'source-arrow-color': euiTheme.colors.darkShade,
'target-arrow-color': euiTheme.colors.darkShade,
},
},
]
: []),
{
selector: 'node.hover',
style: {
Expand Down Expand Up @@ -254,12 +237,9 @@ ${euiTheme.colors.lightShade}`,
marginTop: 0,
});

export const getCytoscapeOptions = (
euiTheme: EuiThemeComputed,
isTraceExplorerEnabled: boolean
): cytoscape.CytoscapeOptions => ({
export const getCytoscapeOptions = (euiTheme: EuiThemeComputed): cytoscape.CytoscapeOptions => ({
boxSelectionEnabled: false,
maxZoom: 3,
minZoom: 0.2,
style: getStyle(euiTheme, isTraceExplorerEnabled),
style: getStyle(euiTheme),
});

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,15 @@ import React, { useCallback, useContext, useEffect, useRef, useState } from 'rea
import { i18n } from '@kbn/i18n';
import { SERVICE_NAME, SPAN_TYPE } from '../../../../../common/es_fields/apm';
import type { Environment } from '../../../../../common/environment_rt';
import { useTraceExplorerEnabledSetting } from '../../../../hooks/use_trace_explorer_enabled_setting';
import { CytoscapeContext } from '../cytoscape';
import { getAnimationOptions, popoverWidth } from '../cytoscape_options';
import { DependencyContents } from './dependency_contents';
import { EdgeContents } from './edge_contents';
import { ExternalsListContents } from './externals_list_contents';
import { ResourceContents } from './resource_contents';
import { ServiceContents } from './service_contents';

function getContentsComponent(
selectedElementData: cytoscape.NodeDataDefinition | cytoscape.EdgeDataDefinition,
isTraceExplorerEnabled: boolean
selectedElementData: cytoscape.NodeDataDefinition | cytoscape.EdgeDataDefinition
) {
if (
selectedElementData.groupedConnections &&
Expand All @@ -47,10 +44,6 @@ function getContentsComponent(
return ResourceContents;
}

if (isTraceExplorerEnabled && selectedElementData.sourceData && selectedElementData.targetData) {
return EdgeContents;
}

if (selectedElementData.label) {
return DependencyContents;
}
Expand Down Expand Up @@ -90,8 +83,6 @@ export function Popover({ focusedServiceName, environment, kuery, start, end }:
setSelectedElement(undefined);
}, [cy, setSelectedElement]);

const isTraceExplorerEnabled = useTraceExplorerEnabledSetting();

const renderedHeight = selectedElement?.renderedHeight() ?? 0;
const renderedWidth = selectedElement?.renderedWidth() ?? 0;
const box = selectedElement?.renderedBoundingBox({});
Expand Down Expand Up @@ -128,10 +119,6 @@ export function Popover({ focusedServiceName, environment, kuery, start, end }:
cy.on('unselect', 'node', deselect);
cy.on('viewport', deselect);
cy.on('drag', 'node', deselect);
if (isTraceExplorerEnabled) {
cy.on('select', 'edge', selectHandler);
cy.on('unselect', 'edge', deselect);
}
}

return () => {
Expand All @@ -144,7 +131,7 @@ export function Popover({ focusedServiceName, environment, kuery, start, end }:
cy.removeListener('unselect', 'edge', deselect);
}
};
}, [cy, deselect, isTraceExplorerEnabled]);
}, [cy, deselect]);

// Handle positioning of popover. This makes it so the popover positions
// itself correctly and the arrows are always pointing to where they should.
Expand Down Expand Up @@ -173,7 +160,7 @@ export function Popover({ focusedServiceName, environment, kuery, start, end }:
? centerSelectedNode
: (_event: MouseEvent<HTMLAnchorElement>) => deselect();

const ContentsComponent = getContentsComponent(selectedElementData, isTraceExplorerEnabled);
const ContentsComponent = getContentsComponent(selectedElementData);

const isOpen = !!selectedElement && !!ContentsComponent;

Expand All @@ -184,9 +171,9 @@ export function Popover({ focusedServiceName, environment, kuery, start, end }:
closePopover={() => {}}
isOpen={isOpen}
ref={popoverRef}
style={popoverStyle}
css={popoverStyle}
>
<EuiFlexGroup direction="column" gutterSize="s" style={{ minWidth: popoverWidth }}>
<EuiFlexGroup direction="column" gutterSize="s" css={{ minWidth: popoverWidth }}>
<EuiFlexItem>
<EuiTitle size="xxs">
<h3 style={{ wordBreak: 'break-all' }}>
Expand Down
Loading