Skip to content

Commit 4e56e26

Browse files
fix: log records bug fixes (#958)
1 parent 0745f3d commit 4e56e26

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ export class SequenceBarRendererService {
230230
? scaledEnd - this.markerWidth - 2
231231
: marker.markerTime
232232
});
233-
markerTime = scaledNormalizedMarkers[index].markerTime;
233+
markerTime = marker.markerTime;
234234
} else {
235235
scaledNormalizedMarkers[index] = {
236236
...scaledNormalizedMarkers[index],

projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export class LogEventsTableComponent implements OnChanges {
120120
title: 'Timestamp',
121121
display: CoreTableCellRendererType.RelativeTimestamp,
122122
visible: true,
123-
width: '150px',
123+
width: '120px',
124124
sortable: false,
125125
filterable: false
126126
},
@@ -136,7 +136,15 @@ export class LogEventsTableComponent implements OnChanges {
136136
title: 'Span',
137137
display: WaterfallTableCellType.SpanName,
138138
visible: true,
139-
width: '30%',
139+
width: '20%',
140+
sortable: false,
141+
filterable: false
142+
},
143+
{
144+
id: 'spanId',
145+
title: 'Span Id',
146+
visible: true,
147+
width: '15%',
140148
sortable: false,
141149
filterable: false
142150
}

projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ export class WaterfallChartComponent implements OnChanges {
202202

203203
let markerData: MarkerTooltipData = {
204204
relativeTimes: [],
205-
summary: spanWaterfallData.logEvents[0].summary
205+
summary: spanWaterfallData.logEvents.find(logEvent => logEvent.timestamp === marker.timestamps[0])?.summary ?? ''
206206
};
207207
spanWaterfallData.logEvents.forEach((logEvent: LogEvent) => {
208208
if (marker.timestamps.includes(logEvent.timestamp)) {

projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export interface WaterfallChartState {
4141

4242
export interface LogEvent {
4343
spanStartTime?: number;
44+
spanId: string;
4445
attributes: Dictionary<unknown>;
4546
timestamp: string;
4647
summary: string;

projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ describe('Log Events Service', () => {
6565
{
6666
timestamp: 'time',
6767
attributes: {},
68-
summary: 'summary'
68+
summary: 'summary',
69+
spanId: 'test-id'
6970
}
7071
]
7172
};
@@ -74,7 +75,8 @@ describe('Log Events Service', () => {
7475
timestamp: 'time',
7576
attributes: {},
7677
summary: 'summary',
77-
spanStartTime: 1608151401295
78+
spanStartTime: 1608151401295,
79+
spanId: 'test-id'
7880
}
7981
];
8082
expect(spectator.service.getLogEventsWithSpanStartTime(logEvents, 1608151401295)).toMatchObject(

projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
export class LogEventsService {
1818
private readonly specificationBuilder: SpecificationBuilder = new SpecificationBuilder();
1919
private readonly dateCoercer: DateCoercer = new DateCoercer();
20-
private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary'];
20+
private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary', 'spanId'];
2121
private readonly spanPropertiesForTrace: string[] = ['startTime', 'serviceName', 'displaySpanName', 'protocolName'];
2222
private readonly spanPropertiesForApiTrace: string[] = [
2323
'startTime',

0 commit comments

Comments
 (0)