Repository: prometheus/prometheus (language: go)

Issue:
--enable-feature: remove "promql-at-modifier" and "promql-negative-offset"
### Proposal

Both features are enabled by default and thus should be dropped from the feature flag list for a major version bump.

_edit_
This issue needs no work at this point. https://github.com/prometheus/prometheus/pull/13456 is the proposed fix. We can only merge this when we have a prometheus 3 branch, so this issue is done but will stay open for a bit.


Discussion / hints:

Fix patch:
diff --git a/cmd/prometheus/main.go b/cmd/prometheus/main.go
index cd7f533d1c3..39b22f446c2 100644
--- a/cmd/prometheus/main.go
+++ b/cmd/prometheus/main.go
@@ -233,8 +233,6 @@ func (c *flagConfig) setFeatureListOptions(logger log.Logger) error {
 				level.Info(logger).Log("msg", "Experimental created timestamp zero ingestion enabled. Changed default scrape_protocols to prefer PrometheusProto format.", "global.scrape_protocols", fmt.Sprintf("%v", config.DefaultGlobalConfig.ScrapeProtocols))
 			case "":
 				continue
-			case "promql-at-modifier", "promql-negative-offset":
-				level.Warn(logger).Log("msg", "This option for --enable-feature is now permanently enabled and therefore a no-op.", "option", o)
 			default:
 				level.Warn(logger).Log("msg", "Unknown option for --enable-feature", "option", o)
 			}
diff --git a/cmd/promtool/main.go b/cmd/promtool/main.go
index e1d275e97ed..a8bef305df8 100644
--- a/cmd/promtool/main.go
+++ b/cmd/promtool/main.go
@@ -323,8 +323,6 @@ func main() {
 				noDefaultScrapePort = true
 			case "":
 				continue
-			case "promql-at-modifier", "promql-negative-offset":
-				fmt.Printf("  WARNING: Option for --enable-feature is a no-op after promotion to a stable feature: %q\n", o)
 			default:
 				fmt.Printf("  WARNING: Unknown option for --enable-feature: %q\n", o)
 			}


Test patch: