Skip to content

[Logs + Metrics UI] Use getTraceURL for APM trace links #52875

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

Merged
afgomez merged 4 commits into from
Dec 16, 2019
Merged

[Logs + Metrics UI] Use getTraceURL for APM trace links #52875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86819aa
Use `getTraceURL` for APM trace links
Dec 12, 2019
2947f4c
Fix tests
Dec 12, 2019
f48d7b7
Merge branch 'master' into 52198-apm-trace-link
Dec 16, 2019
fe720aa
Check for the presence of APM links
Dec 16, 2019
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
12 changes: 2 additions & 10 deletions .../plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,7 @@ describe('LogEntryActionsMenu component', () => {

expect(
elementWrapper.find(`a${testSubject('~apmLogEntryActionsMenuItem')}`).prop('href')
).toMatchInlineSnapshot(
`"/app/apm#/traces?kuery=${encodeURIComponent(
'trace.id:1234567'
)}&rangeFrom=now-1y&rangeTo=now"`
);
).toBeDefined();
});

it('renders with a trace id filter and timestamp when present in log entry', () => {
Expand Down Expand Up @@ -224,11 +220,7 @@ describe('LogEntryActionsMenu component', () => {

expect(
elementWrapper.find(`a${testSubject('~apmLogEntryActionsMenuItem')}`).prop('href')
).toMatchInlineSnapshot(
`"/app/apm#/traces?kuery=${encodeURIComponent(
'trace.id:1234567'
)}&rangeFrom=2019-06-27T17:34:08.693Z&rangeTo=2019-06-27T17:54:08.693Z"`
);
).toBeDefined();
});

it('renders as disabled when no supported field is present in log entry', () => {
Expand Down
5 changes: 2 additions & 3 deletions ...egacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import url from 'url';
import chrome from 'ui/chrome';
import { InfraLogItem } from '../../../graphql/types';
import { useVisibilityState } from '../../../utils/use_visibility_state';
import { getTraceUrl } from '../../../../../apm/public/components/shared/Links/apm/ExternalLinks';

const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];

Expand Down Expand Up @@ -123,8 +124,6 @@ const getAPMLink = (logItem: InfraLogItem) => {

return url.format({
pathname: chrome.addBasePath('/app/apm'),
hash: `/traces?kuery=${encodeURIComponent(
`trace.id:${traceIdEntry.value}`
)}&rangeFrom=${rangeFrom}&rangeTo=${rangeTo}`,
hash: getTraceUrl({ traceId: traceIdEntry.value, rangeFrom, rangeTo }),
});
};