Skip to content

Commit ddc5fc5

Browse files
committed
SD-11577: code review from agent
1 parent 30a3e17 commit ddc5fc5

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func fetchMetrics(deniedMetricsSet MetricsSet) {
110110

111111
for _, a := range accounts {
112112
go fetchWorkerAnalytics(a, &wg)
113-
go fetchKVAnalytics(a, &wg)
113+
go fetchKVAnalytics(a, &wg, deniedMetricsSet)
114114
go fetchLogpushAnalyticsForAccount(a, &wg)
115115
go fetchR2StorageForAccount(a, &wg)
116116
go fetchLoadblancerPoolsHealth(a, &wg)

prometheus.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ func fetchWorkerAnalytics(account cfaccounts.Account, wg *sync.WaitGroup) {
627627
}
628628
}
629629

630-
func fetchKVAnalytics(account cfaccounts.Account, wg *sync.WaitGroup) {
630+
func fetchKVAnalytics(account cfaccounts.Account, wg *sync.WaitGroup, deniedMetricsSet MetricsSet) {
631631
wg.Add(1)
632632
defer wg.Done()
633633

@@ -652,11 +652,15 @@ func fetchKVAnalytics(account cfaccounts.Account, wg *sync.WaitGroup) {
652652
namespaceName = kv.Dimensions.NamespaceID
653653
}
654654

655-
kvRequests.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName}).Set(float64(kv.Sum.Requests))
656-
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P50"}).Set(float64(kv.Quantiles.LatencyMsP50))
657-
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P75"}).Set(float64(kv.Quantiles.LatencyMsP75))
658-
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P99"}).Set(float64(kv.Quantiles.LatencyMsP99))
659-
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P999"}).Set(float64(kv.Quantiles.LatencyMsP999))
655+
if !deniedMetricsSet.Has(kvRequestsMetricName) {
656+
kvRequests.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName}).Set(float64(kv.Sum.Requests))
657+
}
658+
if !deniedMetricsSet.Has(kvLatencyMetricName) {
659+
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P50"}).Set(float64(kv.Quantiles.LatencyMsP50))
660+
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P75"}).Set(float64(kv.Quantiles.LatencyMsP75))
661+
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P99"}).Set(float64(kv.Quantiles.LatencyMsP99))
662+
kvLatency.With(prometheus.Labels{"namespace_name": namespaceName, "action_type": kv.Dimensions.ActionType, "account": accountName, "quantile": "P999"}).Set(float64(kv.Quantiles.LatencyMsP999))
663+
}
660664
}
661665
}
662666
}

0 commit comments

Comments
 (0)