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
3 changes: 0 additions & 3 deletions docs/management/advanced-options.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -449,9 +449,6 @@ When enabled, allows you to inspect {es} queries in API responses.
[[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 @@ -112,7 +112,6 @@ export const OBSERVABILITY_APM_LABS_BUTTON_ID = 'observability:apmLabsButton';
export const OBSERVABILITY_APM_PROGRESSIVE_LOADING_ID = 'observability:apmProgressiveLoading';
export const OBSERVABILITY_APM_SERVICE_GROUP_MAX_NUMBER_OF_SERVCIE_ID =
'observability:apmServiceGroupMaxNumberOfServices';
export const OBSERVABILITY_APM_TRACE_EXPLORER_TAB_ID = 'observability:apmTraceExplorerTab';
export const OBSERVABILITY_ENABLE_COMPARISON_BY_DEFAULT_ID =
'observability:enableComparisonByDefault';
export const OBSERVABILITY_ENABLE_INFRASTRUCTURE_ASSET_CUSTOM_DASHBOARDS_ID =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export const OBSERVABILITY_PROJECT_SETTINGS = [
settings.OBSERVABILITY_APM_AWS_LAMBDA_PRICE_FACTOR_ID,
settings.OBSERVABILITY_APM_AWS_LAMBDA_REQUEST_COST_PER_MILLION_ID,
settings.OBSERVABILITY_APM_PROGRESSIVE_LOADING_ID,
settings.OBSERVABILITY_APM_TRACE_EXPLORER_TAB_ID,
settings.OBSERVABILITY_ENABLE_INFRASTRUCTURE_ASSET_CUSTOM_DASHBOARDS_ID,
settings.OBSERVABILITY_LOGS_EXPLORER_ALLOWED_DATA_VIEWS_ID,
settings.OBSERVABILITY_APM_ENABLE_TABLE_SEARCH_BAR,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -590,10 +590,6 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
type: 'long',
_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 @@ -156,7 +156,6 @@ export interface UsageStats {
'observability:apmLabsButton': boolean;
'observability:apmProgressiveLoading': string;
'observability:apmServiceGroupMaxNumberOfServices': number;
'observability:apmTraceExplorerTab': boolean;
'observability:apmEnableProfilingIntegration': boolean;
'observability:entityCentricExperience': boolean;
'observability:profilingShowErrorFrames': boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11436,12 +11436,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 @@ -11329,7 +11329,6 @@
"xpack.apm.errorSampleDetails.serviceEnvironment": "Environnement",
"xpack.apm.errorSampleDetails.serviceVersion": "Version du service",
"xpack.apm.errorSampleDetails.viewOccurrencesInDiscoverButtonLabel": "Visualiser {occurrencesCount} {occurrencesCount, plural, one {l'occurrence} other {les occurrences}} dans Discover",
"xpack.apm.errorSampleDetails.viewOccurrencesInTraceExplorer": "Explorer les traces ayant cette erreur",
"xpack.apm.errorsOverview.treemap.title": "{currentTreemap} le(s) plus affecté(s)",
"xpack.apm.errorsTable.columnLastSeen": "Vu en dernier",
"xpack.apm.errorsTable.columnName": "Nom",
Expand Down Expand Up @@ -11988,7 +11987,6 @@
"xpack.apm.serviceMap.timeoutPromptTitle": "Expiration de la carte de services",
"xpack.apm.serviceMap.typePopoverStat": "Type",
"xpack.apm.serviceMap.viewFullMap": "Afficher la carte de services entière",
"xpack.apm.serviceMap.viewInTraceExplorer": "Explorer les traces",
"xpack.apm.serviceMap.zoomIn": "Zoom avant",
"xpack.apm.serviceMap.zoomOut": "Zoom arrière",
"xpack.apm.serviceMetrics.loading": "Chargement des indicateurs",
Expand Down Expand Up @@ -12387,8 +12385,6 @@
"xpack.apm.traceExplorer.criticalPathTab": "Chemin critique agrégé",
"xpack.apm.traceExplorer.waterfallTab": "Cascade",
"xpack.apm.traceLink.fetchingTraceLabel": "Récupération des traces...",
"xpack.apm.traceOverview.topTracesTab": "Premières traces",
"xpack.apm.traceOverview.traceExplorerTab": "Explorer",
"xpack.apm.traceSearchBox.refreshButton": "Recherche",
"xpack.apm.traceSearchBox.traceSearchTypeEql": "EQL",
"xpack.apm.traceSearchBox.traceSearchTypeKql": "KQL",
Expand Down Expand Up @@ -34636,8 +34632,6 @@
"xpack.observability.apmProgressiveLoadingQualityLow": "Taux d'échantillonnage bas (plus rapide, moins précis)",
"xpack.observability.apmProgressiveLoadingQualityMedium": "Taux d'échantillonnage moyen",
"xpack.observability.apmProgressiveLoadingQualityOff": "Désactivé",
"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 Expand Up @@ -35114,7 +35108,6 @@
"xpack.observability.uiSettings.betaLabel": "bêta",
"xpack.observability.uiSettings.technicalPreviewLabel": "version d'évaluation technique",
"xpack.observability.uiSettings.throttlingDocsLinkText": "lisez la notification ici.",
"xpack.observability.uiSettings.traceExplorerDocsLinkText": "En savoir plus.",
"xpack.observability.update.annotation": "Un problème est survenu lors de la mise à jour de l'annotation {message}",
"xpack.observability.ux.coreVitals.average": "une moyenne",
"xpack.observability.ux.coreVitals.averageMessage": "et inférieur à {bad}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11312,7 +11312,6 @@
"xpack.apm.errorSampleDetails.serviceEnvironment": "環境",
"xpack.apm.errorSampleDetails.serviceVersion": "サービスバージョン",
"xpack.apm.errorSampleDetails.viewOccurrencesInDiscoverButtonLabel": "Discoverで{occurrencesCount} {occurrencesCount, plural, other {件の発生}}を表示",
"xpack.apm.errorSampleDetails.viewOccurrencesInTraceExplorer": "このエラーのトレースを調査",
"xpack.apm.errorsOverview.treemap.title": "最も影響を受ける{currentTreemap}",
"xpack.apm.errorsTable.columnLastSeen": "前回の認識",
"xpack.apm.errorsTable.columnName": "名前",
Expand Down Expand Up @@ -11971,7 +11970,6 @@
"xpack.apm.serviceMap.timeoutPromptTitle": "サービスマップタイムアウト",
"xpack.apm.serviceMap.typePopoverStat": "型",
"xpack.apm.serviceMap.viewFullMap": "サービスの全体マップを表示",
"xpack.apm.serviceMap.viewInTraceExplorer": "トレースの調査",
"xpack.apm.serviceMap.zoomIn": "ズームイン",
"xpack.apm.serviceMap.zoomOut": "ズームアウト",
"xpack.apm.serviceMetrics.loading": "メトリックを読み込んでいます",
Expand Down Expand Up @@ -12371,8 +12369,6 @@
"xpack.apm.traceExplorer.criticalPathTab": "集約されたクリティカルパス",
"xpack.apm.traceExplorer.waterfallTab": "ウォーターフォール",
"xpack.apm.traceLink.fetchingTraceLabel": "トレースを取得中...",
"xpack.apm.traceOverview.topTracesTab": "上位のトレース",
"xpack.apm.traceOverview.traceExplorerTab": "エクスプローラー",
"xpack.apm.traceSearchBox.refreshButton": "検索",
"xpack.apm.traceSearchBox.traceSearchTypeEql": "EQL",
"xpack.apm.traceSearchBox.traceSearchTypeKql": "KQL",
Expand Down Expand Up @@ -34608,8 +34604,6 @@
"xpack.observability.apmProgressiveLoadingQualityLow": "低サンプリングレート(最速、最も精度が低い)",
"xpack.observability.apmProgressiveLoadingQualityMedium": "中サンプリングレート",
"xpack.observability.apmProgressiveLoadingQualityOff": "オフ",
"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 Expand Up @@ -35088,7 +35082,6 @@
"xpack.observability.uiSettings.betaLabel": "ベータ",
"xpack.observability.uiSettings.technicalPreviewLabel": "テクニカルプレビュー",
"xpack.observability.uiSettings.throttlingDocsLinkText": "こちらで通知をお読みください。",
"xpack.observability.uiSettings.traceExplorerDocsLinkText": "詳細情報",
"xpack.observability.update.annotation": "注釈の更新中に問題が発生しました。{message}",
"xpack.observability.ux.coreVitals.average": "平均",
"xpack.observability.ux.coreVitals.averageMessage": "{bad}未満",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11338,7 +11338,6 @@
"xpack.apm.errorSampleDetails.serviceEnvironment": "环境",
"xpack.apm.errorSampleDetails.serviceVersion": "服务版本",
"xpack.apm.errorSampleDetails.viewOccurrencesInDiscoverButtonLabel": "在 Discover 中查看 {occurrencesCount} 次{occurrencesCount, plural, other {发生}}",
"xpack.apm.errorSampleDetails.viewOccurrencesInTraceExplorer": "浏览包含此错误的跟踪",
"xpack.apm.errorsOverview.treemap.title": "影响最大的 {currentTreemap}",
"xpack.apm.errorsTable.columnLastSeen": "最后看到时间",
"xpack.apm.errorsTable.columnName": "名称",
Expand Down Expand Up @@ -11997,7 +11996,6 @@
"xpack.apm.serviceMap.timeoutPromptTitle": "服务地图超时",
"xpack.apm.serviceMap.typePopoverStat": "类型",
"xpack.apm.serviceMap.viewFullMap": "查看完整的服务地图",
"xpack.apm.serviceMap.viewInTraceExplorer": "浏览跟踪",
"xpack.apm.serviceMap.zoomIn": "放大",
"xpack.apm.serviceMap.zoomOut": "缩小",
"xpack.apm.serviceMetrics.loading": "正在加载指标",
Expand Down Expand Up @@ -12398,8 +12396,6 @@
"xpack.apm.traceExplorer.criticalPathTab": "已聚合关键路径",
"xpack.apm.traceExplorer.waterfallTab": "瀑布",
"xpack.apm.traceLink.fetchingTraceLabel": "正在提取追溯信息......",
"xpack.apm.traceOverview.topTracesTab": "排名靠前跟踪",
"xpack.apm.traceOverview.traceExplorerTab": "浏览器",
"xpack.apm.traceSearchBox.refreshButton": "搜索",
"xpack.apm.traceSearchBox.traceSearchTypeEql": "EQL",
"xpack.apm.traceSearchBox.traceSearchTypeKql": "KQL",
Expand Down Expand Up @@ -34673,8 +34669,6 @@
"xpack.observability.apmProgressiveLoadingQualityLow": "低采样速率(最快,最不准确)",
"xpack.observability.apmProgressiveLoadingQualityMedium": "中等采样速率",
"xpack.observability.apmProgressiveLoadingQualityOff": "关闭",
"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 Expand Up @@ -35154,7 +35148,6 @@
"xpack.observability.uiSettings.betaLabel": "公测版",
"xpack.observability.uiSettings.technicalPreviewLabel": "技术预览",
"xpack.observability.uiSettings.throttlingDocsLinkText": "在此处阅读通知。",
"xpack.observability.uiSettings.traceExplorerDocsLinkText": "了解详情。",
"xpack.observability.update.annotation": "更新标注 {message} 时出现问题",
"xpack.observability.ux.coreVitals.average": "平均值",
"xpack.observability.ux.coreVitals.averageMessage": "且小于 {bad}",
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 All @@ -31,16 +30,13 @@ import { useHistory } from 'react-router-dom';
import useAsync from 'react-use/lib/useAsync';
import { ExceptionStacktrace, PlaintextStacktrace, Stacktrace } from '@kbn/event-stacktrace';
import type { AT_TIMESTAMP } from '../../../../../common/es_fields/apm';
import { ERROR_GROUP_ID } from '../../../../../common/es_fields/apm';
import { TraceSearchType } from '../../../../../common/trace_explorer';
import type { APMError } from '../../../../../typings/es_schemas/ui/apm_error';
import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
import { useLegacyUrlParams } from '../../../../context/url_params_context/use_url_params';
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 All @@ -50,7 +46,6 @@ import { Summary } from '../../../shared/summary';
import { HttpInfoSummaryItem } from '../../../shared/summary/http_info_summary_item';
import { UserAgentSummaryItem } from '../../../shared/summary/user_agent_summary_item';
import { TimestampTooltip } from '../../../shared/timestamp_tooltip';
import { TransactionTab } from '../../transaction_details/waterfall_with_summary/transaction_tabs';
import type { ErrorTab } from './error_tabs';
import { ErrorTabKey, getTabs } from './error_tabs';
import { ErrorUiActionsContextMenu } from './error_ui_actions_context_menu';
Expand Down Expand Up @@ -97,12 +92,7 @@ export function ErrorSampleDetails({

const router = useApmRouter();

const isTraceExplorerEnabled = useTraceExplorerEnabledSetting();

const {
path: { groupId },
query,
} = useAnyOfApmParams(
const { query } = useAnyOfApmParams(
'/services/{serviceName}/errors/{groupId}',
'/mobile-services/{serviceName}/errors-and-crashes/errors/{groupId}',
'/mobile-services/{serviceName}/errors-and-crashes/crashes/{groupId}'
Expand Down Expand Up @@ -181,19 +171,6 @@ export function ErrorSampleDetails({
const serviceVersion = error.service.version;
const isUnhandled = error.error.exception?.[0]?.handled === false;

const traceExplorerLink = router.link('/traces/explorer/waterfall', {
query: {
...query,
showCriticalPath: false,
query: `${ERROR_GROUP_ID}:${groupId}`,
type: TraceSearchType.kql,
traceId: '',
transactionId: '',
waterfallItemId: '',
detailTab: TransactionTab.timeline,
},
});

return (
<EuiPanel hasBorder={true}>
<EuiFlexGroup alignItems="center">
Expand All @@ -216,22 +193,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 { useTheme } from '../../../hooks/use_theme';
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 theme = useTheme();
const isTraceExplorerEnabled = useTraceExplorerEnabledSetting();
const [ref, cy] = useCytoscape({
...getCytoscapeOptions(theme, isTraceExplorerEnabled),
...getCytoscapeOptions(theme),
elements,
});
useCytoscapeEventHandlers({ cy, serviceName, theme });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function isService(el: cytoscape.NodeSingular) {
return el.data(SERVICE_NAME) !== undefined;
}

const getStyle = (theme: EuiTheme, isTraceExplorerEnabled: boolean): cytoscape.StylesheetJson => {
const getStyle = (theme: EuiTheme): cytoscape.StylesheetJson => {
const lineColor = theme.eui.euiColorMediumShade;
return [
{
Expand Down Expand Up @@ -160,7 +160,6 @@ const getStyle = (theme: EuiTheme, isTraceExplorerEnabled: boolean): cytoscape.S
'target-arrow-shape': isIE11 ? 'none' : 'triangle',
// The DefinitelyTyped definitions don't specify this property since it's
// fairly new.
//
// @ts-expect-error
'target-distance-from-node': isIE11 ? undefined : theme.eui.euiSizeXS,
width: 1,
Expand Down Expand Up @@ -192,20 +191,6 @@ const getStyle = (theme: EuiTheme, isTraceExplorerEnabled: boolean): cytoscape.S
'target-arrow-color': theme.eui.euiColorDarkShade,
},
},
...(isTraceExplorerEnabled
? [
{
selector: 'edge.hover',
style: {
width: 4,
'z-index': zIndexEdgeHover,
'line-color': theme.eui.euiColorDarkShade,
'source-arrow-color': theme.eui.euiColorDarkShade,
'target-arrow-color': theme.eui.euiColorDarkShade,
},
},
]
: []),
{
selector: 'node.hover',
style: {
Expand Down Expand Up @@ -247,12 +232,9 @@ ${theme.eui.euiColorLightShade}`,
marginTop: 0,
});

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