From b9ab106fe5d3a44e709e9621619f36e5091003bf Mon Sep 17 00:00:00 2001 From: essence-of-the-soul Date: Wed, 5 Aug 2026 11:05:32 +0000 Subject: [PATCH] =?UTF-8?q?fix(#IK2C9R):=20=E6=B8=85=E7=90=86=20fmt.Printl?= =?UTF-8?q?n=20=E8=B0=83=E8=AF=95=E6=89=93=E5=8D=B0=E6=AE=8B=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 issue #IK2C9R --- plugins/os-monitor/collector/net/flow.go | 1 - plugins/os-monitor/main.go | 7 ++----- plugins/os-monitor/worker.go | 8 -------- plugins/sample/main.go | 1 - plugins/sysinfo-collector/rpm/rpms.go | 8 ++------ 5 files changed, 4 insertions(+), 21 deletions(-) diff --git a/plugins/os-monitor/collector/net/flow.go b/plugins/os-monitor/collector/net/flow.go index fd6a2a1..d47b394 100644 --- a/plugins/os-monitor/collector/net/flow.go +++ b/plugins/os-monitor/collector/net/flow.go @@ -174,7 +174,6 @@ func (f *FlowTask) readDevStatDmi(device string, dmi string) (uint64, error) { } ok, content, err := utils.ReadFileWithDefaultRet(path, "") if !ok { - fmt.Println(err) return 0, err } return strconv.ParseUint(strings.TrimSpace(content), 10, 64) diff --git a/plugins/os-monitor/main.go b/plugins/os-monitor/main.go index 0dbbcd4..4b60cc2 100644 --- a/plugins/os-monitor/main.go +++ b/plugins/os-monitor/main.go @@ -17,19 +17,16 @@ import ( func setWorkingDir() { ex, err := os.Executable() if err != nil { - fmt.Println("Failed to get program path") + fmt.Fprintln(os.Stderr, "Failed to get program path") os.Exit(1) } exPath := filepath.Dir(ex) err = os.Chdir(exPath) if err != nil { - fmt.Println("Failed to change working dir") + fmt.Fprintln(os.Stderr, "Failed to change working dir") os.Exit(1) } - - currentPath, _ := os.Getwd() - fmt.Println(currentPath) } // main 是 os-monitor 插件的入口: diff --git a/plugins/os-monitor/worker.go b/plugins/os-monitor/worker.go index eb75f71..4a35b49 100644 --- a/plugins/os-monitor/worker.go +++ b/plugins/os-monitor/worker.go @@ -1,7 +1,6 @@ package main import ( - "fmt" "time" "github.com/robfig/cron/v3" @@ -106,13 +105,6 @@ func (w *Worker) pushMetrics(metrics []*agent.Metric) error { if len(metrics) == 0 { return nil } - names := map[string]bool{} - for _, metric := range metrics { - names[metric.Name] = true - } - for name, _ := range names { - fmt.Println(name) - } metricData := &agent.MetricsData{ TsNs: uint64(time.Now().UnixNano()), diff --git a/plugins/sample/main.go b/plugins/sample/main.go index 05420e4..fc8893f 100644 --- a/plugins/sample/main.go +++ b/plugins/sample/main.go @@ -37,5 +37,4 @@ func main() { fmt.Printf("failed to push metrics data, error: %v\n", err) return } - fmt.Println("pushed metrics data successfully") } diff --git a/plugins/sysinfo-collector/rpm/rpms.go b/plugins/sysinfo-collector/rpm/rpms.go index 5ab9349..92e5083 100644 --- a/plugins/sysinfo-collector/rpm/rpms.go +++ b/plugins/sysinfo-collector/rpm/rpms.go @@ -35,11 +35,7 @@ func getRpmPackages() ([]*pb.Metric, error) { var res []*pb.Metric select { case <-ctx.Done(): // 超时,可能是机器rpm文件损坏 - if err := cmd.Process.Kill(); err != nil { - fmt.Println("failed to kill 'rpm -qa'") - } else { - fmt.Println("Process killed") - } + _ = cmd.Process.Kill() return nil, fmt.Errorf("failed to run rpm cmd, timeout") case err := <-done: if err != nil { @@ -49,7 +45,7 @@ func getRpmPackages() ([]*pb.Metric, error) { output := outBuffer.String() pattern, err := regexp.Compile(`\[(.*?)\]--\[(.*?)\]--\[(.*?)\]--\[(.*?)\]\n`) if err != nil { - fmt.Println("failed to compile regexp") + return nil, fmt.Errorf("failed to compile regexp: %w", err) } pkgs := pattern.FindAllStringSubmatch(output, -1) for _, pkg := range pkgs { -- Gitee