app/vmalert: follow-up after 7a9ae9de0d (#4381)

7a9ae9de0d

Signed-off-by: hagen1778 <roman@victoriametrics.com>

(cherry picked from commit eccecdf177)
Signed-off-by: hagen1778 <roman@victoriametrics.com>

app/vmalert/Makefile

@@ -73,6 +73,7 @@ test-vmalert:
 	go test -v -race -cover ./app/vmalert/notifier
 	go test -v -race -cover ./app/vmalert/config
 	go test -v -race -cover ./app/vmalert/remotewrite
+	go test -v -race -cover ./app/vmalert/utils
 
 run-vmalert: vmalert
 	./bin/vmalert -rule=app/vmalert/config/testdata/rules/rules2-good.rules \

app/vmalert/datasource/vm.go

@@ -13,6 +13,7 @@ import (
 )
 
 // VMStorage represents vmstorage entity with ability to read and write metrics
+// WARN: when adding a new field, remember to update Clone() method.
 type VMStorage struct {
 	c                *http.Client
 	authCfg          *promauth.Config
@@ -32,11 +33,13 @@ func (s *VMStorage) Clone() *VMStorage {
 		c:                s.c,
 		authCfg:          s.authCfg,
 		datasourceURL:    s.datasourceURL,
+		appendTypePrefix: s.appendTypePrefix,
 		lookBack:         s.lookBack,
 		queryStep:        s.queryStep,
-		appendTypePrefix: s.appendTypePrefix,
-		dataSourceType:   s.dataSourceType,
-		extraParams:      s.extraParams,
+
+		dataSourceType:     s.dataSourceType,
+		evaluationInterval: s.evaluationInterval,
+		extraParams:        s.extraParams,
 	}
 }
 
@@ -46,14 +49,9 @@ func (s *VMStorage) ApplyParams(params QuerierParams) *VMStorage {
 		s.dataSourceType = *params.DataSourceType
 	}
 	s.evaluationInterval = params.EvaluationInterval
-	if len(params.QueryParams) != 0 {
-		for k, vl := range params.QueryParams {
-			if s.extraParams.Has(k) {
-				s.extraParams.Del(k)
-			}
-			for _, v := range vl {
-				s.extraParams.Add(k, v)
-			}
+	for k, vl := range params.QueryParams {
+		for _, v := range vl { // custom query params are prior to default ones
+			s.extraParams.Set(k, v)
 		}
 	}
 	return s