Skip to content

Commit 7870f90

Browse files
committed
refactor: unify metric label comparison logic in SyncMetricsTask
1 parent 4f40579 commit 7870f90

File tree

1 file changed

+7
-16
lines changed

1 file changed

+7
-16
lines changed

src/scheduler/tasks/export-metrics/sync-metrics.task.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ export class SyncMetricsTask {
4949

5050
try {
5151
const nodesResponse = await this.queryBus.execute(new GetAllNodesQuery());
52+
5253
if (
5354
!nodesResponse.isOk ||
5455
!nodesResponse.response ||
@@ -122,7 +123,7 @@ export class SyncMetricsTask {
122123
const labels = stat.labels as INodeBaseMetricLabels;
123124
const existingNode = nodesMap.get(labels.node_uuid);
124125

125-
if (!existingNode || !this.compareBaseLabels(existingNode, labels)) {
126+
if (!existingNode || !this.compareMetricLabels(existingNode, labels)) {
126127
metric.remove(stat.labels);
127128
}
128129
}
@@ -137,13 +138,16 @@ export class SyncMetricsTask {
137138
const labels = stat.labels as INodeBandwidthMetricLabels;
138139
const existingNode = nodesMap.get(labels.node_uuid);
139140

140-
if (!existingNode || !this.compareNodeBandwidthLabels(existingNode, labels)) {
141+
if (!existingNode || !this.compareMetricLabels(existingNode, labels)) {
141142
metric.remove(stat.labels);
142143
}
143144
}
144145
}
145146

146-
private compareBaseLabels(nodeA: INodeBaseMetricLabels, nodeB: INodeBaseMetricLabels): boolean {
147+
private compareMetricLabels(
148+
nodeA: INodeBaseMetricLabels,
149+
nodeB: INodeBaseMetricLabels | INodeBandwidthMetricLabels,
150+
): boolean {
147151
return (
148152
nodeA.node_uuid === nodeB.node_uuid &&
149153
nodeA.node_name === nodeB.node_name &&
@@ -152,17 +156,4 @@ export class SyncMetricsTask {
152156
nodeA.tags === nodeB.tags
153157
);
154158
}
155-
156-
private compareNodeBandwidthLabels(
157-
existingNode: INodeBaseMetricLabels,
158-
metricLabels: INodeBandwidthMetricLabels,
159-
): boolean {
160-
return (
161-
existingNode.node_uuid === metricLabels.node_uuid &&
162-
existingNode.node_name === metricLabels.node_name &&
163-
existingNode.node_country_emoji === metricLabels.node_country_emoji &&
164-
existingNode.provider_name === metricLabels.provider_name &&
165-
existingNode.tags === metricLabels.tags
166-
);
167-
}
168159
}

0 commit comments

Comments
 (0)