Skip to content

Commit bf9b2d8

Browse files
0xThiebaut0xThiebaut
committed
Fix error formatting
1 parent ca89f9b commit bf9b2d8

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

‎metric/memory/memory_aix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ func get(_ resolve.Resolver) (Memory, error) {
5757
meminfo := C.perfstat_memory_total_t{}
5858
_, err := C.perfstat_memory_total(nil, &meminfo, C.sizeof_perfstat_memory_total_t, 1)
5959
if err != nil {
60-
return memData, fmt.Errorf("perfstat_memory_total: %s", err)
60+
return memData, fmt.Errorf("perfstat_memory_total: %w", err)
6161
}
6262

6363
totalMem := uint64(meminfo.real_total) * system.pagesize

‎metric/system/cgroup/util_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func TestSupportedSubsystems(t *testing.T) {
123123
func TestSupportedSubsystemsErrCgroupsMissing(t *testing.T) {
124124
_, err := SupportedSubsystems(resolve.NewTestResolver("testdata/doesnotexist"))
125125
if !errors.Is(err, ErrCgroupsMissing) {
126-
t.Fatalf("expected ErrCgroupsMissing, but got %v", err)
126+
t.Fatalf("expected ErrCgroupsMissing, but got %s", err)
127127
}
128128
}
129129

‎metric/system/process/process.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func ListStates(hostfs resolve.Resolver) ([]ProcState, error) {
6262
}
6363
failedPIDs := extractFailedPIDs(pidMap)
6464
if err != nil && len(failedPIDs) > 0 {
65-
init.logger.Debugf("error fetching process metrics: %v", err)
65+
init.logger.Debugf("error fetching process metrics: %s", err)
6666
return plist, NonFatalErr{Err: fmt.Errorf(errFetchingPIDs, len(failedPIDs))}
6767
}
6868
return plist, toNonFatal(err)
@@ -115,7 +115,7 @@ func (procStats *Stats) Get() ([]mapstr.M, []mapstr.M, error) {
115115
if procStats.host != nil {
116116
memStats, err := procStats.host.Memory()
117117
if err != nil {
118-
procStats.logger.Warnf("Getting memory details: %v", err)
118+
procStats.logger.Warnf("Getting memory details: %s", err)
119119
} else {
120120
totalPhyMem = memStats.Total
121121
}

‎metric/system/process/process_common.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (procStats *Stats) Init() error {
162162
procStats.host, err = sysinfo.Host()
163163
if err != nil {
164164
procStats.host = nil
165-
procStats.logger.Warnf("Getting host details: %v", err)
165+
procStats.logger.Warnf("Getting host details: %s", err)
166166
}
167167

168168
// footcannon prevention
@@ -201,7 +201,7 @@ func (procStats *Stats) Init() error {
201201
if procStats.EnableCgroups {
202202
cgReader, err := cgroup.NewReaderOptions(procStats.CgroupOpts)
203203
if errors.Is(err, cgroup.ErrCgroupsMissing) {
204-
logp.Warn("cgroup data collection will be disabled: %v", err)
204+
logp.Warnf("cgroup data collection will be disabled: %s", err)
205205
procStats.EnableCgroups = false
206206
} else if err != nil {
207207
return fmt.Errorf("error initializing cgroup reader: %w", err)

‎metric/system/process/process_linux_darwin_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestGetInfoForPid_numThreads(t *testing.T) {
4040
if !got.NumThreads.Exists() {
4141
bs, err := json.Marshal(got)
4242
if err != nil {
43-
t.Logf("could not marshal ProcState: %v", err)
43+
t.Logf("could not marshal ProcState: %s", err)
4444
}
4545
t.Fatalf("num_thread was not collected. Collected info: %s", bs)
4646
}

‎metric/system/process/process_windows_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestGetInfoForPid_numThreads(t *testing.T) {
5454
if !state.NumThreads.Exists() {
5555
bs, err := json.Marshal(state)
5656
if err != nil {
57-
t.Logf("could not marshal ProcState: %v", err)
57+
t.Logf("could not marshal ProcState: %s", err)
5858
}
5959
t.Fatalf("num_thread was not collected. Collected info: %s", bs)
6060
}

‎report/metrics_file_descriptors.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func FDUsageReporter(logger *logp.Logger, processStats *process.Stats) func(_ mo
3737

3838
open, hardLimit, softLimit, err := getFDUsage(processStats)
3939
if err != nil {
40-
logger.Error("Error while retrieving FD information: %v", err)
40+
logger.Errorf("Error while retrieving FD information: %s", err)
4141
return
4242
}
4343

‎report/metrics_handles.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ var (
3838
func SetupWindowsHandlesMetrics(logger *logp.Logger, reg *monitoring.Registry) {
3939
beatProcessSysInfo, err := sysinfo.Self()
4040
if err != nil {
41-
logger.Error("Error while getting own process info: %v", err)
41+
logger.Errorf("Error while getting own process info: %s", err)
4242
logger.Error(fileHandlesNotReported)
4343
return
4444
}
4545

4646
var ok bool
4747
handleCounter, ok = beatProcessSysInfo.(types.OpenHandleCounter)
4848
if !ok {
49-
logger.Error("Process does not implement types.OpenHandleCounter: %v", beatProcessSysInfo)
49+
logger.Errorf("Process does not implement types.OpenHandleCounter: %v", beatProcessSysInfo)
5050
logger.Error(fileHandlesNotReported)
5151
return
5252
}
@@ -61,7 +61,7 @@ func openHandlesReporter(logger *logp.Logger) func(_ monitoring.Mode, V monitori
6161

6262
n, err := handleCounter.OpenHandleCount()
6363
if err != nil {
64-
logger.Error("Error while retrieving the number of open file handles: %v", err)
64+
logger.Errorf("Error while retrieving the number of open file handles: %s", err)
6565
return
6666
}
6767
monitoring.ReportInt(V, "open", int64(n))

‎report/report.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func MemStatsReporter(logger *logp.Logger, processStats *process.Stats) func(mon
5151

5252
state, err := processStats.GetSelf()
5353
if err != nil {
54-
logger.Errorf("Error while getting memory usage: %v", err)
54+
logger.Errorf("Error while getting memory usage: %s", err)
5555
return
5656
}
5757

@@ -67,7 +67,7 @@ func InstanceCPUReporter(logger *logp.Logger, processStats *process.Stats) func(
6767

6868
state, err := processStats.GetSelf()
6969
if err != nil {
70-
logger.Errorf("Error retrieving CPU percentages: %v", err)
70+
logger.Errorf("Error retrieving CPU percentages: %s", err)
7171
return
7272
}
7373

@@ -99,7 +99,7 @@ func ReportSystemLoadAverage(_ monitoring.Mode, V monitoring.Visitor) {
9999

100100
load, err := cpu.Load()
101101
if err != nil {
102-
logp.Err("Error retrieving load average: %v", err)
102+
logp.Errorf("Error retrieving load average: %s", err)
103103
return
104104
}
105105
avgs := load.Averages()
@@ -145,16 +145,16 @@ func InstanceCroupsReporter(logger *logp.Logger, override string) func(monitorin
145145
})
146146
if err != nil {
147147
if errors.Is(err, cgroup.ErrCgroupsMissing) {
148-
logger.Warnf("cgroup data collection disabled in internal monitoring: %v", err)
148+
logger.Warnf("cgroup data collection disabled in internal monitoring: %s", err)
149149
} else {
150-
logger.Errorf("cgroup data collection disabled in internal monitoring: %v", err)
150+
logger.Errorf("cgroup data collection disabled in internal monitoring: %s", err)
151151
}
152152
return
153153
}
154154

155155
cgv, err := cgroups.CgroupsVersion(pid)
156156
if err != nil {
157-
logger.Errorf("error determining cgroups version for internal monitoring: %v", err)
157+
logger.Errorf("error determining cgroups version for internal monitoring: %s", err)
158158
return
159159
}
160160

@@ -170,7 +170,7 @@ func InstanceCroupsReporter(logger *logp.Logger, override string) func(monitorin
170170
func ReportMetricsCGV1(logger *logp.Logger, pid int, cgroups *cgroup.Reader, V monitoring.Visitor) {
171171
selfStats, err := cgroups.GetV1StatsForProcess(pid)
172172
if err != nil {
173-
logger.Errorf("error getting cgroup stats for V1: %v", err)
173+
logger.Errorf("error getting cgroup stats for V1: %s", err)
174174
}
175175
// GetStatsForProcess returns a nil selfStats and no error when there's no stats
176176
if selfStats == nil {
@@ -231,7 +231,7 @@ func ReportMetricsCGV1(logger *logp.Logger, pid int, cgroups *cgroup.Reader, V m
231231
func ReportMetricsCGV2(logger *logp.Logger, pid int, cgroups *cgroup.Reader, V monitoring.Visitor) {
232232
selfStats, err := cgroups.GetV2StatsForProcess(pid)
233233
if err != nil {
234-
logger.Errorf("error getting cgroup stats for V2: %v", err)
234+
logger.Errorf("error getting cgroup stats for V2: %s", err)
235235
return
236236
}
237237

0 commit comments

Comments
 (0)