diff --git a/projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts b/projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts index 3c9748dad..4a95fbf8f 100644 --- a/projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts +++ b/projects/components/src/sequence/renderer/sequence-bar-renderer.service.ts @@ -230,7 +230,7 @@ export class SequenceBarRendererService { ? scaledEnd - this.markerWidth - 2 : marker.markerTime }); - markerTime = scaledNormalizedMarkers[index].markerTime; + markerTime = marker.markerTime; } else { scaledNormalizedMarkers[index] = { ...scaledNormalizedMarkers[index], diff --git a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts b/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts index ce6b22552..07a9923bd 100644 --- a/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts +++ b/projects/distributed-tracing/src/shared/components/log-events/log-events-table.component.ts @@ -120,7 +120,7 @@ export class LogEventsTableComponent implements OnChanges { title: 'Timestamp', display: CoreTableCellRendererType.RelativeTimestamp, visible: true, - width: '150px', + width: '120px', sortable: false, filterable: false }, @@ -136,7 +136,15 @@ export class LogEventsTableComponent implements OnChanges { title: 'Span', display: WaterfallTableCellType.SpanName, visible: true, - width: '30%', + width: '20%', + sortable: false, + filterable: false + }, + { + id: 'spanId', + title: 'Span Id', + visible: true, + width: '15%', sortable: false, filterable: false } diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts index 05a0d1054..f1c1f2a14 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.ts @@ -202,7 +202,7 @@ export class WaterfallChartComponent implements OnChanges { let markerData: MarkerTooltipData = { relativeTimes: [], - summary: spanWaterfallData.logEvents[0].summary + summary: spanWaterfallData.logEvents.find(logEvent => logEvent.timestamp === marker.timestamps[0])?.summary ?? '' }; spanWaterfallData.logEvents.forEach((logEvent: LogEvent) => { if (marker.timestamps.includes(logEvent.timestamp)) { diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts index d9b1ca14d..0be93223d 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.ts @@ -41,6 +41,7 @@ export interface WaterfallChartState { export interface LogEvent { spanStartTime?: number; + spanId: string; attributes: Dictionary; timestamp: string; summary: string; diff --git a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts b/projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts index e0f597cb4..e9e77143a 100644 --- a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts +++ b/projects/distributed-tracing/src/shared/services/log-events/log-events.service.test.ts @@ -65,7 +65,8 @@ describe('Log Events Service', () => { { timestamp: 'time', attributes: {}, - summary: 'summary' + summary: 'summary', + spanId: 'test-id' } ] }; @@ -74,7 +75,8 @@ describe('Log Events Service', () => { timestamp: 'time', attributes: {}, summary: 'summary', - spanStartTime: 1608151401295 + spanStartTime: 1608151401295, + spanId: 'test-id' } ]; expect(spectator.service.getLogEventsWithSpanStartTime(logEvents, 1608151401295)).toMatchObject( diff --git a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts b/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts index f19c8028d..0c8bbf3f0 100644 --- a/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts +++ b/projects/distributed-tracing/src/shared/services/log-events/log-events.service.ts @@ -17,7 +17,7 @@ import { export class LogEventsService { private readonly specificationBuilder: SpecificationBuilder = new SpecificationBuilder(); private readonly dateCoercer: DateCoercer = new DateCoercer(); - private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary']; + private readonly logEventProperties: string[] = ['attributes', 'timestamp', 'summary', 'spanId']; private readonly spanPropertiesForTrace: string[] = ['startTime', 'serviceName', 'displaySpanName', 'protocolName']; private readonly spanPropertiesForApiTrace: string[] = [ 'startTime',