Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APM] Hide components when there is no support from agents #161970

Merged
merged 5 commits into from
Jul 20, 2023
Merged

[APM] Hide components when there is no support from agents #161970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e4ee2c
Hide the top five affected transactions table for OTel agents
gbamparop Jul 14, 2023
13cb5d5
Merge remote-tracking branch 'upstream/main' into otel-hide-top-five-…
gbamparop Jul 20, 2023
f8efaca
Hide for top erroneous transactions for RUM agents
gbamparop Jul 20, 2023
1a97d63
Hide top 5 errors table for OTel and RUM agents
gbamparop Jul 20, 2023
085190b
Hide transaction breakdown chart for OTel agents
gbamparop Jul 20, 2023
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
21 changes: 16 additions & 5 deletions x-pack/plugins/apm/public/components/app/error_group_details/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import { i18n } from '@kbn/i18n';
import React, { useEffect } from 'react';
import { omit } from 'lodash';
import { useHistory } from 'react-router-dom';
import {
isOpenTelemetryAgentName,
isRumAgentName,
} from '../../../../common/agent_name';
import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
import { useBreadcrumb } from '../../../context/breadcrumbs/use_breadcrumb';
Expand All @@ -31,6 +35,7 @@ import { ErrorDistribution } from './distribution';
import { TopErroneousTransactions } from './top_erroneous_transactions';
import { maybe } from '../../../../common/utils/maybe';
import { fromQuery, toQuery } from '../../shared/links/url_helpers';
import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';

type ErrorSamplesAPIResponse =
APIReturnType<'GET /internal/apm/services/{serviceName}/errors/{groupId}/samples'>;
Expand Down Expand Up @@ -188,6 +193,10 @@ export function ErrorGroupDetails() {
}
}, [history, errorId, errorSamplesData, errorSamplesFetchStatus]);

const { agentName } = useApmServiceContext();
const isOpenTelemetryAgent = isOpenTelemetryAgentName(agentName as AgentName);
const isRumAgent = isRumAgentName(agentName as AgentName);

// If there are 0 occurrences, show only charts w. empty message
const showDetails = errorSamplesData.occurrencesCount !== 0;

Expand Down Expand Up @@ -216,11 +225,13 @@ export function ErrorGroupDetails() {
/>
</EuiPanel>
</EuiFlexItem>
<EuiFlexItem grow={2}>
<EuiPanel hasBorder={true}>
<TopErroneousTransactions serviceName={serviceName} />
</EuiPanel>
</EuiFlexItem>
{!isOpenTelemetryAgent && !isRumAgent && (
<EuiFlexItem grow={2}>
<EuiPanel hasBorder={true}>
<TopErroneousTransactions serviceName={serviceName} />
</EuiPanel>
</EuiFlexItem>
)}
</EuiFlexGroup>
<EuiSpacer size="s" />
{showDetails && (
Expand Down
19 changes: 12 additions & 7 deletions x-pack/plugins/apm/public/components/app/service_overview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ import {
EuiPanel,
EuiSpacer,
} from '@elastic/eui';
import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
import {
isOpenTelemetryAgentName,
isRumAgentName,
isServerlessAgent,
} from '../../../../common/agent_name';
Expand Down Expand Up @@ -57,6 +59,7 @@ export function ServiceOverview() {

const { start, end } = useTimeRange({ rangeFrom, rangeTo });
const isRumAgent = isRumAgentName(agentName);
const isOpenTelemetryAgent = isOpenTelemetryAgentName(agentName as AgentName);
const isServerless = isServerlessAgent(serverlessType);

const dependenciesLink = router.link('/services/{serviceName}/dependencies', {
Expand Down Expand Up @@ -178,13 +181,15 @@ export function ServiceOverview() {
/>
</EuiFlexItem>
) : (
<EuiFlexItem grow={3}>
<TransactionBreakdownChart
showAnnotations={false}
environment={environment}
kuery={kuery}
/>
</EuiFlexItem>
!isOpenTelemetryAgent && (
<EuiFlexItem grow={3}>
<TransactionBreakdownChart
showAnnotations={false}
environment={environment}
kuery={kuery}
/>
</EuiFlexItem>
)
)}
{!isRumAgent && (
<EuiFlexItem grow={7}>
Expand Down
37 changes: 25 additions & 12 deletions x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
EuiFlexGroup,
} from '@elastic/eui';
import React from 'react';
import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
import { AnnotationsContextProvider } from '../../../../context/annotations/annotations_context';
import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
import { ServiceOverviewThroughputChart } from '../../../app/service_overview/service_overview_throughput_chart';
Expand All @@ -22,6 +23,11 @@ import { TransactionColdstartRateChart } from '../transaction_coldstart_rate_cha
import { FailedTransactionRateChart } from '../failed_transaction_rate_chart';
import { TopErrors } from '../../../app/transaction_details/top_errors';
import { useBreakpoints } from '../../../../hooks/use_breakpoints';
import {
isOpenTelemetryAgentName,
isRumAgentName,
} from '../../../../../common/agent_name';
import { AgentName } from '../../../../../typings/es_schemas/ui/fields/agent';

export function TransactionCharts({
kuery,
Expand All @@ -46,6 +52,9 @@ export function TransactionCharts({
}) {
// The default EuiFlexGroup breaks at 768, but we want to break at 1200
const { isLarge } = useBreakpoints();
const { agentName } = useApmServiceContext();
const isOpenTelemetryAgent = isOpenTelemetryAgentName(agentName as AgentName);
const isRumAgent = isRumAgentName(agentName as AgentName);
const rowDirection = isLarge ? 'column' : 'row';

const latencyChart = (
Expand Down Expand Up @@ -76,9 +85,11 @@ export function TransactionCharts({
/>
</EuiFlexItem>
) : (
<EuiFlexItem>
<TransactionBreakdownChart kuery={kuery} environment={environment} />
</EuiFlexItem>
!isOpenTelemetryAgent && (
<EuiFlexItem>
<TransactionBreakdownChart kuery={kuery} environment={environment} />
</EuiFlexItem>
)
);

const failedTransactionRateChart = (
Expand All @@ -98,23 +109,25 @@ export function TransactionCharts({
<ChartPointerEventContextProvider>
{transactionName ? (
<>
<EuiFlexGrid columns={3} gutterSize="s">
<EuiFlexGroup gutterSize="s">
{latencyChart}
{serviceOverviewThroughputChart}
{coldStartRateOrBreakdownChart}
</EuiFlexGrid>
</EuiFlexGroup>
<EuiSpacer size="l" />
<EuiFlexGroup
direction={rowDirection}
gutterSize="s"
responsive={false}
>
{failedTransactionRateChart}
<EuiFlexItem grow={2}>
<EuiPanel hasBorder={true}>
<TopErrors />
</EuiPanel>
</EuiFlexItem>
{!isOpenTelemetryAgent && !isRumAgent && (
<EuiFlexItem grow={2}>
<EuiPanel hasBorder={true}>
<TopErrors />
</EuiPanel>
</EuiFlexItem>
)}
</EuiFlexGroup>
</>
) : (
Expand All @@ -124,10 +137,10 @@ export function TransactionCharts({
{serviceOverviewThroughputChart}
</EuiFlexGrid>
<EuiSpacer size="s" />
<EuiFlexGrid columns={2} gutterSize="s">
<EuiFlexGroup gutterSize="s">
{failedTransactionRateChart}
{coldStartRateOrBreakdownChart}
</EuiFlexGrid>
</EuiFlexGroup>
</>
)}
</ChartPointerEventContextProvider>
Expand Down