Skip to content

Commit d6e84e6

Browse files
committed
Fix linter errors
1 parent 3c1969f commit d6e84e6

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

internal/pkg/instrumentation/perf/perf_linux.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,23 @@ import (
99
"github.com/cilium/ebpf/perf"
1010
)
1111

12-
// Re-export the types from github.com/cilium/ebpf/perf
12+
// Re-export the types from github.com/cilium/ebpf/perf.
1313
type Record = perf.Record
1414
type Reader = perf.Reader
1515
type ReaderOptions = perf.ReaderOptions
1616

17-
// Re-export the functions from github.com/cilium/ebpf/perf
17+
// Re-export the functions from github.com/cilium/ebpf/perf.
18+
// NewReader is a re-export of perf.NewReader.
1819
var NewReader = perf.NewReader
20+
21+
// NewReaderWithOptions is a re-export of perf.NewReaderWithOptions.
1922
var NewReaderWithOptions = perf.NewReaderWithOptions
23+
24+
// ErrClosed is a re-export of perf.ErrClosed.
2025
var ErrClosed = perf.ErrClosed
26+
27+
// ErrFlushed is a re-export of perf.ErrFlushed.
2128
var ErrFlushed = perf.ErrFlushed
29+
30+
// IsUnknownEvent is a re-export of perf.IsUnknownEvent.
2231
var IsUnknownEvent = perf.IsUnknownEvent

internal/pkg/instrumentation/perf/perf_other.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ package perf
99

1010
import (
1111
"errors"
12-
"fmt"
1312
"os"
1413
"time"
1514

@@ -66,17 +65,17 @@ func NewReaderWithOptions(array *ebpf.Map, perCPUBuffer int, opts ReaderOptions)
6665

6766
// Close frees resources used by the reader.
6867
func (r *Reader) Close() error {
69-
return fmt.Errorf("perf reader: %w", ErrClosed)
68+
return errors.New("perf reader already closed")
7069
}
7170

7271
// Read the next record from the perf ring buffer.
7372
func (r *Reader) Read() (Record, error) {
74-
return Record{}, fmt.Errorf("perf reader: %w", ErrClosed)
73+
return Record{}, errors.New("perf reader already closed")
7574
}
7675

7776
// ReadInto is like Read but allows reusing the Record.
7877
func (r *Reader) ReadInto(rec *Record) error {
79-
return fmt.Errorf("perf reader: %w", ErrClosed)
78+
return errors.New("perf reader already closed")
8079
}
8180

8281
// SetDeadline controls how long Read and ReadInto will block.
@@ -86,22 +85,22 @@ func (r *Reader) SetDeadline(t time.Time) {
8685

8786
// Pause stops all notifications from this Reader.
8887
func (r *Reader) Pause() error {
89-
return fmt.Errorf("perf reader: %w", ErrClosed)
88+
return errors.New("perf reader already closed")
9089
}
9190

9291
// Resume allows this perf reader to emit notifications.
9392
func (r *Reader) Resume() error {
94-
return fmt.Errorf("perf reader: %w", ErrClosed)
93+
return errors.New("perf reader already closed")
9594
}
9695

9796
// FlushAndClose flushes all pending events and closes the reader.
9897
func (r *Reader) FlushAndClose() error {
99-
return fmt.Errorf("perf reader: %w", ErrClosed)
98+
return errors.New("perf reader already closed")
10099
}
101100

102101
// Flush unblocks Read/ReadInto and returns pending samples.
103102
func (r *Reader) Flush() error {
104-
return fmt.Errorf("perf reader: %w", ErrClosed)
103+
return errors.New("perf reader already closed")
105104
}
106105

107106
// BufferSize returns the size in bytes of each per-CPU buffer.

0 commit comments

Comments
 (0)