Remove enable_query_runner setting (#659)

pganalyze · Jan 6, 2025 · e8b078c · e8b078c
1 parent 7e338b0
commit e8b078c
Show file tree

Hide file tree

Showing 8 changed files with 506 additions and 525 deletions.
diff --git a/config/config.go b/config/config.go
@@ -42,10 +42,9 @@ type ServerConfig struct {
 	ErrorCallback   string `ini:"error_callback"`
 	SuccessCallback string `ini:"success_callback"`
 
-	DisableLogs       bool `ini:"disable_logs"`
-	DisableActivity   bool `ini:"disable_activity"`
-	EnableLogExplain  bool `ini:"enable_log_explain"`
-	EnableQueryRunner bool `ini:"enable_query_runner"`
+	DisableLogs      bool `ini:"disable_logs"`
+	DisableActivity  bool `ini:"disable_activity"`
+	EnableLogExplain bool `ini:"enable_log_explain"`
 
 	DbURL                 string `ini:"db_url"`
 	DbURLFile             string `ini:"db_url_file"`

diff --git a/config/read.go b/config/read.go
@@ -99,9 +99,6 @@ func getDefaultConfig() *ServerConfig {
 	if enableLogExplain := os.Getenv("PGA_ENABLE_LOG_EXPLAIN"); enableLogExplain != "" {
 		config.EnableLogExplain = parseConfigBool(enableLogExplain)
 	}
-	if enableQueryRunner := os.Getenv("PGA_ENABLE_QUERY_RUNNER"); enableQueryRunner != "" {
-		config.EnableQueryRunner = parseConfigBool(enableQueryRunner)
-	}
 	if dbURL := os.Getenv("DB_URL"); dbURL != "" {
 		config.DbURL = dbURL
 	}

diff --git a/input/collector.go b/input/collector.go
@@ -76,7 +76,6 @@ func getCollectorConfig(c config.ServerConfig) state.CollectorConfig {
 		DisableLogs:                c.DisableLogs,
 		DisableActivity:            c.DisableActivity,
 		EnableLogExplain:           c.EnableLogExplain,
-		EnableQueryRunner:          c.EnableQueryRunner,
 		DbName:                     c.DbName,
 		DbUsername:                 c.DbUsername,
 		DbHost:                     c.DbHost,

diff --git a/output/pganalyze_collector/full_snapshot.pb.go b/output/pganalyze_collector/full_snapshot.pb.go
diff --git a/output/transform/collector_config.go b/output/transform/collector_config.go
@@ -12,7 +12,6 @@ func transformCollectorConfig(s snapshot.FullSnapshot, state state.TransientStat
 		DisableLogs:                c.DisableLogs,
 		DisableActivity:            c.DisableActivity,
 		EnableLogExplain:           c.EnableLogExplain,
-		EnableQueryRunner:          c.EnableQueryRunner,
 		DbName:                     c.DbName,
 		DbUsername:                 c.DbUsername,
 		DbHost:                     c.DbHost,

diff --git a/protobuf/full_snapshot.proto b/protobuf/full_snapshot.proto
@@ -295,7 +295,7 @@ message CollectorConfig {
   bool disable_logs = 2;
   bool disable_activity = 3;
   bool enable_log_explain = 4;
-  bool enable_query_runner = 5;
+  reserved 5; // enable_query_runner, now enabled automatically if helper function is defined
 
   string db_name = 14;
   string db_username = 15;

diff --git a/runner/query_run.go b/runner/query_run.go
@@ -29,9 +29,7 @@ func SetupQueryRunnerForAllServers(ctx context.Context, servers []*state.Server,
 				case <-cleanupInterval.C:
 					cleanup(server)
 				default:
-					if server.Config.EnableQueryRunner {
-						run(ctx, server, collectionOpts, logger)
-					}
+					run(ctx, server, collectionOpts, logger)
 					time.Sleep(1 * time.Second)
 				}
 			}

diff --git a/state/state.go b/state/state.go
@@ -92,7 +92,6 @@ type CollectorConfig struct {
 	DisableLogs                bool
 	DisableActivity            bool
 	EnableLogExplain           bool
-	EnableQueryRunner          bool
 	DbName                     string
 	DbUsername                 string
 	DbHost                     string