review fixes

Signed-off-by: Aditi Ahuja <ahuja.aditi@gmail.com>

cmd/thanos/query.go

@@ -161,7 +161,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()
 
-	activeQueryDir := cmd.Flag("query.active-query-path", "Directory to log currently active queries in the queries.active file.").Default(".").String()
+	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 "+queryPushdown+".").Default("").Strings()
 
@@ -422,6 +422,12 @@ func runQuery(
 		dns.ResolverType(dnsSDResolver),
 	)
 
+	var queryTracker *promql.ActiveQueryTracker
+	// Enabling query tracking only if the default path is not nil.
+	if activeQueryDir != "" {
+		queryTracker = promql.NewActiveQueryTracker(activeQueryDir, maxConcurrentQueries, logger)
+	}
+
 	var (
 		endpoints = query.NewEndpointSet(
 			time.Now,
@@ -472,8 +478,6 @@ func runQuery(
 			queryTimeout,
 		)
 
-		queryTracker = promql.NewActiveQueryTracker(activeQueryDir, maxConcurrentQueries, logger)
-
 		engineOpts = promql.EngineOpts{
 			Logger: logger,
 			Reg:    reg,

test/e2e/e2ethanos/services.go

@@ -346,8 +346,6 @@ func (q *QuerierBuilder) collectArgs() ([]string, error) {
 		args = append(args, "--store.sd-files="+filepath.Join(q.InternalDir(), "filesd.yaml"))
 	}
 
-	args = append(args, "--query.active-query-path="+q.InternalDir())
-
 	if q.routePrefix != "" {
 		args = append(args, "--web.route-prefix="+q.routePrefix)
 	}