fix: addressing review comments

Author: itssharmasandeep

projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts

@@ -98,18 +98,12 @@ describe('Trace Waterfall data source model', () => {
             })
           ],
           logEventProperties: [
-            expect.objectContaining({
-              name: 'traceId'
-            }),
             expect.objectContaining({
               name: 'attributes'
             }),
             expect.objectContaining({
               name: 'timestamp'
             }),
-            expect.objectContaining({
-              name: 'spanId'
-            }),
             expect.objectContaining({
               name: 'summary'
             })
@@ -175,18 +169,12 @@ describe('Trace Waterfall data source model', () => {
             })
           ],
           logEventProperties: [
-            expect.objectContaining({
-              name: 'traceId'
-            }),
             expect.objectContaining({
               name: 'attributes'
             }),
             expect.objectContaining({
               name: 'timestamp'
             }),
-            expect.objectContaining({
-              name: 'spanId'
-            }),
             expect.objectContaining({
               name: 'summary'
             })

projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts

@@ -61,10 +61,8 @@ export class TraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Waterf
   ];
 
   protected readonly logEventSpecifications: Specification[] = [
-    this.specificationBuilder.attributeSpecificationForKey('traceId'),
     this.specificationBuilder.attributeSpecificationForKey('attributes'),
     this.specificationBuilder.attributeSpecificationForKey('timestamp'),
-    this.specificationBuilder.attributeSpecificationForKey('spanId'),
     this.specificationBuilder.attributeSpecificationForKey('summary')
   ];
 

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

@@ -31,7 +31,8 @@ describe('Waterfall Chart component', () => {
       responseHeaders: {},
       responseBody: 'Response Body',
       tags: {},
-      errorCount: 0
+      errorCount: 0,
+      logEvents: []
     },
     {
       id: 'second-id',
@@ -52,7 +53,8 @@ describe('Waterfall Chart component', () => {
       responseHeaders: {},
       responseBody: '',
       tags: {},
-      errorCount: 0
+      errorCount: 0,
+      logEvents: []
     },
     {
       id: 'third-id',
@@ -73,7 +75,8 @@ describe('Waterfall Chart component', () => {
       responseHeaders: {},
       responseBody: '',
       tags: {},
-      errorCount: 0
+      errorCount: 0,
+      logEvents: []
     }
   ];
 

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

@@ -23,7 +23,7 @@ export interface WaterfallData {
   responseBody?: string;
   tags: Dictionary<unknown>;
   errorCount: number;
-  logEvents?: LogEvent[];
+  logEvents: LogEvent[];
 }
 
 export interface WaterfallDataNode extends WaterfallData, Omit<StatefulPrefetchedTreeTableRow, '$$state'> {
@@ -40,9 +40,6 @@ export interface WaterfallChartState {
 }
 
 export interface LogEvent {
-  [key: string]: unknown;
-  traceId: string;
-  spanId: string;
   attributes: Dictionary<unknown>;
   timestamp: string;
   summary: string;

projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts

@@ -104,18 +104,12 @@ describe('Api Trace Waterfall data source model', () => {
             })
           ],
           logEventProperties: [
-            expect.objectContaining({
-              name: 'traceId'
-            }),
             expect.objectContaining({
               name: 'attributes'
             }),
             expect.objectContaining({
               name: 'timestamp'
             }),
-            expect.objectContaining({
-              name: 'spanId'
-            }),
             expect.objectContaining({
               name: 'summary'
             })
@@ -182,18 +176,12 @@ describe('Api Trace Waterfall data source model', () => {
             })
           ],
           logEventProperties: [
-            expect.objectContaining({
-              name: 'traceId'
-            }),
             expect.objectContaining({
               name: 'attributes'
             }),
             expect.objectContaining({
               name: 'timestamp'
             }),
-            expect.objectContaining({
-              name: 'spanId'
-            }),
             expect.objectContaining({
               name: 'summary'
             })
@@ -229,7 +217,8 @@ describe('Api Trace Waterfall data source model', () => {
               displaySpanName: 'Span Name 1',
               protocolName: 'Protocol Name 1',
               type: SpanType.Entry,
-              spanTags: {}
+              spanTags: {},
+              logEvents: []
             },
             {
               [spanIdKey]: 'second-id',
@@ -241,7 +230,8 @@ describe('Api Trace Waterfall data source model', () => {
               displaySpanName: 'Span Name 2',
               protocolName: 'Protocol Name 2',
               type: SpanType.Exit,
-              spanTags: {}
+              spanTags: {},
+              logEvents: []
             }
           ]
         })
@@ -261,7 +251,8 @@ describe('Api Trace Waterfall data source model', () => {
             apiName: 'Span Name 1',
             protocolName: 'Protocol Name 1',
             spanType: SpanType.Entry,
-            tags: {}
+            tags: {},
+            logEvents: []
           },
           {
             id: 'second-id',
@@ -277,7 +268,8 @@ describe('Api Trace Waterfall data source model', () => {
             apiName: 'Span Name 2',
             protocolName: 'Protocol Name 2',
             spanType: SpanType.Exit,
-            tags: {}
+            tags: {},
+            logEvents: []
           }
         ]
       });

projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts

@@ -67,7 +67,7 @@ export class ApiTraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Wat
   }
 
   private getLogEventAttributes(): string[] {
-    return ['traceId', 'attributes', 'timestamp', 'spanId', 'summary'];
+    return ['attributes', 'timestamp', 'summary'];
   }
 
   private getTraceData(): Observable<Trace | undefined> {
@@ -117,7 +117,7 @@ export class ApiTraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Wat
       spanType: span.type as SpanType,
       tags: span.spanTags as Dictionary<unknown>,
       errorCount: span.errorCount as number,
-      logEvents: ((span.logEvents as Dictionary<LogEvent[]>) ?? {}).results
+      logEvents: ((span.logEvents as Dictionary<LogEvent[]>) ?? {}).results ?? []
     };
   }
 }