Custom metric topology modifications anand

projects/observability/src/pages/apis/topology/application-flow.component.ts

@@ -1,6 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 import { MetricAggregationType } from '@hypertrace/distributed-tracing';
 import { ModelJson } from '@hypertrace/hyperdash';
+import { defaultPrimaryEdgeMetricCategories, defaultSecondaryEdgeMetricCategories } from './../../../shared/dashboard/widgets/topology/metric/edge-metric-category';
+import { defaultPrimaryNodeMetricCategories, defaultSecondaryNodeMetricCategories } from './../../../shared/dashboard/widgets/topology/metric/node-metric-category';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -26,78 +28,182 @@ export class ApplicationFlowComponent {
           type: 'topology-data-source',
           entity: 'SERVICE',
           'downstream-entities': ['SERVICE', 'BACKEND'],
-          'node-metrics': [
-            {
-              type: 'percentile-latency-metric-aggregation',
-              'display-name': 'P99 Latency'
+          'edge-metrics': {
+            type: 'topology-metrics',
+            primary: {
+              type: 'topology-metric-with-category',
+              specification: {
+                type: 'percentile-latency-metric-aggregation',
+                'display-name': 'P99 Latency'
+              },
+              categories: [
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryEdgeMetricCategories[0]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryEdgeMetricCategories[1]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryEdgeMetricCategories[2]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryEdgeMetricCategories[3]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryEdgeMetricCategories[4]
+                }
+              ]
             },
-            {
-              type: 'metric-aggregation',
-              metric: 'duration',
-              aggregation: MetricAggregationType.P50,
-              'display-name': 'P50 Latency'
+            secondary: {
+              type: 'topology-metric-with-category',
+              specification: {
+                type: 'error-percentage-metric-aggregation',
+                aggregation: MetricAggregationType.Average,
+                'display-name': 'Error %'
+              },
+              categories: [
+                {
+                  type: 'topology-metric-category',
+                  ...defaultSecondaryEdgeMetricCategories[0]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultSecondaryEdgeMetricCategories[1]
+                }
+              ]
             },
-            {
-              type: 'error-percentage-metric-aggregation',
-              aggregation: MetricAggregationType.Average,
-              'display-name': 'Error %'
+            others: [
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'duration',
+                  aggregation: MetricAggregationType.P50,
+                  'display-name': 'P50 Latency'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'errorCount',
+                  aggregation: MetricAggregationType.Sum,
+                  'display-name': 'Error Count'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'numCalls',
+                  aggregation: MetricAggregationType.AvgrateSecond,
+                  'display-name': 'Call Rate/sec'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'numCalls',
+                  aggregation: MetricAggregationType.Sum,
+                  'display-name': 'Call Count'
+                }
+              }
+            ]
+          },
+          'node-metrics': {
+            type: 'topology-metrics',
+            primary: {
+              type: 'topology-metric-with-category',
+              specification: {
+                type: 'percentile-latency-metric-aggregation',
+                'display-name': 'P99 Latency'
+              },
+              categories: [
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryNodeMetricCategories[0]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryNodeMetricCategories[1]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryNodeMetricCategories[2]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryNodeMetricCategories[3]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultPrimaryNodeMetricCategories[4]
+                }
+              ]
             },
-
-            {
-              type: 'metric-aggregation',
-              metric: 'errorCount',
-              aggregation: MetricAggregationType.Sum,
-              'display-name': 'Error Count'
-            },
-            {
-              type: 'metric-aggregation',
-              metric: 'numCalls',
-              aggregation: MetricAggregationType.AvgrateSecond,
-              'display-name': 'Call Rate/sec'
-            },
-            {
-              type: 'metric-aggregation',
-              metric: 'numCalls',
-              aggregation: MetricAggregationType.Sum,
-              'display-name': 'Call Count'
-            }
-          ],
-          'edge-metrics': [
-            {
-              type: 'percentile-latency-metric-aggregation',
-              'display-name': 'P99 Latency'
-            },
-            {
-              type: 'metric-aggregation',
-              metric: 'duration',
-              aggregation: MetricAggregationType.P50,
-              'display-name': 'P50 Latency'
-            },
-            {
-              type: 'error-percentage-metric-aggregation',
-              aggregation: MetricAggregationType.Average,
-              'display-name': 'Error %'
-            },
-
-            {
-              type: 'metric-aggregation',
-              metric: 'errorCount',
-              aggregation: MetricAggregationType.Sum,
-              'display-name': 'Error Count'
-            },
-            {
-              type: 'metric-aggregation',
-              metric: 'numCalls',
-              aggregation: MetricAggregationType.AvgrateSecond,
-              'display-name': 'Call Rate/sec'
+            secondary: {
+              type: 'topology-metric-with-category',
+              specification: {
+                type: 'error-percentage-metric-aggregation',
+                aggregation: MetricAggregationType.Average,
+                'display-name': 'Error %'
+              },
+              categories: [
+                {
+                  type: 'topology-metric-category',
+                  ...defaultSecondaryNodeMetricCategories[0]
+                },
+                {
+                  type: 'topology-metric-category',
+                  ...defaultSecondaryNodeMetricCategories[1]
+                }
+              ]
             },
-            {
-              type: 'metric-aggregation',
-              metric: 'numCalls',
-              aggregation: MetricAggregationType.Sum,
-              'display-name': 'Call Count'
-            }
-          ]
+            others: [
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'duration',
+                  aggregation: MetricAggregationType.P50,
+                  'display-name': 'P50 Latency'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'errorCount',
+                  aggregation: MetricAggregationType.Sum,
+                  'display-name': 'Error Count'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'numCalls',
+                  aggregation: MetricAggregationType.AvgrateSecond,
+                  'display-name': 'Call Rate/sec'
+                }
+              },
+              {
+                type: 'topology-metric-with-category',
+                specification: {
+                  type: 'metric-aggregation',
+                  metric: 'numCalls',
+                  aggregation: MetricAggregationType.Sum,
+                  'display-name': 'Call Count'
+                }
+              }
+            ]
+          }
         }
       }
     ]

projects/observability/src/shared/dashboard/data/graphql/observability-graphql-data-source.module.ts

@@ -28,6 +28,9 @@ import { PercentileLatencyAggregationSpecificationModel } from './specifiers/per
 import { EntityTableDataSourceModel } from './table/entity/entity-table-data-source.model';
 import { ExploreTableDataSourceModel } from './table/explore/explore-table-data-source.model';
 import { InteractionsTableDataSourceModel } from './table/interactions/interactions-table-data-source.model';
+import { TopologyMetricCategoryModel } from './topology/metrics/topology-metric-category.model';
+import { TopologyMetricWithCategoryModel } from './topology/metrics/topology-metric-with-category.model';
+import { TopologyMetricsModel } from './topology/metrics/topology-metrics.model';
 import { TopologyDataSourceModel } from './topology/topology-data-source.model';
 import { TraceMetricAggregationDataSourceModel } from './trace/aggregation/trace-metric-aggregation-data-source.model';
 import { TraceDonutDataSourceModel } from './trace/donut/trace-donut-data-source.model';
@@ -53,6 +56,9 @@ import { ApiTraceWaterfallDataSourceModel } from './waterfall/api-trace-waterfal
         EntityMetricTimeseriesDataSourceModel,
         EntityMetricAggregationDataSourceModel,
         TopologyDataSourceModel,
+        TopologyMetricsModel,
+        TopologyMetricWithCategoryModel,
+        TopologyMetricCategoryModel,
         EntityTableDataSourceModel,
         InteractionsTableDataSourceModel,
         EntityAttributeDataSourceModel,

projects/observability/src/shared/dashboard/data/graphql/topology/metrics/topology-metric-category.model.ts

@@ -0,0 +1,75 @@
+import { Color } from '@hypertrace/common';
+import { BOOLEAN_PROPERTY, Model, ModelProperty, NUMBER_PROPERTY, STRING_PROPERTY } from '@hypertrace/hyperdash';
+import { kebabCase, uniqueId } from 'lodash-es';
+
+@Model({
+  type: 'topology-metric-category'
+})
+export class TopologyMetricCategoryModel implements TopologyMetricCategoryData {
+
+  @ModelProperty({
+    key: 'name',
+    required: true,
+    type: STRING_PROPERTY.type
+  })
+  public name!: string;
+
+  @ModelProperty({
+    key: 'minValue',
+    required: true,
+    type: NUMBER_PROPERTY.type
+  })
+  public minValue!: number;
+
+  @ModelProperty({
+    key: 'maxValue',
+    required: false,
+    type: NUMBER_PROPERTY.type
+  })
+  public maxValue?: number;
+
+  @ModelProperty({
+    key: 'fillColor',
+    required: true,
+    type: STRING_PROPERTY.type
+  })
+  public fillColor!: Color;
+
+  @ModelProperty({
+    key: 'strokeColor',
+    required: true,
+    type: STRING_PROPERTY.type
+  })
+  public strokeColor!: Color;
+
+  @ModelProperty({
+    key: 'focusColor',
+    required: true,
+    type: STRING_PROPERTY.type
+  })
+  public focusColor!: Color;
+
+  @ModelProperty({
+    key: 'highestPrecedence',
+    required: false,
+    type: BOOLEAN_PROPERTY.type
+  })
+  public highestPrecedence?: boolean = false;
+
+  private readonly id: string = uniqueId();
+
+  public getCategoryClassName(): string {
+    return `${kebabCase(this.name)}-${this.id}`;
+  }
+}
+
+export interface TopologyMetricCategoryData {
+  name: string;
+  minValue: number;
+  maxValue?: number;
+  fillColor: string;
+  strokeColor: string;
+  focusColor: string;
+  highestPrecedence?: boolean;
+  getCategoryClassName(): string;
+}