Skip to content

[APM] Quote trace id to ensure a word is searched (#69500) #69504

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
merged 7 commits into from
Jul 7, 2020
Merged

[APM] Quote trace id to ensure a word is searched (#69500) #69504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1257729
[APM] Quote trace id to ensure a word is searched (#69500)
Sayrus Jun 18, 2020
fa99b84
Merge branch 'master' into apm-jump-to-trace-action-filter
elasticmachine Jun 18, 2020
66033d8
[APM] Fix TransactionActionMenu tests (one test was not updated)
Sayrus Jun 19, 2020
1025f5f
Merge branch 'master' into apm-jump-to-trace-action-filter
elasticmachine Jun 29, 2020
986a431
Merge branch 'master' into apm-jump-to-trace-action-filter
elasticmachine Jul 5, 2020
e1ba61b
Merge branch 'master' into apm-jump-to-trace-action-filter
elasticmachine Jul 6, 2020
27f3d5f
Merge branch 'master' into apm-jump-to-trace-action-filter
elasticmachine Jul 7, 2020
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
2 changes: 1 addition & 1 deletion ...pm/public/components/shared/TransactionActionMenu/__test__/TransactionActionMenu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ describe('TransactionActionMenu component', () => {

expect(mock.core.application.navigateToApp).toHaveBeenCalledWith('logs', {
path:
'link-to/logs?time=1545092070952&filter=trace.id:%228b60bd32ecc6e1506735a8b6cfcf175c%22%20OR%208b60bd32ecc6e1506735a8b6cfcf175c',
'link-to/logs?time=1545092070952&filter=trace.id:%228b60bd32ecc6e1506735a8b6cfcf175c%22%20OR%20%228b60bd32ecc6e1506735a8b6cfcf175c%22',
});
});

Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/sections.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('Transaction action menu', () => {
key: 'traceLogs',
label: 'Trace logs',
href:
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20123',
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20%22123%22',
condition: true,
},
],
Expand Down Expand Up @@ -113,7 +113,7 @@ describe('Transaction action menu', () => {
key: 'traceLogs',
label: 'Trace logs',
href:
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20123',
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20%22123%22',
condition: true,
},
],
Expand Down Expand Up @@ -183,7 +183,7 @@ describe('Transaction action menu', () => {
key: 'traceLogs',
label: 'Trace logs',
href:
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20123',
'some-basepath/app/logs/link-to/logs?time=1580986800&filter=trace.id:%22123%22%20OR%20%22123%22',
condition: true,
},
],
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/shared/TransactionActionMenu/sections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export const getSections = ({
path: `/link-to/logs`,
query: {
time,
filter: `trace.id:"${transaction.trace.id}" OR ${transaction.trace.id}`,
filter: `trace.id:"${transaction.trace.id}" OR "${transaction.trace.id}"`,
},
}),
condition: true,
Expand Down