IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tracing: Add processes for each span (#41473)

Browse Source
This commit is contained in:
Ivana Huckova 2021-11-12 10:43:03 +01:00 committed by GitHub
parent e4a499b957
commit bf2ece7281
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
public/app/features/explore/TraceView/TraceView.test.tsx
View File

@ -117,6 +117,32 @@ describe('TraceView', () => {
}
expect(ticks()).toBe('0μs274.5μs549μs823.5μs1.1ms');
});
it('correctly shows processes for each span', () => {
renderTraceView();
let table: HTMLElement;
expect(screen.queryAllByText('', { selector: 'div[data-test-id="span-view"]' }).length).toBe(3);
const firstSpan = screen.getAllByText('', { selector: 'div[data-test-id="span-view"]' })[0];
userEvent.click(firstSpan);
userEvent.click(screen.getByText(/Process/));
table = screen.getByText('', { selector: 'div[data-test-id="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-1');
userEvent.click(firstSpan);
const secondSpan = screen.getAllByText('', { selector: 'div[data-test-id="span-view"]' })[1];
userEvent.click(secondSpan);
userEvent.click(screen.getByText(/Process/));
table = screen.getByText('', { selector: 'div[data-test-id="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-2');
userEvent.click(secondSpan);
const thirdSpan = screen.getAllByText('', { selector: 'div[data-test-id="span-view"]' })[2];
userEvent.click(thirdSpan);
userEvent.click(screen.getByText(/Process/));
table = screen.getByText('', { selector: 'div[data-test-id="KeyValueTable"]' });
expect(table.innerHTML).toContain('client-uuid-3');
});
});
const response: TraceData & { spans: TraceSpanData[] } = {
@ -160,7 +186,7 @@ const response: TraceData & { spans: TraceSpanData[] } = {
],
},
],
processID: 'p1',
processID: '1ed38015486087ca',
warnings: null as any,
},
{
@ -177,7 +203,7 @@ const response: TraceData & { spans: TraceSpanData[] } = {
{ key: 'internal.span.format', type: 'string', value: 'proto' },
],
logs: [],
processID: 'p1',
processID: '3fb050342773d333',
warnings: null,
},
{
@ -194,15 +220,33 @@ const response: TraceData & { spans: TraceSpanData[] } = {
{ key: 'internal.span.format', type: 'string', value: 'proto' },
],
logs: [] as any,
processID: 'p1',
processID: '35118c298fc91f68',
warnings: null as any,
},
],
processes: {
p1: {
'1ed38015486087ca': {
serviceName: 'loki-all',
tags: [
{ key: 'client-uuid', type: 'string', value: '2a59d08899ef6a8a' },
{ key: 'client-uuid', type: 'string', value: 'client-uuid-1' },
{ key: 'hostname', type: 'string', value: '0080b530fae3' },
{ key: 'ip', type: 'string', value: '172.18.0.6' },
{ key: 'jaeger.version', type: 'string', value: 'Go-2.20.1' },
],
},
'3fb050342773d333': {
serviceName: 'loki-all',
tags: [
{ key: 'client-uuid', type: 'string', value: 'client-uuid-2' },
{ key: 'hostname', type: 'string', value: '0080b530fae3' },
{ key: 'ip', type: 'string', value: '172.18.0.6' },
{ key: 'jaeger.version', type: 'string', value: 'Go-2.20.1' },
],
},
'35118c298fc91f68': {
serviceName: 'loki-all',
tags: [
{ key: 'client-uuid', type: 'string', value: 'client-uuid-3' },
{ key: 'hostname', type: 'string', value: '0080b530fae3' },
{ key: 'ip', type: 'string', value: '172.18.0.6' },
{ key: 'jaeger.version', type: 'string', value: 'Go-2.20.1' },

6
public/app/features/explore/TraceView/TraceView.tsx
View File

@ -192,8 +192,8 @@ function transformTraceDataFrame(frame: DataFrame): TraceResponse {
const processes: Record<string, TraceProcess> = {};
for (let i = 0; i < view.length; i++) {
const span = view.get(i);
if (!processes[span.serviceName]) {
processes[span.serviceName] = {
if (!processes[span.spanID]) {
processes[span.spanID] = {
serviceName: span.serviceName,
tags: span.serviceTags,
};
@ -208,7 +208,7 @@ function transformTraceDataFrame(frame: DataFrame): TraceResponse {
...s,
duration: s.duration * 1000,
startTime: s.startTime * 1000,
processID: s.serviceName,
processID: s.spanID,
flags: 0,
references: s.parentSpanID ? [{ refType: 'CHILD_OF', spanID: s.parentSpanID, traceID: s.traceID }] : undefined,
logs: s.logs?.map((l) => ({ ...l, timestamp: l.timestamp * 1000 })) || [],