Skip to content

Commit 02e21f8

Browse files
committed
ebpf: prevent tcp queue length check from loading debug .o
1 parent e786e6c commit 02e21f8

1 file changed

Lines changed: 3 additions & 8 deletions

File tree

pkg/collector/corechecks/ebpf/probe/tcpqueuelength/tcp_queue_length.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ type Tracer struct {
4444
// NewTracer creates a [Tracer]
4545
func NewTracer(cfg *ebpf.Config) (*Tracer, error) {
4646
if cfg.EnableCORE {
47-
probe, err := loadTCPQueueLengthCOREProbe(cfg)
47+
probe, err := loadTCPQueueLengthCOREProbe()
4848
if err != nil {
4949
if !cfg.AllowRuntimeCompiledFallback {
5050
return nil, fmt.Errorf("error loading CO-RE tcp-queue-length probe: %s. set system_probe_config.allow_runtime_compiled_fallback to true to allow fallback to runtime compilation", err)
@@ -150,7 +150,7 @@ func (t *Tracer) GetAndFlush() model.TCPQueueLengthStats {
150150
return result
151151
}
152152

153-
func loadTCPQueueLengthCOREProbe(cfg *ebpf.Config) (*Tracer, error) {
153+
func loadTCPQueueLengthCOREProbe() (*Tracer, error) {
154154
kv, err := kernel.HostVersion()
155155
if err != nil {
156156
return nil, fmt.Errorf("error detecting kernel version: %s", err)
@@ -159,13 +159,8 @@ func loadTCPQueueLengthCOREProbe(cfg *ebpf.Config) (*Tracer, error) {
159159
return nil, fmt.Errorf("detected kernel version %s, but tcp-queue-length probe requires a kernel version of at least 4.8.0", kv)
160160
}
161161

162-
filename := "tcp-queue-length.o"
163-
if cfg.BPFDebug {
164-
filename = "tcp-queue-length-debug.o"
165-
}
166-
167162
var probe *Tracer
168-
err = ebpf.LoadCOREAsset(filename, func(buf bytecode.AssetReader, opts manager.Options) error {
163+
err = ebpf.LoadCOREAsset("tcp-queue-length.o", func(buf bytecode.AssetReader, opts manager.Options) error {
169164
probe, err = startTCPQueueLengthProbe(buf, opts)
170165
return err
171166
})

0 commit comments

Comments
 (0)