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

added function to show full traceID in #2536

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
+170 −4
Open

added function to show full traceID in #2536

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cca635b
add showing full traceID function
avinpy-255 Jan 3, 2025
11c184c
Merge branch 'jaegertracing:main' into fix-issue-2092
avinpy-255 Jan 13, 2025
23dd5f5
updated UI look
avinpy-255 Jan 13, 2025
6fc578b
added configuration for displaying fulltraceID
avinpy-255 Jan 16, 2025
562d57d
Merge branch 'jaegertracing:main' into fix-issue-2092
avinpy-255 Jan 18, 2025
af3ec46
changelog: Added traceIDLength config
avinpy-255 Jan 18, 2025
d079810
Merge branch 'jaegertracing:main' into fix-issue-2092
avinpy-255 Jan 20, 2025
6f4d449
added custom component for traceID display
avinpy-255 Jan 21, 2025
194edd9
fix test.js
avinpy-255 Jan 21, 2025
a7bad6c
changed the function name TraceID
avinpy-255 Jan 21, 2025
b82c9dc
updated component name
avinpy-255 Jan 22, 2025
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
13 changes: 13 additions & 0 deletions packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ describe('<TracePageHeader>', () => {
showViewOptions: false,
textFilter: '',
updateTextFilter: () => {},
traceIDLength: 7,
};

let wrapper;
Expand Down Expand Up @@ -132,4 +133,16 @@ describe('<TracePageHeader>', () => {
expect(wrapper.find({ to: linkToStandalone }).length).toBe(0);
});
});

it('renders trace ID with correct length', () => {
const testTrace = {
...trace,
traceID: '1234567890abcdef',
};
wrapper.setProps({
trace: testTrace,
traceIDLength: 7,
});
expect(wrapper.find('.u-tx-muted').text()).toHaveLength(7);
});
});
4 changes: 3 additions & 1 deletion packages/jaeger-ui/src/components/TracePage/TracePageHeader/TracePageHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { getTraceLinks } from '../../../model/link-patterns';
import './TracePageHeader.css';
import ExternalLinks from '../../common/ExternalLinks';
import { getTargetEmptyOrBlank } from '../../../utils/config/get-target';
import { getConfigValue } from '../../../utils/config/get-config';

type TracePageHeaderEmbedProps = {
canCollapse: boolean;
Expand Down Expand Up @@ -149,7 +150,8 @@ export function TracePageHeaderFn(props: TracePageHeaderEmbedProps & { forwarded
return { ...rest, value: renderer(trace) };
});

const traceShortID = trace.traceID.slice(0, 7);
const traceIDLength = getConfigValue('traceIDLength');
const traceShortID = trace.traceID.slice(0, traceIDLength);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't play nice with styling when very long.

image

I think the ID needs to be in smaller font.


const title = (
<h1 className={`TracePageHeader--title ${canCollapse ? 'is-collapsible' : ''}`}>
Expand Down
1 change: 1 addition & 0 deletions packages/jaeger-ui/src/constants/default-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const defaultConfig: Config = {
},
maxLimit: 1500,
},
traceIDLength: 7,
storageCapabilities: {
archiveStorage: false,
},
Expand Down
3 changes: 3 additions & 0 deletions packages/jaeger-ui/src/types/config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ export type Config = {
// TODO when is it useful?
scripts?: readonly TScript[];

// traceIDLength controls the length of the trace ID displayed in the UI.
traceIDLength?: number;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
traceIDLength?: number;
traceIdDisplayLength?: number;


// storage capabilities given by the query service.
storageCapabilities?: StorageCapabilities;

Expand Down
Loading