From 2fb6697eeaf198960d7b6cae48c8b91c218e2497 Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Thu, 27 Feb 2025 10:02:23 +0100 Subject: [PATCH] Targets API: Remove superfluous if() and make variable names more intuitive Signed-off-by: Julius Volz --- web/api/v1/api.go | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/web/api/v1/api.go b/web/api/v1/api.go index 1b8798feb8..36ddcaa8b8 100644 --- a/web/api/v1/api.go +++ b/web/api/v1/api.go @@ -1105,15 +1105,15 @@ func (api *API) scrapePools(r *http.Request) apiFuncResult { } func (api *API) targets(r *http.Request) apiFuncResult { - sortKeys := func(targets map[string][]*scrape.Target) ([]string, int) { + getSortedPools := func(targets map[string][]*scrape.Target) ([]string, int) { var n int - keys := make([]string, 0, len(targets)) - for k := range targets { - keys = append(keys, k) - n += len(targets[k]) + pools := make([]string, 0, len(targets)) + for p := range targets { + pools = append(pools, p) + n += len(targets[p]) } - slices.Sort(keys) - return keys, n + slices.Sort(pools) + return pools, n } scrapePool := r.URL.Query().Get("scrapePool") @@ -1125,14 +1125,14 @@ func (api *API) targets(r *http.Request) apiFuncResult { if showActive { targetsActive := api.targetRetriever(r.Context()).TargetsActive() - activeKeys, numTargets := sortKeys(targetsActive) + activePools, numTargets := getSortedPools(targetsActive) res.ActiveTargets = make([]*Target, 0, numTargets) - for _, key := range activeKeys { - if scrapePool != "" && key != scrapePool { + for _, p := range activePools { + if scrapePool != "" && p != scrapePool { continue } - for _, target := range targetsActive[key] { + for _, target := range targetsActive[p] { lastErrStr := "" lastErr := target.LastError() if lastErr != nil { @@ -1144,7 +1144,7 @@ func (api *API) targets(r *http.Request) apiFuncResult { res.ActiveTargets = append(res.ActiveTargets, &Target{ DiscoveredLabels: target.DiscoveredLabels(builder), Labels: target.Labels(builder), - ScrapePool: key, + ScrapePool: p, ScrapeURL: target.URL().String(), GlobalURL: globalURL.String(), LastError: func() string { @@ -1170,16 +1170,15 @@ func (api *API) targets(r *http.Request) apiFuncResult { } if showDropped { res.DroppedTargetCounts = api.targetRetriever(r.Context()).TargetsDroppedCounts() - } - if showDropped { + targetsDropped := api.targetRetriever(r.Context()).TargetsDropped() - droppedKeys, numTargets := sortKeys(targetsDropped) + droppedPools, numTargets := getSortedPools(targetsDropped) res.DroppedTargets = make([]*DroppedTarget, 0, numTargets) - for _, key := range droppedKeys { - if scrapePool != "" && key != scrapePool { + for _, p := range droppedPools { + if scrapePool != "" && p != scrapePool { continue } - for _, target := range targetsDropped[key] { + for _, target := range targetsDropped[p] { res.DroppedTargets = append(res.DroppedTargets, &DroppedTarget{ DiscoveredLabels: target.DiscoveredLabels(builder), })