Skip to content

Commit 8040f93

Browse files
committed
Fix error formatting
1 parent ca89f9b commit 8040f93

File tree

12 files changed

+24
-24
lines changed

12 files changed

+24
-24
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/diskio/diskstat_windows_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func ioCounters(names ...string) (map[string]disk.IOCountersStat, error) {
7272
var counter diskPerformance
7373
err = ioCounter(drive.UNCPath, &counter)
7474
if err != nil {
75-
logp.Err("Could not return any performance counter values for %s .Error: %v", drive.UNCPath, err)
75+
logp.Errorf("Could not return any performance counter values for %s .Error: %s", drive.UNCPath, err)
7676
continue
7777
}
7878
ret[drive.Name] = disk.IOCountersStat{

metric/system/filesystem/filesystem_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestFileSystemList(t *testing.T) {
4444

4545
for _, fs := range fss {
4646
err := fs.GetUsage()
47-
assert.NoError(t, err, "filesystem=%#v: %v", fs, err)
47+
assert.NoError(t, err, "filesystem=%#v: %s", fs, err)
4848

4949
}
5050
}

metric/system/process/process.go

Lines changed: 3 additions & 3 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
}
@@ -141,7 +141,7 @@ func (procStats *Stats) Get() ([]mapstr.M, []mapstr.M, error) {
141141
rootEvents = append(rootEvents, rootMap)
142142
}
143143
if wrappedErr != nil && len(failedPIDs) > 0 {
144-
procStats.logger.Debugf("error fetching process metrics: %v", wrappedErr)
144+
procStats.logger.Debugf("error fetching process metrics: %s", wrappedErr)
145145
return procs, rootEvents, NonFatalErr{Err: fmt.Errorf(errFetchingPIDs, len(failedPIDs))}
146146
}
147147
return procs, rootEvents, toNonFatal(wrappedErr)

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_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func TestGetState(t *testing.T) {
115115

116116
assert.Eventuallyf(t, test,
117117
time.Second*5, 50*time.Millisecond,
118-
"got process state %q. Last error: %v", got, err)
118+
"got process state %q. Last error: %s", got, err)
119119
}
120120

121121
func TestGetOneRoot(t *testing.T) {

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

0 commit comments

Comments
 (0)