Introduce Rule#Eval() & Escalation#Eval() methods

Author: yhabteab

internal/incident/incident.go

@@ -360,21 +360,19 @@ func (i *Incident) evaluateRules(ctx context.Context, tx *sqlx.Tx, eventID int64
 		}
 
 		if _, ok := i.Rules[r.ID]; !ok {
-			if r.ObjectFilter != nil {
-				matched, err := r.ObjectFilter.Eval(i.Object)
-				if err != nil {
-					i.logger.Warnw("Failed to evaluate object filter", zap.Object("rule", r), zap.Error(err))
-				}
+			matched, err := r.Eval(i.Object)
+			if err != nil {
+				i.logger.Warnw("Failed to evaluate object filter", zap.Object("rule", r), zap.Error(err))
+			}
 
-				if err != nil || !matched {
-					continue
-				}
+			if err != nil || !matched {
+				continue
 			}
 
 			i.Rules[r.ID] = struct{}{}
 			i.logger.Infow("Rule matches", zap.Object("rule", r))
 
-			err := i.AddRuleMatched(ctx, tx, r)
+			err = i.AddRuleMatched(ctx, tx, r)
 			if err != nil {
 				i.logger.Errorw("Failed to upsert incident rule", zap.Object("rule", r), zap.Error(err))
 
@@ -429,27 +427,16 @@ func (i *Incident) evaluateEscalations(eventTime time.Time) ([]*rule.Escalation,
 		// Check if new escalation stages are reached
 		for _, escalation := range r.Escalations {
 			if _, ok := i.EscalationState[escalation.ID]; !ok {
-				matched := false
-
-				if escalation.Condition == nil {
-					matched = true
+				matched, err := escalation.Eval(filterContext)
+				if err != nil {
+					i.logger.Warnw(
+						"Failed to evaluate escalation condition", zap.Object("rule", r),
+						zap.Object("escalation", escalation), zap.Error(err),
+					)
+				} else if !matched {
+					incidentAgeFilter := filterContext.ReevaluateAfter(escalation.Condition)
+					retryAfter = min(retryAfter, incidentAgeFilter)
 				} else {
-					var err error
-					matched, err = escalation.Condition.Eval(filterContext)
-					if err != nil {
-						i.logger.Warnw(
-							"Failed to evaluate escalation condition", zap.Object("rule", r),
-							zap.Object("escalation", escalation), zap.Error(err),
-						)
-
-						matched = false
-					} else if !matched {
-						incidentAgeFilter := filterContext.ReevaluateAfter(escalation.Condition)
-						retryAfter = min(retryAfter, incidentAgeFilter)
-					}
-				}
-
-				if matched {
 					escalations = append(escalations, escalation)
 				}
 			}

internal/rule/escalation.go

@@ -41,6 +41,16 @@ func (e *Escalation) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
 	return nil
 }
 
+// Eval evaluates the configured escalation filter for the provided filter.
+// Returns always true if there are no configured escalation conditions.
+func (e *Escalation) Eval(filterable *EscalationFilter) (bool, error) {
+	if e.Condition == nil {
+		return true, nil
+	}
+
+	return e.Condition.Eval(filterable)
+}
+
 func (e *Escalation) DisplayName() string {
 	if e.NameRaw.Valid && e.NameRaw.String != "" {
 		return e.NameRaw.String

internal/rule/rule.go

@@ -35,6 +35,16 @@ func (r *Rule) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
 	return nil
 }
 
+// Eval evaluates the configured object filter for the provided filterable.
+// Returns always true if the current rule doesn't have a configured object filter.
+func (r *Rule) Eval(filterable filter.Filterable) (bool, error) {
+	if r.ObjectFilter == nil {
+		return true, nil
+	}
+
+	return r.ObjectFilter.Eval(filterable)
+}
+
 // ContactChannels stores a set of channel IDs for each set of individual contacts.
 type ContactChannels map[*recipient.Contact]map[int64]bool