forked from jaegertracing/jaeger-ui
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Search results link spans (jaegertracing#536)
* Add span linking to search results * Add more url tests * Change span csv to space seperated value * Handle span param without spanIDs Signed-off-by: Everett Ross <reverett@uber.com>
- Loading branch information
1 parent
916b2ae
commit d7bbc7b
Showing
9 changed files
with
321 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
198 changes: 198 additions & 0 deletions
198
packages/jaeger-ui/src/components/SearchTracePage/url.test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| // Copyright (c) 2020 The Jaeger Authors. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| import { getUrl, getUrlState, isSameQuery } from './url'; | ||
|
|
||
| describe('SearchTracePage/url', () => { | ||
| const span0 = 'span-0'; | ||
| const span1 = 'span-1'; | ||
| const span2 = 'span-2'; | ||
| const trace0 = 'trace-0'; | ||
| const trace1 = 'trace-1'; | ||
| const trace2 = 'trace-2'; | ||
|
|
||
| describe('getUrl', () => { | ||
| it('handles no args given', () => { | ||
| expect(getUrl()).toBe('/search'); | ||
| }); | ||
|
|
||
| it('handles empty args', () => { | ||
| expect(getUrl({})).toBe('/search?'); | ||
| }); | ||
|
|
||
| it('includes provided args', () => { | ||
| const paramA = 'aParam'; | ||
| const paramB = 'bParam'; | ||
| expect(getUrl({ paramA, paramB })).toBe(`/search?paramA=${paramA}¶mB=${paramB}`); | ||
| }); | ||
|
|
||
| it('preserves traceID without spanLinks', () => { | ||
| expect( | ||
| getUrl({ | ||
| traceID: trace0, | ||
| }) | ||
| ).toBe(`/search?traceID=${trace0}`); | ||
| }); | ||
|
|
||
| it('converts spanLink and traceID to traceID and span', () => { | ||
| expect( | ||
| getUrl({ | ||
| traceID: trace0, | ||
| spanLinks: { | ||
| [trace0]: span0, | ||
| }, | ||
| }) | ||
| ).toBe(`/search?span=${span0}%40${trace0}`); | ||
| }); | ||
|
|
||
| it('handles missing traceID for spanLinks', () => { | ||
| expect( | ||
| getUrl({ | ||
| spanLinks: { | ||
| [trace0]: span0, | ||
| }, | ||
| }) | ||
| ).toBe(`/search?span=${span0}%40${trace0}`); | ||
| }); | ||
|
|
||
| it('handles empty spanLinks', () => { | ||
| expect( | ||
| getUrl({ | ||
| spanLinks: {}, | ||
| }) | ||
| ).toBe(`/search?`); | ||
| }); | ||
|
|
||
| it('converts spanLink and other traceID to traceID and span', () => { | ||
| expect( | ||
| getUrl({ | ||
| traceID: [trace0, trace2], | ||
| spanLinks: { | ||
| [trace0]: span0, | ||
| }, | ||
| }) | ||
| ).toBe(`/search?span=${span0}%40${trace0}&traceID=${trace2}`); | ||
| }); | ||
|
|
||
| it('converts spanLinks to traceID and span', () => { | ||
| expect( | ||
| getUrl({ | ||
| traceID: [trace0, trace1, trace2], | ||
| spanLinks: { | ||
| [trace0]: `${span0} ${span1}`, | ||
| [trace1]: span2, | ||
| }, | ||
| }) | ||
| ).toBe(`/search?span=${span0}%20${span1}%40${trace0}&span=${span2}%40${trace1}&traceID=${trace2}`); | ||
| }); | ||
| }); | ||
|
|
||
| describe('getUrlState', () => { | ||
| it('gets search params', () => { | ||
| const service = 'svc-0'; | ||
| const operation = 'op-0'; | ||
| expect(getUrlState(`service=${service}&operation=${operation}`)).toEqual({ service, operation }); | ||
| }); | ||
|
|
||
| it('converts span to traceID and spanLinks', () => { | ||
| expect(getUrlState(`span=${span0}%40${trace0}`)).toEqual({ | ||
| traceID: [trace0], | ||
| spanLinks: { | ||
| [trace0]: span0, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('converts multiple spans to traceID and spanLinks', () => { | ||
| expect( | ||
| getUrlState(`span=${span0}%20${span1}%40${trace0}&span=${span2}%40${trace1}&traceID=${trace2}`) | ||
| ).toEqual({ | ||
| traceID: expect.arrayContaining([trace0, trace1, trace2]), | ||
| spanLinks: { | ||
| [trace0]: `${span0} ${span1}`, | ||
| [trace1]: span2, | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| it('converts span param without spanIDs to just traceID', () => { | ||
| expect(getUrlState(`span=${span0}%20${span1}%40${trace0}&span=%40${trace1}&traceID=${trace2}`)).toEqual( | ||
| { | ||
| traceID: expect.arrayContaining([trace0, trace1, trace2]), | ||
| spanLinks: { | ||
| [trace0]: `${span0} ${span1}`, | ||
| }, | ||
| } | ||
| ); | ||
| }); | ||
|
|
||
| it('handles duplicate traceIDs', () => { | ||
| expect( | ||
| getUrlState( | ||
| `span=${span0}%40${trace0}&span=${span1}%40${trace0}&span=${span2}%40${trace1}&traceID=${trace1}&traceID=${trace2}` | ||
| ) | ||
| ).toEqual({ | ||
| traceID: expect.arrayContaining([trace0, trace1, trace2]), | ||
| spanLinks: { | ||
| [trace0]: `${span0} ${span1}`, | ||
| [trace1]: span2, | ||
| }, | ||
| }); | ||
| }); | ||
| }); | ||
|
|
||
| describe('isSameQuery', () => { | ||
| const queryKeys = [ | ||
| 'end', | ||
| 'limit', | ||
| 'lookback', | ||
| 'maxDuration', | ||
| 'minDuration', | ||
| 'operation', | ||
| 'service', | ||
| 'start', | ||
| 'tags', | ||
| ]; | ||
| const otherKey = 'other-key'; | ||
| const baseQuery = queryKeys.reduce( | ||
| (res, curr, i) => ({ | ||
| ...res, | ||
| [curr]: i % 2 ? curr : i, | ||
| }), | ||
| { [otherKey]: otherKey } | ||
| ); | ||
|
|
||
| it('returns `false` if only one argument is falsy', () => { | ||
| expect(isSameQuery(baseQuery)).toBe(false); | ||
| }); | ||
|
|
||
| it('returns `false` if a considered key is changed or omitted', () => { | ||
| queryKeys.forEach(key => { | ||
| // eslint-disable-next-line camelcase | ||
| const { [key]: _omitted, ...rest } = baseQuery; | ||
| expect(isSameQuery(baseQuery, rest)).toBe(false); | ||
| expect(isSameQuery(baseQuery, { ...rest, [key]: 'changed' })).toBe(false); | ||
| }); | ||
| }); | ||
|
|
||
| it('returns `true` if no considered keys are changed or omitted', () => { | ||
| expect(isSameQuery(baseQuery, { ...baseQuery })).toBe(true); | ||
|
|
||
| // eslint-disable-next-line camelcase | ||
| const { [otherKey]: _omitted, ...copy } = baseQuery; | ||
| expect(isSameQuery(baseQuery, copy)).toBe(true); | ||
| expect(isSameQuery(baseQuery, { ...copy, [otherKey]: 'changed' })).toBe(true); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.