Skip to content

refactor: migrating to new topology custom metric #1000

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 16, 2021
Merged

refactor: migrating to new topology custom metric #1000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b128254
feat: adding topology custom metric model and service
anandtiwary Jul 15, 2021
bf79eff
refactor: migrating to new topology custom metric
anandtiwary Jul 15, 2021
dd26de0
refactor: adding test
anandtiwary Jul 16, 2021
335c887
Merge branch 'topology-custom-metric-1' into topology-custom-metric-2
anandtiwary Jul 16, 2021
43b5ed5
refactor: adding tests
anandtiwary Jul 16, 2021
1c6c5e9
Merge branch 'main' into topology-custom-metric-2
anandtiwary Jul 16, 2021
f1865d8
refactor: fixing test
anandtiwary Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
248 changes: 180 additions & 68 deletions projects/observability/src/pages/apis/topology/application-flow.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
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,
Expand All @@ -26,78 +34,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'
}
}
]
}
}
}
]
Expand Down
6 changes: 6 additions & 0 deletions ...servability/src/shared/dashboard/data/graphql/observability-graphql-data-source.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -53,6 +56,9 @@ import { ApiTraceWaterfallDataSourceModel } from './waterfall/api-trace-waterfal
EntityMetricTimeseriesDataSourceModel,
EntityMetricAggregationDataSourceModel,
TopologyDataSourceModel,
TopologyMetricsModel,
TopologyMetricWithCategoryModel,
TopologyMetricCategoryModel,
EntityTableDataSourceModel,
InteractionsTableDataSourceModel,
EntityAttributeDataSourceModel,
Expand Down
Loading