Merge branch 'log-icon' into log-components

itssharmasandeep · itssharmasandeep · commit 2874cca52a26 · 2021-05-06T20:01:23.000+05:30
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.15-alpine
+FROM nginx:1.20-alpine
 COPY dist/hypertrace-ui /usr/share/nginx/html
 COPY conf/default.conf /etc/nginx/conf.d/default.conf
 EXPOSE 2020
diff --git a/projects/components/src/popover/popover.component.ts b/projects/components/src/popover/popover.component.ts
@@ -9,7 +9,6 @@ import {
   OnDestroy,
   Output
 } from '@angular/core';
-import { Subscription } from 'rxjs';
 import { PopoverBackdrop, PopoverPositionType, PopoverRelativePositionLocation } from './popover';
 import { PopoverContentComponent } from './popover-content.component';
 import { PopoverRef } from './popover-ref';
@@ -51,12 +50,14 @@ export class PopoverComponent implements OnDestroy {
   @ContentChild(PopoverContentComponent, { static: true })
   public content!: PopoverContentComponent;
 
-  private subscription?: Subscription;
+  private popover?: PopoverRef;
 
   public constructor(private readonly popoverService: PopoverService, private readonly popoverElement: ElementRef) {}
 
   public ngOnDestroy(): void {
-    this.subscription?.unsubscribe();
+    if (!this.popover?.closed) {
+      this.popover?.close();
+    }
   }
 
   @HostListener('click')
@@ -65,7 +66,7 @@ export class PopoverComponent implements OnDestroy {
       return;
     }
 
-    const popover = this.popoverService.drawPopover({
+    this.popover = this.popoverService.drawPopover({
       position: {
         type: PopoverPositionType.Relative,
         origin: this.popoverElement,
@@ -76,17 +77,17 @@ export class PopoverComponent implements OnDestroy {
     });
 
     // Closing can happen internal to the Popover for things like closeOnBackdropClick. Let the consumer know.
-    this.subscription = popover.closed$.subscribe(() => this.popoverClose.emit());
+    this.popover.closed$.subscribe(() => this.popoverClose.emit());
 
-    popover.closeOnBackdropClick();
+    this.popover.closeOnBackdropClick();
 
     if (this.closeOnClick) {
-      popover.closeOnPopoverContentClick();
+      this.popover.closeOnPopoverContentClick();
     }
     if (this.closeOnNavigate) {
-      popover.closeOnNavigation();
+      this.popover.closeOnNavigation();
     }
 
-    this.popoverOpen.emit(popover);
+    this.popoverOpen.emit(this.popover);
   }
 }
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
@@ -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'
             })
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
@@ -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')
   ];
 
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
@@ -43,7 +43,7 @@ export class WaterfallChartService {
           serviceName: datum.serviceName,
           protocolName: datum.protocolName,
           hasError: datum.errorCount > 0,
-          hasLogs: datum.logEvents && datum.logEvents.length > 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,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;
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;
 
@@ -59,8 +62,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
@@ -35,7 +35,10 @@ describe('Entity table cell renderer component', () => {
 
   test('should render a milliseconds only value', () => {
     const spectator = buildComponent();
-    expect(spectator.component.value).toEqual(entity);
+    expect(spectator.component.value).toEqual({
+      ...entity,
+      isInactive: false
+    });
   });
 
   test('should render first column with additional css class', () => {
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
@@ -1,15 +1,19 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { TableCellAlignmentType, TableCellRenderer, TableCellRendererBase } from '@hypertrace/components';
-import { Entity } from '../../../../graphql/model/schema/entity';
 import { ObservabilityTableCellType } from '../../observability-table-cell-type';
+import { MaybeInactiveEntity } from './entity-table-cell-parser';
 
 @Component({
   selector: 'ht-entity-table-cell-renderer',
   styleUrls: ['./entity-table-cell-renderer.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: `
     <div class="fill-container entity-cell" [ngClass]="{ 'first-column': this.isFirstColumn }">
-      <ht-entity-renderer [entity]="this.value" [navigable]="true"></ht-entity-renderer>
+      <ht-entity-renderer
+        [entity]="this.value"
+        [inactive]="this.value?.isInactive === true"
+        [navigable]="true"
+      ></ht-entity-renderer>
     </div>
   `
 })
@@ -18,4 +22,4 @@ import { ObservabilityTableCellType } from '../../observability-table-cell-type'
   alignment: TableCellAlignmentType.Left,
   parser: ObservabilityTableCellType.Entity
 })
-export class EntityTableCellRendererComponent extends TableCellRendererBase<Entity | undefined> {}
+export class EntityTableCellRendererComponent extends TableCellRendererBase<MaybeInactiveEntity | undefined> {}
diff --git a/projects/observability/src/shared/constants/entity-metadata.ts b/projects/observability/src/shared/constants/entity-metadata.ts
@@ -3,7 +3,7 @@ import { InjectionToken } from '@angular/core';
 export interface EntityMetadata {
   entityType: string;
   icon: string;
-  detailPath(id: string, sourceRoute?: string): string[];
+  detailPath(id: string, sourceRoute?: string, inactive?: boolean): string[];
   listPath?: string[];
   apisListPath?(id: string): string[];
   sourceRoutes?: string[];
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
@@ -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: []
           }
         ]
       });
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
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.15-alpine`
	`1`	`+FROM nginx:1.20-alpine`
`2`	`2`	`COPY dist/hypertrace-ui /usr/share/nginx/html`
`3`	`3`	`COPY conf/default.conf /etc/nginx/conf.d/default.conf`
`4`	`4`	`EXPOSE 2020`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@ export class EntityRendererComponent implements OnChanges {`
`32`	`32`	`@Input()`
`33`	`33`	`public entity?: Entity;`
`34`	`34`
	`35`	`+ @Input()`
	`36`	`+ public inactive: boolean = false;`
	`37`	`+`
`35`	`38`	`@Input()`
`36`	`39`	`public navigable: boolean = true;`
`37`	`40`
`@@ -59,8 +62,9 @@ export class EntityRendererComponent implements OnChanges {`
`59`	`62`	`this.setIconType();`
`60`	`63`	`}`
`61`	`64`	`}`
	`65`	`+`
`62`	`66`	`public onClickNavigate(): void {`
`63`		`- this.navigable && this.entity && this.entityNavService.navigateToEntity(this.entity);`
	`67`	`+ this.navigable && this.entity && this.entityNavService.navigateToEntity(this.entity, this.inactive);`
`64`	`68`	`}`
`65`	`69`
`66`	`70`	`private setName(): void {`