enable experimental function using parser

Signed-off-by: Sujal Gupta <[email protected]>

Author: heysujal

cmd/thanos/query.go

@@ -133,8 +133,7 @@ func registerQuery(app *extkingpin.App) {
 
 	enableMetricMetadataPartialResponse := cmd.Flag("metric-metadata.partial-response", "Enable partial response for metric metadata endpoint. --no-metric-metadata.partial-response for disabling.").
 		Hidden().Default("true").Bool()
-
-	enableQueryExperimentalFunctions := cmd.Flag("--enable-feature=promql-experimental-functions", "Enable experimental functions for queries.")
+	
 	activeQueryDir := cmd.Flag("query.active-query-path", "Directory to log currently active queries in the queries.active file.").Default("").String()
 
 	featureList := cmd.Flag("enable-feature", "Comma separated experimental feature names to enable. The current list of features is: promql-experimental-functions (enables experimental PromQL functions).").Hidden().Default("").Strings()
@@ -219,9 +218,6 @@ func registerQuery(app *extkingpin.App) {
 			if feature == queryPushdown {
 				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently deprecated and therefore ignored.", "option", queryPushdown)
 			}
-			if feature == promqlExperimentalFunctions {
-				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently enabled and therefore a no-op.", "option", promqlExperimentalFunctions)
-			}
 		}
 
 		httpLogOpts, err := logging.ParseHTTPOptions(reqLogConfig)
@@ -322,7 +318,6 @@ func registerQuery(app *extkingpin.App) {
 			*enableTargetPartialResponse,
 			*enableMetricMetadataPartialResponse,
 			*enableExemplarPartialResponse,
-			*enableQueryExperimentalFunctions,
 			*activeQueryDir,
 			time.Duration(*instantDefaultMaxSourceResolution),
 			*defaultMetadataTimeRange,

pkg/api/query/engine.go

@@ -27,6 +27,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prometheus/promql"
+	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/prometheus/prometheus/storage"
 
 	"github.com/thanos-io/promql-engine/api"
@@ -88,11 +89,14 @@ func NewQueryFactory(
 	lookbackDelta time.Duration,
 	evaluationInterval time.Duration,
 	enableXFunctions bool,
-	enableQueryExperimentalFunctions bool,
+	enablePromQLExperimentalFunctions bool,
 	activeQueryTracker *promql.ActiveQueryTracker,
 	mode PromqlQueryMode,
 ) *QueryFactory {
 	makeOpts := func(registry prometheus.Registerer) engine.Opts {
+		// Set global experimental functions flag
+		parser.EnableExperimentalFunctions = enablePromQLExperimentalFunctions
+
 		opts := engine.Opts{
 			EngineOpts: promql.EngineOpts{
 				Logger: logutil.GoKitLogToSlog(logger),
@@ -107,9 +111,8 @@ func NewQueryFactory(
 				EnableNegativeOffset: true,
 				EnableAtModifier:     true,
 			},
-			EnableXFunctions:                 enableXFunctions,
-			EnableQueryExperimentalFunctions: enableQueryExperimentalFunctions,
-			EnableAnalysis:                   true,
+			EnableXFunctions: enableXFunctions,
+			EnableAnalysis:   true,
 		}
 		if activeQueryTracker != nil {
 			opts.ActiveQueryTracker = activeQueryTracker