Use ContextEval with Cel to ensure timeouts are respected

Signed-off-by: Juho Majasaari <[email protected]>
prometheus · Aug 8, 2024 · b9b903b · b9b903b
1 parent 59ff2b4
commit b9b903b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/config/config.go b/config/config.go
@@ -174,7 +174,7 @@ func NewCelProgram(s string) (CelProgram, error) {
 		return program, fmt.Errorf("error compiling CEL program: %s", issues.Err())
 	}
 
-	celProg, err := env.Program(ast)
+	celProg, err := env.Program(ast, cel.InterruptCheckFrequency(100))
 	if err != nil {
 		return program, fmt.Errorf("error creating CEL program: %s", err)
 	}

diff --git a/prober/http.go b/prober/http.go
@@ -67,7 +67,7 @@ func matchRegularExpressions(reader io.Reader, httpConfig config.HTTPProbe, logg
 	return true
 }
 
-func matchCelExpressions(reader io.Reader, httpConfig config.HTTPProbe, logger log.Logger) bool {
+func matchCelExpressions(ctx context.Context, reader io.Reader, httpConfig config.HTTPProbe, logger log.Logger) bool {
 	body, err := io.ReadAll(reader)
 	if err != nil {
 		level.Error(logger).Log("msg", "Error reading HTTP body", "err", err)
@@ -85,7 +85,7 @@ func matchCelExpressions(reader io.Reader, httpConfig config.HTTPProbe, logger l
 	}
 
 	if httpConfig.FailIfBodyJSONMatchesCel != nil {
-		result, details, err := httpConfig.FailIfBodyJSONMatchesCel.Eval(evalPayload)
+		result, details, err := httpConfig.FailIfBodyJSONMatchesCel.ContextEval(ctx, evalPayload)
 		if err != nil {
 			level.Error(logger).Log("msg", "Error evaluating CEL expression", "err", err)
 			return false
@@ -101,7 +101,7 @@ func matchCelExpressions(reader io.Reader, httpConfig config.HTTPProbe, logger l
 	}
 
 	if httpConfig.FailIfBodyJSONNotMatchesCel != nil {
-		result, details, err := httpConfig.FailIfBodyJSONNotMatchesCel.Eval(evalPayload)
+		result, details, err := httpConfig.FailIfBodyJSONNotMatchesCel.ContextEval(ctx, evalPayload)
 		if err != nil {
 			level.Error(logger).Log("msg", "Error evaluating CEL expression", "err", err)
 			return false
@@ -609,7 +609,7 @@ func ProbeHTTP(ctx context.Context, target string, module config.Module, registr
 		}
 
 		if success && (httpConfig.FailIfBodyJSONMatchesCel != nil || httpConfig.FailIfBodyJSONNotMatchesCel != nil) {
-			success = matchCelExpressions(byteCounter, httpConfig, logger)
+			success = matchCelExpressions(ctx, byteCounter, httpConfig, logger)
 			if success {
 				probeFailedDueToCel.Set(0)
 			} else {