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

Tempo: Show <1ms when durationMs not in response (#85267)

Browse Source 
* Show <1ms when durationMs not in response

* Update tests
This commit is contained in:
Joey 2024-03-28 09:47:49 +00:00 committed by GitHub
parent 50a57bb88c
commit 8c770a283e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/tempo/resultTransformer.test.ts
View File

@ -79,6 +79,7 @@ describe('createTableFrameFromTraceQlQuery()', () => {
expect(frame.fields[4].name).toBe('traceDuration'); expect(frame.fields[4].name).toBe('traceDuration');
expect(frame.fields[4].type).toBe('number'); expect(frame.fields[4].type).toBe('number');
expect(frame.fields[4].values[2]).toBe(44); expect(frame.fields[4].values[2]).toBe(44);
expect(frame.fields[4].values[1]).toBe('<1ms');
// Subframes field // Subframes field
expect(frame.fields[5].name).toBe('nested'); expect(frame.fields[5].name).toBe('nested');
expect(frame.fields[5].type).toBe('nestedFrames'); expect(frame.fields[5].type).toBe('nestedFrames');

4
public/app/plugins/datasource/tempo/resultTransformer.ts
View File

@ -468,7 +468,7 @@ function transformToTraceData(data: TraceSearchMetadata) {
return { return {
traceID: data.traceID, traceID: data.traceID,
startTime: parseInt(data.startTimeUnixNano!, 10) / 1000000, startTime: parseInt(data.startTimeUnixNano!, 10) / 1000000,
traceDuration: data.durationMs, traceDuration: data.durationMs || '<1ms',
traceService: data.rootServiceName || '', traceService: data.rootServiceName || '',
traceName: data.rootTraceName || '', traceName: data.rootTraceName || '',
}; };
@ -915,7 +915,7 @@ interface TraceTableData {
spanID?: string; spanID?: string;
startTime?: number; startTime?: number;
name?: string; name?: string;
traceDuration?: number; traceDuration?: number | string;
} }
function transformSpanToTraceData(span: Span, spanSet: Spanset, trace: TraceSearchMetadata): TraceTableData { function transformSpanToTraceData(span: Span, spanSet: Spanset, trace: TraceSearchMetadata): TraceTableData {

1
public/app/plugins/datasource/tempo/testResponse.ts
View File

@ -2368,7 +2368,6 @@ export const traceQlResponse = {
rootServiceName: 'lb', rootServiceName: 'lb',
rootTraceName: 'HTTP Client', rootTraceName: 'HTTP Client',
startTimeUnixNano: '1643342166678000000', startTimeUnixNano: '1643342166678000000',
durationMs: 93,
spanSets: [ spanSets: [
{ {
attributes: [ attributes: [