maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
* Use `getTraceURL` for APM trace links

* Fix tests

* Check for the presence of APM links

Since now we use a helper provided by APM it no longer makes sense to
test for the actual URL (because that only tests the function). Instead
just test that the link exists and that it has an `href`.
This commit is contained in:
Alejandro Fernández 2019-12-16 17:00:00 +01:00 committed by GitHub
parent bb98e9a2b8
commit 3137b07b57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
View file

@ -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', () => {
@ -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', () => {

5
x-pack/legacy/plugins/infra/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
View file

@ -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'];
@ -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 }),
});
};