Address linter warnings

Author: andy-tier1app

.golangci.yml

@@ -1,6 +1,34 @@
 version: "2"
+
 linters:
   default: standard
   disable:
-  - errcheck
+    - errcheck  # Too many issues to fix incrementally (50+)
+  enable:
+    - gocyclo
+    - misspell
+    - gocritic
+    - unconvert
+    - unparam
+    - revive
+    - dogsled      # Check for too many blank identifiers
+    - bodyclose    # Check HTTP response body is closed
+    - whitespace   # Check for unnecessary whitespace
+    - wastedassign # Check for wasted assignments
+  settings:
+    gocyclo:
+      min-complexity: 80  # Start lenient, tighten later (default: 30)
+    gocritic:
+      disabled-checks:
+        - ifElseChain  # Stylistic preference, not a bug
+    unparam:
+      check-exported: false  # Only check unexported functions
+    revive:
+      rules:
+        - name: exported
+          disabled: true  # Too many missing comments
+        - name: package-comments
+          disabled: true  # Too many missing package comments
+        - name: var-naming
+          disabled: true  # Would require significant refactoring (ApiKey -> APIKey, etc)
 

internal/agent/api/server_test.go

@@ -37,18 +37,17 @@ func TestServer(t *testing.T) {
 			testErrCh <- err
 			return
 		}
+		defer resp.Body.Close()
 
-		if resp.Body != nil {
-			all, err := io.ReadAll(resp.Body)
-			if err != nil {
-				testErrCh <- err
-				return
-			}
-			all = bytes.TrimSpace(all)
-			if string(all) != `{"Code":0,"Msg":""}` {
-				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
-				return
-			}
+		all, err := io.ReadAll(resp.Body)
+		if err != nil {
+			testErrCh <- err
+			return
+		}
+		all = bytes.TrimSpace(all)
+		if string(all) != `{"Code":0,"Msg":""}` {
+			testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+			return
 		}
 		testErrCh <- nil
 	}()
@@ -91,18 +90,17 @@ func TestServerCmdActions(t *testing.T) {
 			testErrCh <- err
 			return
 		}
+		defer resp.Body.Close()
 
-		if resp.Body != nil {
-			all, err := io.ReadAll(resp.Body)
-			if err != nil {
-				testErrCh <- err
-				return
-			}
-			all = bytes.TrimSpace(all)
-			if !bytes.HasPrefix(all, []byte(`{"Code":0`)) {
-				testErrCh <- fmt.Errorf("unexpected response: %s, %x", string(all), all)
-				return
-			}
+		all, err := io.ReadAll(resp.Body)
+		if err != nil {
+			testErrCh <- err
+			return
+		}
+		all = bytes.TrimSpace(all)
+		if !bytes.HasPrefix(all, []byte(`{"Code":0`)) {
+			testErrCh <- fmt.Errorf("unexpected response: %s, %x", string(all), all)
+			return
 		}
 		testErrCh <- nil
 	}()
@@ -168,18 +166,17 @@ func TestServerForward(t *testing.T) {
 			testErrCh <- err
 			return
 		}
+		defer resp.Body.Close()
 
-		if resp.Body != nil {
-			all, err := io.ReadAll(resp.Body)
-			if err != nil {
-				testErrCh <- err
-				return
-			}
-			all = bytes.TrimSpace(all)
-			if string(all) != `{"Code":0,"Msg":""}` {
-				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
-				return
-			}
+		all, err := io.ReadAll(resp.Body)
+		if err != nil {
+			testErrCh <- err
+			return
+		}
+		all = bytes.TrimSpace(all)
+		if string(all) != `{"Code":0,"Msg":""}` {
+			testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+			return
 		}
 		testErrCh <- nil
 	}()
@@ -227,18 +224,17 @@ func TestAttendanceAPI(t *testing.T) {
 			testErrCh <- err
 			return
 		}
+		defer resp.Body.Close()
 
-		if resp.Body != nil {
-			all, err := io.ReadAll(resp.Body)
-			if err != nil {
-				testErrCh <- err
-				return
-			}
-			all = bytes.TrimSpace(all)
-			if string(all) != `{"Code":0,"Msg":""}` {
-				testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
-				return
-			}
+		all, err := io.ReadAll(resp.Body)
+		if err != nil {
+			testErrCh <- err
+			return
+		}
+		all = bytes.TrimSpace(all)
+		if string(all) != `{"Code":0,"Msg":""}` {
+			testErrCh <- fmt.Errorf("unexpected response: %s", string(all))
+			return
 		}
 		testErrCh <- nil
 	}()

internal/agent/m3/m3.go

@@ -140,7 +140,7 @@ func (m3 *M3App) RunSingle() error {
 			return err
 		}
 
-		if len(resp) <= 0 {
+		if len(resp) == 0 {
 			logger.Log("WARNING: skip empty resp")
 			return err
 		}
@@ -184,7 +184,7 @@ func GetM3FinEndpoint(timestamp string, timezone string, pids map[int]string) st
 	/// append pod name and namespace in Kubernetes
 	if config.GlobalConfig.Kubernetes {
 		podName := getPodName()
-		//parameters += "&pod=" + podName
+		// parameters += "&pod=" + podName
 		ns := getMatchingNamespace(podName)
 		if ns != "" {
 			//	parameters += "&ns=" + ns
@@ -211,7 +211,8 @@ func GetM3CommonEndpointParameters(timestamp string, timezone string) string {
 	return parameters
 }
 
-func (m3 *M3App) captureAndTransmit(pids map[int]string, endpoint string) (err error) {
+//nolint:unparam // error return kept for future error handling
+func (m3 *M3App) captureAndTransmit(pids map[int]string, endpoint string) error {
 	logger.Log("yc-360 script version: " + executils.SCRIPT_VERSION)
 	logger.Log("yc-360 script starting in m3 mode...")
 
@@ -264,7 +265,7 @@ Resp: %s
 --------------------------------
 `, lpM3Result.Ok, lpM3Result.Msg)
 
-	return
+	return nil
 }
 
 func uploadGCLogM3(endpoint string, pid int) string {
@@ -506,7 +507,7 @@ Resps: %s
 
 func (m3 *M3App) uploadAccessLogM3(endpoint string, pid int, appName string) {
 	var accessLogM3Chan chan capture.Result
-	if len(config.GlobalConfig.AccessLogs) <= 0 {
+	if len(config.GlobalConfig.AccessLogs) == 0 {
 		return
 	}
 

internal/agent/m3/m3_test.go

@@ -18,7 +18,7 @@ func TestProcessResp(t *testing.T) {
 
 func TestM3FinPids(t *testing.T) {
 	var a = func(pids []int) string {
-		if len(pids) <= 0 {
+		if len(pids) == 0 {
 			return ""
 		}
 		var ps strings.Builder

internal/agent/ondemand/ondemand.go

@@ -36,7 +36,7 @@ import (
 var Wg sync.WaitGroup
 
 func ProcessPids(pids []int, pid2Name map[int]string, hd bool, tags string, timestamps []string) (rUrls []string, err error) {
-	if len(pids) <= 0 {
+	if len(pids) == 0 {
 		logger.Log("Empty pids, no action needed.")
 		return
 	}
@@ -103,7 +103,7 @@ func FullCapture(pid int, appName string, hd bool, tags string, tsParam string)
 			if tsParam == "" {
 				tsParam = timestamp
 			}
-			//parameters = fmt.Sprintf("de=%s&ts=%s", getOutboundIP().String(), tsParam)
+			// parameters = fmt.Sprintf("de=%s&ts=%s", getOutboundIP().String(), tsParam)
 			timezoneBase64 := base64.StdEncoding.EncodeToString([]byte(timezone))
 			parameters = fmt.Sprintf("de=%s&ts=%s&timezoneId=%s", getOutboundIP().String(), tsParam, timezoneBase64)
 			endpoint = fmt.Sprintf("%s/ycrash-receiver?%s", config.GlobalConfig.Server, parameters)
@@ -179,7 +179,6 @@ func FullCapture(pid int, appName string, hd bool, tags string, tsParam string)
 	// A.3 Agent log file
 	var agentLogFile *os.File
 	if !config.GlobalConfig.M3 {
-
 		// Renaming the log file name to yc360Logs from agentlog
 		agentLogFile, err = logger.StartWritingToFile("yc360Logs.out")
 		if err != nil {
@@ -376,7 +375,6 @@ Ignored errors: %v
 	// ------------------------------------------------------------------------------
 	var appLogs chan capture.Result
 	if len(config.GlobalConfig.AppLogs) > 0 && config.GlobalConfig.AppLogLineCount != 0 {
-
 		appLogsContainDollarSign := false
 		for _, configAppLog := range config.GlobalConfig.AppLogs {
 			if strings.Contains(string(configAppLog), "$") {
@@ -417,7 +415,6 @@ Falling back to capture all configured appLogs without appName filtering.`)
 					if found {
 						appLogsMatchingAppName = append(appLogsMatchingAppName, config.AppLog(beforeSearchToken))
 					}
-
 				}
 
 				if len(appLogsMatchingAppName) > 0 {
@@ -454,7 +451,7 @@ Falling back to capture all configured appLogs without appName filtering.`)
 
 		paths := config.AppLogs{}
 		for _, f := range discoveredLogFiles {
-			logger.Debug().Msgf("OnDemand FullCapture: discovered log file: %s", string(f))
+			logger.Debug().Msgf("OnDemand FullCapture: discovered log file: %s", f)
 			isGCLog := false
 			for _, fileName := range globFiles {
 				// To exclude discovered gc log such f as /tmp/buggyapp-%p-%t.log
@@ -778,7 +775,6 @@ Resp: %s
 		resp, err := RequestFin(finEp)
 		if err != nil {
 			logger.Log("post yc-fin err %s", err.Error())
-			err = nil
 		}
 
 		endTime := time.Now()

internal/agent/ondemand/ondemand_test.go

@@ -83,7 +83,6 @@ func TestFindGCLog(t *testing.T) {
 	if f != "garbage-collection.log" {
 		t.Fatal("gc log file should be garbage-collection.log")
 	}
-
 }
 
 func TestPostData(t *testing.T) {

internal/capture/access_log.go

@@ -10,6 +10,7 @@ import (
 const accessLogOut = "accesslog.out"
 
 // AccessLog represents struct that captures and uploads the specified log file.
+//
 // Deprecated: use App logs auto discovery instead.
 type AccessLog struct {
 	Capture

internal/capture/accesslogm3.go

@@ -78,7 +78,7 @@ func (a *AccessLogM3) Run() (Result, error) {
 			// %t = current date
 			p := strings.ReplaceAll(string(path.Path), "%t", currentDateStr)
 
-			matches, err := zglob.Glob(string(p))
+			matches, err := zglob.Glob(p)
 
 			if err != nil {
 				results = append(results, Result{

internal/capture/app_logs_auto_discovery.go

@@ -35,7 +35,7 @@ func DiscoverOpenedLogFilesByProcess(pid int) ([]string, error) {
 	}
 
 	for _, filePath := range openedFiles {
-		logger.Debug().Msgf("DiscoverOpenedLogFilesByProcess: opened file by process (pid=%d): %s", pid, string(filePath))
+		logger.Debug().Msgf("DiscoverOpenedLogFilesByProcess: opened file by process (pid=%d): %s", pid, filePath)
 
 		fileBaseName := filepath.Base(filePath)
 		if matchLogPattern(fileBaseName) {

internal/capture/applog.go

@@ -52,7 +52,7 @@ func (al *AppLog) Run() (Result, error) {
 
 	// Process each expanded file path
 	for _, filePath := range expandedPaths {
-		logger.Debug().Msgf("AppLog: expanded path: %s", string(filePath))
+		logger.Debug().Msgf("AppLog: expanded path: %s", filePath)
 
 		r, err := al.CaptureSingleAppLog(filePath)
 		results = append(results, r)