Skip to content

Commit 79ce703

Browse files
authored
Merge pull request #1591 from cloudflare/allocs
Reduce allocations for parsed rules
2 parents 9400b39 + 8595eb4 commit 79ce703

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

internal/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (cfg *Config) GetChecksForEntry(ctx context.Context, gen *PrometheusGenerat
8787
defaultMatch := []Match{{State: defaultStates}}
8888
proms := gen.ServersForPath(entry.Path.Name)
8989

90-
parsedRules := make([]parsedRule, 0, len(cfg.Rules))
90+
parsedRules := make([]*parsedRule, 0, len(cfg.Rules))
9191
if entry.PathError != nil || entry.Rule.Error.Err != nil {
9292
check := checks.NewErrorCheck(entry)
9393
parsedRules = append(parsedRules, baseParsedRule(defaultMatch, check.Reporter(), check, nil))

internal/config/parsed_rule.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ type parsedRule struct {
1919
locked bool
2020
}
2121

22-
func newParsedRule(rule Rule, defaultStates []string, name string, check checks.RuleChecker, tags []string) parsedRule {
23-
return parsedRule{
22+
func newParsedRule(rule Rule, defaultStates []string, name string, check checks.RuleChecker, tags []string) *parsedRule {
23+
return &parsedRule{
2424
match: defaultRuleMatch(rule.Match, defaultStates),
2525
ignore: rule.Ignore,
2626
name: name,
@@ -30,8 +30,8 @@ func newParsedRule(rule Rule, defaultStates []string, name string, check checks.
3030
}
3131
}
3232

33-
func baseParsedRule(match []Match, name string, check checks.RuleChecker, tags []string) parsedRule {
34-
return parsedRule{
33+
func baseParsedRule(match []Match, name string, check checks.RuleChecker, tags []string) *parsedRule {
34+
return &parsedRule{
3535
match: match,
3636
ignore: nil,
3737
name: name,
@@ -115,8 +115,8 @@ func defaultMatchStates(cmd ContextCommandVal) []string {
115115
}
116116
}
117117

118-
func baseRules(staticRules []staticRule, proms []*promapi.FailoverGroup, match []Match) (rules []parsedRule) {
119-
rules = make([]parsedRule, 0, len(staticRules)+(len(proms)*9))
118+
func baseRules(staticRules []staticRule, proms []*promapi.FailoverGroup, match []Match) (rules []*parsedRule) {
119+
rules = make([]*parsedRule, 0, len(staticRules)+(len(proms)*9))
120120
for _, sr := range staticRules {
121121
rules = append(rules, baseParsedRule(match, sr.name, sr.checker, nil))
122122
}
@@ -152,7 +152,7 @@ func defaultRuleMatch(match []Match, defaultStates []string) []Match {
152152
return dst
153153
}
154154

155-
func parseRule(rule Rule, prometheusServers []*promapi.FailoverGroup, defaultStates []string) (rules []parsedRule) {
155+
func parseRule(rule Rule, prometheusServers []*promapi.FailoverGroup, defaultStates []string) (rules []*parsedRule) {
156156
if len(rule.Aggregate) > 0 {
157157
var nameRegex *checks.TemplatedRegexp
158158
for _, aggr := range rule.Aggregate {

0 commit comments

Comments
 (0)