mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Refactor to simplify code:

Browse source 
* Reduce number of variables
* Reduce type convesion

Signed-off-by: Raphael Silva <rapphil@gmail.com>
This commit is contained in:
Raphael Silva 2024-06-10 20:48:49 +00:00
parent b674217dc9
commit bbd2f1cff8
2 changed files with 78 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
web/api/v1/api.go
View file

@ -170,8 +170,8 @@ type apiFuncResult struct {
type apiFunc func(r *http.Request) apiFuncResult type apiFunc func(r *http.Request) apiFuncResult
type listRulesPaginationRequest struct { type listRulesPaginationRequest struct {
MaxAlerts int32 MaxAlerts int64
MaxRuleGroups int32 MaxRuleGroups int64
NextToken string NextToken string
} }
@ -1390,7 +1390,7 @@ type AlertingRulePaginated struct {
KeepFiringFor float64 `json:"keepFiringFor"` KeepFiringFor float64 `json:"keepFiringFor"`
Labels labels.Labels `json:"labels"` Labels labels.Labels `json:"labels"`
Annotations labels.Labels `json:"annotations"` Annotations labels.Labels `json:"annotations"`
AlertInfo *AlertsPaginated `json:"alertInfo"` PartialAlerts *PartialAlerts `json:"alertInfo"`
Health rules.RuleHealth `json:"health"` Health rules.RuleHealth `json:"health"`
LastError string `json:"lastError,omitempty"` LastError string `json:"lastError,omitempty"`
EvaluationTime float64 `json:"evaluationTime"` EvaluationTime float64 `json:"evaluationTime"`
@ -1399,7 +1399,7 @@ type AlertingRulePaginated struct {
Type string `json:"type"` Type string `json:"type"`
} }
type AlertsPaginated struct { type PartialAlerts struct {
Alerts []*Alert `json:"alerts"` Alerts []*Alert `json:"alerts"`
HasMore bool `json:"hasMore"` HasMore bool `json:"hasMore"`
} }
@ -1472,7 +1472,7 @@ func (api *API) rules(r *http.Request) apiFuncResult {
} }
} }
// Skip the rule group if the next token is set and hasn't arrived the nextToken item yet. // Skip the rule group if the next token is set and hasn't arrived at the nextToken item yet.
groupID := getRuleGroupNextToken(grp.File(), grp.Name()) groupID := getRuleGroupNextToken(grp.File(), grp.Name())
if paginationRequest != nil && len(paginationRequest.NextToken) > 0 && paginationRequest.NextToken >= groupID { if paginationRequest != nil && len(paginationRequest.NextToken) > 0 && paginationRequest.NextToken >= groupID {
continue continue
@ -1510,7 +1510,7 @@ func (api *API) rules(r *http.Request) apiFuncResult {
activeAlerts = rulesAlertsToAPIAlerts(rule.ActiveAlerts()) activeAlerts = rulesAlertsToAPIAlerts(rule.ActiveAlerts())
} }
hasMore := false hasMore := false
if paginationRequest != nil && paginationRequest.MaxAlerts >= 0 && len(rule.ActiveAlerts()) > int(paginationRequest.MaxAlerts) { if paginationRequest != nil && paginationRequest.MaxAlerts >= 0 && len(activeAlerts) > int(paginationRequest.MaxAlerts) {
activeAlerts = activeAlerts[:int(paginationRequest.MaxAlerts)] activeAlerts = activeAlerts[:int(paginationRequest.MaxAlerts)]
hasMore = true hasMore = true
} }
@ -1524,7 +1524,7 @@ func (api *API) rules(r *http.Request) apiFuncResult {
KeepFiringFor: rule.KeepFiringFor().Seconds(), KeepFiringFor: rule.KeepFiringFor().Seconds(),
Labels: rule.Labels(), Labels: rule.Labels(),
Annotations: rule.Annotations(), Annotations: rule.Annotations(),
AlertInfo: &AlertsPaginated{ PartialAlerts: &PartialAlerts{
Alerts: activeAlerts, Alerts: activeAlerts,
HasMore: hasMore, HasMore: hasMore,
}, },
@ -1609,42 +1609,41 @@ func parseExcludeAlerts(r *http.Request) (bool, error) {
func parseListRulesPaginationRequest(r *http.Request) (*listRulesPaginationRequest, *parsePaginationError) { func parseListRulesPaginationRequest(r *http.Request) (*listRulesPaginationRequest, *parsePaginationError) {
var ( var (
returnMaxAlert = int32(-1) maxAlerts int64 = -1
returnMaxRuleGroups = int32(-1) maxRuleGroups int64 = -1
returnNextToken = "" nextToken = ""
err error
) )
if r.URL.Query().Get("maxAlerts") != "" { if r.URL.Query().Get("maxAlerts") != "" {
maxAlert, err := strconv.ParseInt(r.URL.Query().Get("maxAlerts"), 10, 32) maxAlerts, err = strconv.ParseInt(r.URL.Query().Get("maxAlerts"), 10, 32)
if err != nil || maxAlert < 0 { if err != nil || maxAlerts < 0 {
return nil, &parsePaginationError{ return nil, &parsePaginationError{
err: fmt.Errorf("maxAlerts need to be a valid number and larger than 0: %w", err), err: fmt.Errorf("maxAlerts need to be a valid number greater than or equal to 0: %w", err),
parameter: "maxAlerts", parameter: "maxAlerts",
} }
} }
returnMaxAlert = int32(maxAlert)
} }
if r.URL.Query().Get("maxRuleGroups") != "" { if r.URL.Query().Get("maxRuleGroups") != "" {
maxRuleGroups, err := strconv.ParseInt(r.URL.Query().Get("maxRuleGroups"), 10, 32) maxRuleGroups, err = strconv.ParseInt(r.URL.Query().Get("maxRuleGroups"), 10, 32)
if err != nil || maxRuleGroups < 0 { if err != nil || maxRuleGroups < 0 {
return nil, &parsePaginationError{ return nil, &parsePaginationError{
err: fmt.Errorf("maxRuleGroups need to be a valid number and larger than 0: %w", err), err: fmt.Errorf("maxRuleGroups need to be a valid number greater than or equal to 0: %w", err),
parameter: "maxAlerts", parameter: "maxAlerts",
} }
} }
returnMaxRuleGroups = int32(maxRuleGroups)
} }
if r.URL.Query().Get("nextToken") != "" { if r.URL.Query().Get("nextToken") != "" {
returnNextToken = r.URL.Query().Get("nextToken") nextToken = r.URL.Query().Get("nextToken")
} }
if returnMaxRuleGroups >= 0 || returnMaxAlert >= 0 || returnNextToken != "" { if maxAlerts >= 0 || maxRuleGroups >= 0 || nextToken != "" {
return &listRulesPaginationRequest{ return &listRulesPaginationRequest{
MaxRuleGroups: returnMaxRuleGroups, MaxRuleGroups: maxRuleGroups,
MaxAlerts: returnMaxAlert, MaxAlerts: maxAlerts,
NextToken: returnNextToken, NextToken: nextToken,
}, nil }, nil
} }
@ -1652,19 +1651,17 @@ func parseListRulesPaginationRequest(r *http.Request) (*listRulesPaginationReque
} }
func TruncateGroupInfos(groupInfos []*RuleGroup, maxRuleGroups int) ([]*RuleGroup, string) { func TruncateGroupInfos(groupInfos []*RuleGroup, maxRuleGroups int) ([]*RuleGroup, string) {
resultNumber := 0
var returnPaginationToken string var returnPaginationToken string
returnGroupDescs := make([]*RuleGroup, 0, len(groupInfos)) returnGroupDescs := make([]*RuleGroup, 0, len(groupInfos))
for _, groupInfo := range groupInfos { for _, groupInfo := range groupInfos {
// Add the rule group to the return slice if the maxRuleGroups is not hit // Add the rule group to the return slice if the maxRuleGroups is not hit
if maxRuleGroups < 0 || resultNumber < maxRuleGroups { if maxRuleGroups < 0 || len(returnGroupDescs) < maxRuleGroups {
returnGroupDescs = append(returnGroupDescs, groupInfo) returnGroupDescs = append(returnGroupDescs, groupInfo)
resultNumber++
continue continue
} }
// Return the next token if there is more aggregation group // Return the next token if there are more aggregation groups
if maxRuleGroups > 0 && resultNumber == maxRuleGroups { if maxRuleGroups > 0 && len(returnGroupDescs) == maxRuleGroups {
returnPaginationToken = getRuleGroupNextToken(returnGroupDescs[maxRuleGroups-1].File, returnGroupDescs[maxRuleGroups-1].Name) returnPaginationToken = getRuleGroupNextToken(returnGroupDescs[maxRuleGroups-1].File, returnGroupDescs[maxRuleGroups-1].Name)
break break
} }
@ -1672,9 +1669,9 @@ func TruncateGroupInfos(groupInfos []*RuleGroup, maxRuleGroups int) ([]*RuleGrou
return returnGroupDescs, returnPaginationToken return returnGroupDescs, returnPaginationToken
} }
func getRuleGroupNextToken(namespace, group string) string { func getRuleGroupNextToken(file, group string) string {
h := sha1.New() h := sha1.New()
h.Write([]byte(namespace + ";" + group)) h.Write([]byte(file + ";" + group))
return fmt.Sprintf("%x", h.Sum(nil)) return fmt.Sprintf("%x", h.Sum(nil))
} }
@ -2077,8 +2074,8 @@ func parseLimitParam(limitStr string) (limit int, err error) {
type GroupStateDescs []*rules.Group type GroupStateDescs []*rules.Group
func (gi GroupStateDescs) Swap(i, j int) { gi[i], gi[j] = gi[j], gi[i] } func (g GroupStateDescs) Swap(i, j int) { g[i], g[j] = g[j], g[i] }
func (gi GroupStateDescs) Less(i, j int) bool { func (g GroupStateDescs) Less(i, j int) bool {
return getRuleGroupNextToken(gi[i].File(), gi[i].Name()) < getRuleGroupNextToken(gi[j].File(), gi[j].Name()) return getRuleGroupNextToken(g[i].File(), g[i].Name()) < getRuleGroupNextToken(g[j].File(), g[j].Name())
} }
func (gi GroupStateDescs) Len() int { return len(gi) } func (g GroupStateDescs) Len() int { return len(g) }

16
web/api/v1/api_test.go
View file

@ -1110,7 +1110,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
r.EvaluationTime = float64(0) r.EvaluationTime = float64(0)
r.LastError = "" r.LastError = ""
r.Health = "ok" r.Health = "ok"
for _, alert := range r.AlertInfo.Alerts { for _, alert := range r.PartialAlerts.Alerts {
alert.ActiveAt = nil alert.ActiveAt = nil
} }
ruleGroup.Rules[k] = r ruleGroup.Rules[k] = r
@ -2448,7 +2448,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.Labels{}, Labels: labels.Labels{},
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{Alerts: []*Alert{}}, PartialAlerts: &PartialAlerts{Alerts: []*Alert{}},
Health: "ok", Health: "ok",
Type: "alerting", Type: "alerting",
}, },
@ -2459,7 +2459,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.Labels{}, Labels: labels.Labels{},
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{Alerts: []*Alert{}}, PartialAlerts: &PartialAlerts{Alerts: []*Alert{}},
Health: "ok", Health: "ok",
Type: "alerting", Type: "alerting",
}, },
@ -2470,7 +2470,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.FromStrings("name", "tm5"), Labels: labels.FromStrings("name", "tm5"),
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{ PartialAlerts: &PartialAlerts{
Alerts: []*Alert{ Alerts: []*Alert{
{ {
Labels: labels.FromStrings("alertname", "test_metric5", "name", "tm5"), Labels: labels.FromStrings("alertname", "test_metric5", "name", "tm5"),
@ -2516,7 +2516,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.Labels{}, Labels: labels.Labels{},
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{Alerts: []*Alert{}}, PartialAlerts: &PartialAlerts{Alerts: []*Alert{}},
Health: "ok", Health: "ok",
Type: "alerting", Type: "alerting",
}, },
@ -2527,7 +2527,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.Labels{}, Labels: labels.Labels{},
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{Alerts: []*Alert{}}, PartialAlerts: &PartialAlerts{Alerts: []*Alert{}},
Health: "ok", Health: "ok",
Type: "alerting", Type: "alerting",
}, },
@ -2538,7 +2538,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.FromStrings("name", "tm5"), Labels: labels.FromStrings("name", "tm5"),
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{ PartialAlerts: &PartialAlerts{
Alerts: []*Alert{}, Alerts: []*Alert{},
HasMore: true, HasMore: true,
}, },
@ -2567,7 +2567,7 @@ func testEndpoints(t *testing.T, api *API, tr *testTargetRetriever, es storage.E
Duration: 1, Duration: 1,
Labels: labels.Labels{}, Labels: labels.Labels{},
Annotations: labels.Labels{}, Annotations: labels.Labels{},
AlertInfo: &AlertsPaginated{Alerts: []*Alert{}}, PartialAlerts: &PartialAlerts{Alerts: []*Alert{}},
Health: "ok", Health: "ok",
Type: "alerting", Type: "alerting",
}, },