Skip to content

Commit c20afb4

Browse files
refactor: style fixes (#2112)
1 parent c631deb commit c20afb4

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

pkg/ebpf/tracee.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -415,20 +415,20 @@ func (t *Tracee) Init() error {
415415
}
416416

417417
// Get reference to stack trace addresses map
418-
StackAddressesMap, err := t.bpfModule.GetMap("stack_addresses")
418+
stackAddressesMap, err := t.bpfModule.GetMap("stack_addresses")
419419
if err != nil {
420420
t.Close()
421421
return fmt.Errorf("error getting acces to 'stack_addresses' eBPF Map %v", err)
422422
}
423-
t.StackAddressesMap = StackAddressesMap
423+
t.StackAddressesMap = stackAddressesMap
424424

425425
// Get reference to fd arg path map
426-
FDArgPathMap, err := t.bpfModule.GetMap("fd_arg_path_map")
426+
fdArgPathMap, err := t.bpfModule.GetMap("fd_arg_path_map")
427427
if err != nil {
428428
t.Close()
429429
return fmt.Errorf("error getting access to 'fd_arg_path_map' eBPF Map %v", err)
430430
}
431-
t.FDArgPathMap = FDArgPathMap
431+
t.FDArgPathMap = fdArgPathMap
432432

433433
if t.config.Output.EventsSorting {
434434
t.eventsSorter, err = sorting.InitEventSorter()
@@ -476,15 +476,14 @@ func (t *Tracee) initTailCall(mapName string, mapIdx uint32, progName string) er
476476
}
477477
bpfProg, err := t.bpfModule.GetProgram(progName)
478478
if err != nil {
479-
return fmt.Errorf("could not get BPF program "+progName+": %v", err)
479+
return fmt.Errorf("could not get BPF program %s: %v", progName, err)
480480
}
481481
fd := bpfProg.GetFd()
482482
if fd < 0 {
483-
return fmt.Errorf("could not get BPF program FD for "+progName+": %v", err)
483+
return fmt.Errorf("could not get BPF program FD for %s: %v", progName, err)
484484
}
485-
err = bpfMap.Update(unsafe.Pointer(&mapIdx), unsafe.Pointer(&fd))
486485

487-
return err
486+
return bpfMap.Update(unsafe.Pointer(&mapIdx), unsafe.Pointer(&fd))
488487
}
489488

490489
// options config should match defined values in ebpf code
@@ -969,11 +968,10 @@ func (t *Tracee) writeProfilerStats(wr io.Writer) error {
969968
if err != nil {
970969
return err
971970
}
971+
972972
_, err = wr.Write(b)
973-
if err != nil {
974-
return err
975-
}
976-
return nil
973+
974+
return err
977975
}
978976

979977
func (t *Tracee) getProcessCtx(hostTid uint32) (procinfo.ProcessCtx, error) {
@@ -1122,9 +1120,11 @@ func (t *Tracee) invokeInitEvents() {
11221120
}
11231121
}
11241122
}
1123+
11251124
func (t *Tracee) getTracedIfaceIdx(ifaceName string) (int, bool) {
11261125
return t.config.Filter.NetFilter.Find(ifaceName)
11271126
}
1127+
11281128
func (t *Tracee) getCapturedIfaceIdx(ifaceName string) (int, bool) {
11291129
if t.config.Capture.NetIfaces == nil {
11301130
return -1, false

pkg/metrics/stats.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,5 @@ func (stats *Stats) RegisterPrometheus() error {
7373
Help: "errors accumulated by tracee-ebpf",
7474
}, func() float64 { return float64(stats.ErrorCount.Read()) }))
7575

76-
if err != nil {
77-
return err
78-
}
79-
80-
return nil
76+
return err
8177
}

0 commit comments

Comments
 (0)