Add logs for test run when system state collection is skipped (#456)

* Add logs for test run when system state collection is skipped * Update log message Co-authored-by: Maciek Sakrejda <[email protected]> --------- Co-authored-by: Maciek Sakrejda <[email protected]>
pganalyze · Sep 21, 2023 · 681200c · 681200c
1 parent 4e91a60
commit 681200c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/input/full.go b/input/full.go
@@ -130,7 +130,7 @@ func CollectFull(ctx context.Context, server *state.Server, connection *sql.DB,
 	}
 
 	if globalCollectionOpts.CollectSystemInformation {
-		ps.System = system.GetSystemState(server.Config, logger)
+		ps.System = system.GetSystemState(server.Config, logger, globalCollectionOpts)
 	}
 
 	server.SetLogTimezone(ts.Settings)

diff --git a/input/system/system.go b/input/system/system.go
@@ -31,7 +31,7 @@ func DownloadLogFiles(ctx context.Context, server *state.Server, globalCollectio
 }
 
 // GetSystemState - Retrieves a system snapshot for this system and returns it
-func GetSystemState(config config.ServerConfig, logger *util.Logger) (system state.SystemState) {
+func GetSystemState(config config.ServerConfig, logger *util.Logger, globalCollectionOpts state.CollectionOpts) (system state.SystemState) {
 	dbHost := config.GetDbHost()
 	if config.SystemType == "amazon_rds" {
 		system = rds.GetSystemState(config, logger)
@@ -46,8 +46,18 @@ func GetSystemState(config config.ServerConfig, logger *util.Logger) (system sta
 		// runs on the database server itself and can gather local statistics
 		system = selfhosted.GetSystemState(config, logger)
 		system.Info.Type = state.CrunchyBridgeSystem
+	} else if config.SystemType == "aiven" {
+		system.Info.Type = state.AivenSystem
 	} else if dbHost == "" || dbHost == "localhost" || dbHost == "127.0.0.1" || config.AlwaysCollectSystemData {
 		system = selfhosted.GetSystemState(config, logger)
+	} else {
+		if globalCollectionOpts.TestRun {
+			// Detected as self hosted, but not collecting system state as we
+			// didn't detect the collector is running on the same instance as
+			// the database server.
+			// Leave logs for if this is a test run.
+			logger.PrintInfo("Skipping collection of system state: remote host (%s) was specified for the database address. Consider enabling always_collect_system_data if the database is running on the same system as the collector", dbHost)
+		}
 	}
 
 	system.Info.SystemID = config.SystemID