PMM-7 Fix staticcheck and noerrcheck linter warnings

admin/commands/config.go

@@ -119,8 +119,8 @@ func (cmd *ConfigCommand) args(globals *flags.GlobalFlags) ([]string, bool) {
 		res = append(res, "--force")
 	}
 
-	if cmd.MetricsModeFlags.MetricsMode != "" {
-		res = append(res, fmt.Sprintf("--metrics-mode=%s", cmd.MetricsModeFlags.MetricsMode))
+	if cmd.MetricsMode != "" {
+		res = append(res, fmt.Sprintf("--metrics-mode=%s", cmd.MetricsMode))
 	}
 
 	if len(cmd.DisableCollectors) != 0 {

admin/commands/inventory/add_agent_node_exporter.go

@@ -64,7 +64,7 @@ func (cmd *AddAgentNodeExporterCommand) RunCmd() (commands.Result, error) {
 				PushMetrics:       cmd.PushMetrics,
 				ExposeExporter:    cmd.ExposeExporter,
 				DisableCollectors: commands.ParseDisableCollectors(cmd.DisableCollectors),
-				LogLevel:          cmd.LogLevelNoFatalFlags.LogLevel.EnumValue(),
+				LogLevel:          cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_mongodb_mongolog_agent.go

@@ -96,7 +96,7 @@ func (cmd *AddAgentQANMongoDBMongologAgentCommand) RunCmd() (commands.Result, er
 				TLSCa:                         tlsCa,
 				AuthenticationMechanism:       cmd.AuthenticationMechanism,
 				AuthenticationDatabase:        cmd.AuthenticationDatabase,
-				LogLevel:                      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:                      cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_mongodb_profiler_agent.go

@@ -94,7 +94,7 @@ func (cmd *AddAgentQANMongoDBProfilerAgentCommand) RunCmd() (commands.Result, er
 				TLSCertificateKeyFilePassword: cmd.TLSCertificateKeyFilePassword,
 				TLSCa:                         tlsCa,
 				AuthenticationMechanism:       cmd.AuthenticationMechanism,
-				LogLevel:                      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:                      cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_mysql_perfschema_agent.go

@@ -107,15 +107,15 @@ func (cmd *AddAgentQANMySQLPerfSchemaAgentCommand) RunCmd() (commands.Result, er
 				Password:               cmd.Password,
 				CustomLabels:           *customLabels,
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 				MaxQueryLength:         cmd.MaxQueryLength,
 				DisableQueryExamples:   cmd.DisableQueryExamples,
 				TLS:                    cmd.TLS,
 				TLSSkipVerify:          cmd.TLSSkipVerify,
 				TLSCa:                  tlsCa,
 				TLSCert:                tlsCert,
 				TLSKey:                 tlsKey,
-				LogLevel:               cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:               cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_mysql_slowlog_agent.go

@@ -120,7 +120,7 @@ func (cmd *AddAgentQANMySQLSlowlogAgentCommand) RunCmd() (commands.Result, error
 				Password:               cmd.Password,
 				CustomLabels:           *customLabels,
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 				MaxQueryLength:         cmd.MaxQueryLength,
 				DisableQueryExamples:   cmd.DisableQueryExamples,
 				MaxSlowlogFileSize:     strconv.FormatInt(int64(cmd.MaxSlowlogFileSize), 10),
@@ -129,7 +129,7 @@ func (cmd *AddAgentQANMySQLSlowlogAgentCommand) RunCmd() (commands.Result, error
 				TLSCa:                  tlsCa,
 				TLSCert:                tlsCert,
 				TLSKey:                 tlsKey,
-				LogLevel:               cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:               cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_postgres_pgstatements_agent.go

@@ -98,15 +98,15 @@ func (cmd *AddAgentQANPostgreSQLPgStatementsAgentCommand) RunCmd() (commands.Res
 				Password:               cmd.Password,
 				CustomLabels:           *customLabels,
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 				MaxQueryLength:         cmd.MaxQueryLength,
 
 				TLS:           cmd.TLS,
 				TLSSkipVerify: cmd.TLSSkipVerify,
 				TLSCa:         tlsCa,
 				TLSCert:       tlsCert,
 				TLSKey:        tlsKey,
-				LogLevel:      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:      cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_qan_postgres_pgstatmonitor_agent.go

@@ -100,7 +100,7 @@ func (cmd *AddAgentQANPostgreSQLPgStatMonitorAgentCommand) RunCmd() (commands.Re
 				Password:               cmd.Password,
 				CustomLabels:           *customLabels,
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 				MaxQueryLength:         cmd.MaxQueryLength,
 				DisableQueryExamples:   cmd.QueryExamplesDisabled,
 
@@ -109,7 +109,7 @@ func (cmd *AddAgentQANPostgreSQLPgStatMonitorAgentCommand) RunCmd() (commands.Re
 				TLSCa:         tlsCa,
 				TLSCert:       tlsCert,
 				TLSKey:        tlsKey,
-				LogLevel:      cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:      cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/inventory/add_agent_rds_exporter.go

@@ -75,7 +75,7 @@ func (cmd *AddAgentRDSExporterCommand) RunCmd() (commands.Result, error) {
 				DisableBasicMetrics:    cmd.DisableBasicMetrics,
 				DisableEnhancedMetrics: cmd.DisableEnhancedMetrics,
 				PushMetrics:            cmd.PushMetrics,
-				LogLevel:               cmd.LogLevelFatalFlags.LogLevel.EnumValue(),
+				LogLevel:               cmd.LogLevel.EnumValue(),
 			},
 		},
 		Context: commands.Ctx,

admin/commands/management/add_external.go

@@ -136,7 +136,7 @@ func (cmd *AddExternalCommand) RunCmd() (commands.Result, error) {
 				Cluster:             cmd.Cluster,
 				ReplicationSet:      cmd.ReplicationSet,
 				CustomLabels:        *customLabels,
-				MetricsMode:         cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:         cmd.MetricsMode.EnumValue(),
 				Group:               cmd.Group,
 				SkipConnectionCheck: cmd.SkipConnectionCheck,
 				TLSSkipVerify:       cmd.TLSSkipVerify,

admin/commands/management/add_haproxy.go

@@ -118,7 +118,7 @@ func (cmd *AddHAProxyCommand) RunCmd() (commands.Result, error) {
 				Cluster:             cmd.Cluster,
 				ReplicationSet:      cmd.ReplicationSet,
 				CustomLabels:        *customLabels,
-				MetricsMode:         cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:         cmd.MetricsMode.EnumValue(),
 				SkipConnectionCheck: cmd.SkipConnectionCheck,
 				TLSSkipVerify:       cmd.TLSSkipVerify,
 			},

admin/commands/management/add_mongodb.go

@@ -198,7 +198,7 @@ func (cmd *AddMongoDBCommand) RunCmd() (commands.Result, error) {
 				AuthenticationMechanism:       cmd.AuthenticationMechanism,
 				AuthenticationDatabase:        cmd.AuthenticationDatabase,
 
-				MetricsMode: cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode: cmd.MetricsMode.EnumValue(),
 
 				EnableAllCollectors: cmd.EnableAllCollectors,
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),

admin/commands/management/add_mysql.go

@@ -230,7 +230,7 @@ func (cmd *AddMySQLCommand) RunCmd() (commands.Result, error) {
 				QANMysqlPerfschema: cmd.QuerySource == MysqlQuerySourcePerfSchema,
 
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 				MaxQueryLength:         cmd.MaxQueryLength,
 				DisableQueryExamples:   cmd.DisableQueryExamples,
 
@@ -241,7 +241,7 @@ func (cmd *AddMySQLCommand) RunCmd() (commands.Result, error) {
 				TLSCert:                   tlsCert,
 				TLSKey:                    tlsKey,
 				TablestatsGroupTableLimit: tablestatsGroupTableLimit,
-				MetricsMode:               cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:               cmd.MetricsMode.EnumValue(),
 				DisableCollectors:         commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:                  cmd.LogLevel.EnumValue(),
 				ConnectionTimeout:         commands.DurationString(cmd.ConnectionTimeout),

admin/commands/management/add_postgresql.go

@@ -191,7 +191,7 @@ func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) {
 				Database:               cmd.Database,
 				AgentPassword:          cmd.AgentPassword,
 				SkipConnectionCheck:    cmd.SkipConnectionCheck,
-				DisableCommentsParsing: !cmd.CommentsParsingFlags.CommentsParsingEnabled(),
+				DisableCommentsParsing: !cmd.CommentsParsingEnabled(),
 
 				PMMAgentID:     cmd.PMMAgentID,
 				Environment:    cmd.Environment,
@@ -210,7 +210,7 @@ func (cmd *AddPostgreSQLCommand) RunCmd() (commands.Result, error) {
 
 				MaxQueryLength:         cmd.MaxQueryLength,
 				DisableQueryExamples:   cmd.DisableQueryExamples,
-				MetricsMode:            cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:            cmd.MetricsMode.EnumValue(),
 				DisableCollectors:      commands.ParseDisableCollectors(cmd.DisableCollectors),
 				AutoDiscoveryLimit:     cmd.AutoDiscoveryLimit,
 				MaxExporterConnections: cmd.MaxExporterConnections,

admin/commands/management/add_proxysql.go

@@ -151,7 +151,7 @@ func (cmd *AddProxySQLCommand) RunCmd() (commands.Result, error) {
 				SkipConnectionCheck: cmd.SkipConnectionCheck,
 				TLS:                 cmd.TLS,
 				TLSSkipVerify:       cmd.TLSSkipVerify,
-				MetricsMode:         cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:         cmd.MetricsMode.EnumValue(),
 				DisableCollectors:   commands.ParseDisableCollectors(cmd.DisableCollectors),
 				LogLevel:            cmd.LogLevel.EnumValue(),
 				ConnectionTimeout:   commands.DurationString(cmd.ConnectionTimeout),

admin/commands/management/add_valkey.go

@@ -160,7 +160,7 @@ func (cmd *AddValkeyCommand) RunCmd() (commands.Result, error) {
 				TLSCa:             tlsCa,
 				TLSCert:           tlsCert,
 				TLSKey:            tlsKey,
-				MetricsMode:       cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+				MetricsMode:       cmd.MetricsMode.EnumValue(),
 				LogLevel:          cmd.LogLevel.EnumValue(),
 				ConnectionTimeout: commands.DurationString(cmd.ConnectionTimeout),
 			},

admin/commands/management/register.go

@@ -83,7 +83,7 @@ func (cmd *RegisterCommand) RunCmd() (commands.Result, error) {
 			AgentPassword: cmd.AgentPassword,
 
 			Reregister:        cmd.Force,
-			MetricsMode:       cmd.MetricsModeFlags.MetricsMode.EnumValue(),
+			MetricsMode:       cmd.MetricsMode.EnumValue(),
 			DisableCollectors: commands.ParseDisableCollectors(cmd.DisableCollectors),
 		},
 		Context: commands.Ctx,

agent/agents/mongodb/mongolog/internal/monitor_test.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/percona/percona-toolkit/src/go/mongolib/proto"
 	"github.com/sirupsen/logrus"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.mongodb.org/mongo-driver/bson"
 
@@ -63,9 +64,9 @@ func TestCollector(t *testing.T) {
 
 			file, err := os.Create(destination) //nolint:gosec
 			require.NoError(t, err)
-			file.Close() //nolint:errcheck
+			require.NoError(t, file.Close())
 			t.Cleanup(func() {
-				os.Remove(destination) //nolint:errcheck
+				assert.NoError(t, os.Remove(destination))
 			})
 
 			reader, err := filereader.NewContinuousFileReader(destination, l)
@@ -87,12 +88,11 @@ func TestCollector(t *testing.T) {
 			go readSourceWriteDestination(ctx, t, errChan, fmt.Sprintf("./testdata/logs/%s.log", test), destination, delay)
 
 			var wg sync.WaitGroup
-			wg.Add(2)
+			wg.Add(1)
 			monitor.Start(ctx, docsChan, doneChan, &wg)
 
 			var data []proto.SystemProfile
-			go func() {
-				defer wg.Done()
+			wg.Go(func() {
 				for {
 					select {
 					case <-ctx.Done():
@@ -106,7 +106,7 @@ func TestCollector(t *testing.T) {
 						data = append(data, row)
 					}
 				}
-			}()
+			})
 
 			err = <-errChan
 			require.NoError(t, err)
@@ -120,7 +120,8 @@ func TestCollector(t *testing.T) {
 
 			expectedFile := fmt.Sprintf("./testdata/expected/%s", test)
 			if os.Getenv("REFRESH_TEST_DATA") != "" {
-				writeData(t, data, expectedFile)
+				err = writeData(t, data, expectedFile)
+				require.NoError(t, err)
 				return
 			}
 
@@ -218,7 +219,9 @@ func writeData(t *testing.T, data []proto.SystemProfile, name string) error {
 	if err != nil {
 		return err
 	}
-	defer file.Close() //nolint:errcheck
+	t.Cleanup(func() {
+		assert.NoError(t, file.Close())
+	})
 
 	jsonData, err := dataToJSON(t, data)
 	if err != nil {
@@ -239,7 +242,9 @@ func readData(t *testing.T, name string) ([]proto.SystemProfile, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer file.Close() //nolint:errcheck
+	t.Cleanup(func() {
+		assert.NoError(t, file.Close())
+	})
 
 	var data []proto.SystemProfile
 	err = json.NewDecoder(file).Decode(&data)
@@ -258,6 +263,10 @@ func readSourceWriteDestination(ctx context.Context, t *testing.T, errChan chan
 		errChan <- err
 		return
 	}
+	defer func() {
+		assert.NoError(t, srcFile.Close())
+	}()
+
 	scanner := bufio.NewScanner(srcFile)
 	var lines []string
 	for scanner.Scan() {
@@ -273,14 +282,15 @@ func readSourceWriteDestination(ctx context.Context, t *testing.T, errChan chan
 		errChan <- err
 		return
 	}
-	srcFile.Close() //nolint:errcheck
 
 	dstFile, err := os.Create(destination) //nolint:gosec
 	if err != nil {
 		errChan <- err
 		return
 	}
-	defer dstFile.Close() //nolint:errcheck
+	defer func() {
+		assert.NoError(t, dstFile.Close())
+	}()
 
 	writer := bufio.NewWriter(dstFile)
 	for _, line := range lines {