Merge branch 'main' into inherit-colors-entity

anandtiwary · web-flow · commit ffac7ae1cb94 · 2021-05-06T16:47:20.000-07:00
diff --git a/projects/distributed-tracing/src/public-api.ts b/projects/distributed-tracing/src/public-api.ts
@@ -102,6 +102,7 @@ export { WaterfallData } from './shared/dashboard/widgets/waterfall/waterfall/wa
 export { TraceWaterfallDataSourceModel } from './shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model';
 export { traceDetailDashboard } from './pages/trace-detail/trace-detail.dashboard';
 export { TraceDetailPageComponent } from './pages/trace-detail/trace-detail.page.component';
+export { LogEvent } from './shared/dashboard/widgets/waterfall/waterfall/waterfall-chart';
 
 // Datasources
 export * from './shared/dashboard/widgets/trace-detail/data/trace-detail-data-source.model';
diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-data.ts b/projects/distributed-tracing/src/shared/components/span-detail/span-data.ts
@@ -1,4 +1,5 @@
 import { Dictionary } from '@hypertrace/common';
+import { LogEvent } from '../../dashboard/widgets/waterfall/waterfall/waterfall-chart';
 
 export interface SpanData {
   id: string;
@@ -12,4 +13,6 @@ export interface SpanData {
   tags: Dictionary<unknown>;
   requestUrl: string;
   exitCallsBreakup?: Dictionary<string>;
+  startTime: number;
+  logEvents?: LogEvent[];
 }
diff --git a/projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.test.ts b/projects/distributed-tracing/src/shared/components/span-detail/span-detail.component.test.ts
@@ -28,7 +28,8 @@ describe('Span detail component', () => {
       responseHeaders: { header1: 'value1', header2: 'value2' },
       responseBody: '[{"data": 5000}]',
       tags: { tag1: 'value1', tag2: 'value2' },
-      requestUrl: 'test-url'
+      requestUrl: 'test-url',
+      startTime: 1604567825671
     };
 
     spectator = createHost(`<ht-span-detail [spanData]="spanData"></ht-span-detail>`, {
@@ -52,7 +53,8 @@ describe('Span detail component', () => {
       responseHeaders: { header1: 'value1', header2: 'value2' },
       responseBody: '[{"data": 5000}]',
       tags: { tag1: 'value1', tag2: 'value2' },
-      requestUrl: 'test-url'
+      requestUrl: 'test-url',
+      startTime: 1604567825671
     };
 
     spectator = createHost(`<ht-span-detail [spanData]="spanData"></ht-span-detail>`, {
@@ -77,7 +79,8 @@ describe('Span detail component', () => {
       responseHeaders: { header1: 'value1', header2: 'value2' },
       responseBody: '[{"data": 5000}]',
       tags: { tag1: 'value1', tag2: 'value2' },
-      requestUrl: 'test-url'
+      requestUrl: 'test-url',
+      startTime: 1604567825671
     };
 
     spectator = createHost(`<ht-span-detail [spanData]="spanData"></ht-span-detail>`, {
@@ -101,7 +104,8 @@ describe('Span detail component', () => {
       responseHeaders: {},
       responseBody: '',
       tags: { tag1: 'value1', tag2: 'value2' },
-      requestUrl: 'test-url'
+      requestUrl: 'test-url',
+      startTime: 1604567825671
     };
 
     spectator = createHost(`<ht-span-detail [spanData]="spanData"></ht-span-detail>`, {
diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts b/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.test.ts
@@ -96,6 +96,17 @@ describe('Trace Waterfall data source model', () => {
             expect.objectContaining({
               name: 'errorCount'
             })
+          ],
+          logEventProperties: [
+            expect.objectContaining({
+              name: 'attributes'
+            }),
+            expect.objectContaining({
+              name: 'timestamp'
+            }),
+            expect.objectContaining({
+              name: 'summary'
+            })
           ]
         }
       });
@@ -156,6 +167,17 @@ describe('Trace Waterfall data source model', () => {
             expect.objectContaining({
               name: 'errorCount'
             })
+          ],
+          logEventProperties: [
+            expect.objectContaining({
+              name: 'attributes'
+            }),
+            expect.objectContaining({
+              name: 'timestamp'
+            }),
+            expect.objectContaining({
+              name: 'summary'
+            })
           ]
         }
       });
diff --git a/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts b/projects/distributed-tracing/src/shared/dashboard/data/graphql/waterfall/trace-waterfall-data-source.model.ts
@@ -13,7 +13,7 @@ import {
   TRACE_GQL_REQUEST
 } from '../../../../graphql/request/handlers/traces/trace-graphql-query-handler.service';
 import { MetadataService } from '../../../../services/metadata/metadata.service';
-import { WaterfallData } from '../../../widgets/waterfall/waterfall/waterfall-chart';
+import { LogEvent, WaterfallData } from '../../../widgets/waterfall/waterfall/waterfall-chart';
 import { GraphQlDataSourceModel } from '../graphql-data-source.model';
 
 @Model({
@@ -60,6 +60,12 @@ export class TraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Waterf
     this.specificationBuilder.attributeSpecificationForKey('errorCount')
   ];
 
+  protected readonly logEventSpecifications: Specification[] = [
+    this.specificationBuilder.attributeSpecificationForKey('attributes'),
+    this.specificationBuilder.attributeSpecificationForKey('timestamp'),
+    this.specificationBuilder.attributeSpecificationForKey('summary')
+  ];
+
   public getData(): Observable<WaterfallData[]> {
     return combineLatest([this.getTraceData(), this.getDurationAttribute()]).pipe(
       map(combinedData => this.mapResponseObject(combinedData[0], combinedData[1]))
@@ -73,7 +79,8 @@ export class TraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Waterf
       spanLimit: 1000,
       timestamp: this.dateCoercer.coerce(this.startTime),
       traceProperties: [],
-      spanProperties: this.spanSpecifications
+      spanProperties: this.spanSpecifications,
+      logEventProperties: this.logEventSpecifications
     });
   }
 
@@ -102,7 +109,8 @@ export class TraceWaterfallDataSourceModel extends GraphQlDataSourceModel<Waterf
       apiName: span.displaySpanName as string,
       spanType: span.type as SpanType,
       tags: span.spanTags as Dictionary<unknown>,
-      errorCount: span.errorCount as number
+      errorCount: span.errorCount as number,
+      logEvents: ((span.logEvents as Dictionary<LogEvent[]>) ?? {}).results
     }));
   }
 }
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-cell-data.ts
@@ -4,4 +4,5 @@ export interface SpanNameCellData {
   apiName?: string;
   color?: string;
   hasError?: boolean;
+  hasLogs?: boolean;
 }
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.scss
@@ -7,7 +7,7 @@
 
 .span-title {
   display: grid;
-  grid-template-columns: 3px min-content min-content min-content auto;
+  grid-template-columns: 3px min-content min-content min-content min-content auto;
   grid-template-rows: 1fr;
   column-gap: 4px;
 
@@ -41,6 +41,10 @@
   .text {
     @include ellipsis-overflow();
   }
+
+  .log-icon {
+    margin: auto 0;
+  }
 }
 
 .clickable {
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.test.ts
@@ -61,4 +61,15 @@ describe('Span name table cell renderer component', () => {
     expect(spectator.query('.color-bar')).toExist();
     expect(spectator.query('.error-icon')).toExist();
   });
+
+  test('should render log icon ', () => {
+    const spanNameDataWithColor = {
+      ...spanNameData,
+      hasLogs: true
+    };
+    const spectator = buildComponent({
+      providers: [tableCellDataProvider(spanNameDataWithColor)]
+    });
+    expect(spectator.query('.log-icon')).toExist();
+  });
 });
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/span-name/span-name-table-cell-renderer.component.ts
@@ -28,6 +28,13 @@ import { WaterfallTableCellType } from './span-name-cell-type';
         size="${IconSize.Medium}"
         color="${Color.Red5}"
       ></ht-icon>
+      <ht-icon
+        *ngIf="this.value.hasLogs"
+        class="log-icon"
+        icon="${IconType.Note}"
+        size="${IconSize.Small}"
+        color="${Color.Gray4}"
+      ></ht-icon>
     </div>
   `
 })
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.component.test.ts b/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: []
     }
   ];
 
diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/waterfall/waterfall/waterfall-chart.service.ts
@@ -42,7 +42,8 @@ export class WaterfallChartService {
           apiName: datum.apiName,
           serviceName: datum.serviceName,
           protocolName: datum.protocolName,
-          hasError: datum.errorCount > 0
+          hasError: datum.errorCount > 0,
+          hasLogs: datum.logEvents.length > 0
         },
         $$iconType: this.iconLookupService.forSpanType(datum.spanType)!,
         getChildren: () => of([]),
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
@@ -23,6 +23,7 @@ export interface WaterfallData {
   responseBody?: string;
   tags: Dictionary<unknown>;
   errorCount: number;
+  logEvents: LogEvent[];
 }
 
 export interface WaterfallDataNode extends WaterfallData, Omit<StatefulPrefetchedTreeTableRow, '$$state'> {
@@ -37,3 +38,9 @@ export interface WaterfallChartState {
   children: WaterfallDataNode[];
   expanded: boolean;
 }
+
+export interface LogEvent {
+  attributes: Dictionary<unknown>;
+  timestamp: string;
+  summary: string;
+}
diff --git a/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts b/projects/distributed-tracing/src/shared/graphql/request/handlers/traces/trace-graphql-query-handler.service.ts
@@ -73,7 +73,23 @@ export class TraceGraphQlQueryHandlerService implements GraphQlQueryHandler<Grap
         children: [
           {
             path: 'results',
-            children: [{ path: 'id' }, ...this.selectionBuilder.fromSpecifications(request.spanProperties!)]
+            children: [
+              { path: 'id' },
+              ...(!isEmpty(request.logEventProperties)
+                ? [
+                    {
+                      path: 'logEvents',
+                      children: [
+                        {
+                          path: 'results',
+                          children: this.selectionBuilder.fromSpecifications(request.logEventProperties!)
+                        }
+                      ]
+                    }
+                  ]
+                : []),
+              ...this.selectionBuilder.fromSpecifications(request.spanProperties!)
+            ]
           }
         ]
       };
@@ -121,7 +137,8 @@ export class TraceGraphQlQueryHandlerService implements GraphQlQueryHandler<Grap
 
     rawResult.results.forEach(spanRawResult => {
       const span: Span = {
-        [spanIdKey]: spanRawResult.id as string
+        [spanIdKey]: spanRawResult.id as string,
+        ...(!isEmpty(spanRawResult.logEvents) && { logEvents: spanRawResult.logEvents })
       };
 
       (request.spanProperties || []).forEach(property => {
@@ -175,6 +192,7 @@ export interface GraphQlTraceRequest {
   spanLimit: number;
   spanId?: string;
   spanProperties?: Specification[];
+  logEventProperties?: Specification[];
 }
 
 interface TraceServerResponse {
diff --git a/projects/observability/src/shared/components/entity-renderer/entity-renderer.component.test.ts b/projects/observability/src/shared/components/entity-renderer/entity-renderer.component.test.ts
@@ -83,7 +83,7 @@ describe('Entity Renderer Component', () => {
 
     expect(rendererElement).toHaveClass('navigable');
     spectator.dispatchFakeEvent(rendererElement, 'click');
-    expect(entityNavService.navigateToEntity).toHaveBeenCalledWith(entity);
+    expect(entityNavService.navigateToEntity).toHaveBeenCalledWith(entity, false);
   });
 
   test('renders an entity without icon by default', () => {
diff --git a/projects/observability/src/shared/components/entity-renderer/entity-renderer.component.ts b/projects/observability/src/shared/components/entity-renderer/entity-renderer.component.ts
@@ -32,6 +32,9 @@ export class EntityRendererComponent implements OnChanges {
   @Input()
   public entity?: Entity;
 
+  @Input()
+  public inactive: boolean = false;
+
   @Input()
   public navigable: boolean = true;
 
@@ -62,8 +65,9 @@ export class EntityRendererComponent implements OnChanges {
       this.setIconType();
     }
   }
+
   public onClickNavigate(): void {
-    this.navigable && this.entity && this.entityNavService.navigateToEntity(this.entity);
+    this.navigable && this.entity && this.entityNavService.navigateToEntity(this.entity, this.inactive);
   }
 
   private setName(): void {
diff --git a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-parser.ts b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-parser.ts
@@ -1,19 +1,32 @@
 import { TableCellParser, TableCellParserBase, TableRow } from '@hypertrace/components';
 import { Entity, entityIdKey } from '../../../../graphql/model/schema/entity';
 import { ObservabilityTableCellType } from '../../observability-table-cell-type';
-import { parseEntityFromTableRow } from './entity-table-cell-renderer-util';
+import { isInactiveEntity, parseEntityFromTableRow } from './entity-table-cell-renderer-util';
 
 @TableCellParser({
   type: ObservabilityTableCellType.Entity
 })
 export class EntityTableCellParser extends TableCellParserBase<CellData, CellData, string | undefined> {
   public parseValue(cellData: CellData, row: TableRow): CellData {
-    return parseEntityFromTableRow(cellData, row);
+    const entity = parseEntityFromTableRow(cellData, row);
+
+    if (entity === undefined) {
+      return undefined;
+    }
+
+    return {
+      ...entity,
+      isInactive: isInactiveEntity(row) === true
+    };
   }
 
   public parseFilterValue(cellData: CellData): string | undefined {
     return cellData !== undefined ? cellData[entityIdKey] : undefined;
   }
 }
 
-type CellData = Entity | undefined;
+type CellData = MaybeInactiveEntity | undefined;
+
+export interface MaybeInactiveEntity extends Entity {
+  isInactive: boolean;
+}
diff --git a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer-util.ts
@@ -1,4 +1,7 @@
 import { Dictionary } from '@hypertrace/common';
+import { TableRow } from '@hypertrace/components';
+import { isMetricAggregation, MetricAggregation } from '@hypertrace/distributed-tracing';
+import { isNull } from 'lodash-es';
 import { Entity, Interaction } from '../../../../graphql/model/schema/entity';
 import { EntitySpecificationBuilder } from '../../../../graphql/request/builders/specification/entity/entity-specification-builder';
 
@@ -27,3 +30,18 @@ export const parseEntityFromTableRow = (cell: Entity | undefined, row: Dictionar
 };
 
 const isInteraction = (neighbor: unknown): neighbor is Interaction => typeof neighbor === 'object';
+
+export const isInactiveEntity = (row: TableRow): boolean | undefined => {
+  const metricAggregations = filterMetricAggregations(row);
+
+  if (metricAggregations.length === 0) {
+    // If an aggregation wasn't fetched, we have no way of knowing if this Entity is inactive.
+    return undefined;
+  }
+
+  return metricAggregations.every(metricAggregation => !isValidMetricAggregation(metricAggregation));
+};
+
+const filterMetricAggregations = (row: TableRow): MetricAggregation[] => Object.values(row).filter(isMetricAggregation);
+
+const isValidMetricAggregation = (metricAggregation: MetricAggregation): boolean => !isNull(metricAggregation.value);
diff --git a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer.component.test.ts b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer.component.test.ts
diff --git a/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer.component.ts b/projects/observability/src/shared/components/table/data-cell/entity/entity-table-cell-renderer.component.ts
diff --git a/projects/observability/src/shared/constants/entity-metadata.ts b/projects/observability/src/shared/constants/entity-metadata.ts
diff --git a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.test.ts
diff --git a/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts b/projects/observability/src/shared/dashboard/data/graphql/waterfall/api-trace-waterfall-data-source.model.ts
diff --git a/projects/observability/src/shared/services/navigation/entity/entity-navigation.service.ts b/projects/observability/src/shared/services/navigation/entity/entity-navigation.service.ts

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@ export interface SpanNameCellData {`
`4`	`4`	`apiName?: string;`
`5`	`5`	`color?: string;`
`6`	`6`	`hasError?: boolean;`
	`7`	`+ hasLogs?: boolean;`
`7`	`8`	`}`