WIP

grafana · Dec 21, 2024 · 5ddde6f · 5ddde6f
1 parent 176420c
commit 5ddde6f
Show file tree

Hide file tree

Showing 19 changed files with 843 additions and 495 deletions.
diff --git a/pkg/internal/ebpf/common/common.go b/pkg/internal/ebpf/common/common.go
@@ -43,16 +43,6 @@ var IntegrityModeOverride = false
 
 var ActiveNamespaces = make(map[uint32]uint32)
 
-// These represent unique traffic control (tc) handles to be supplied as
-// arguments to RegisterIngress, RegisterEgress or RegisterTC. They all start
-// from the 0xb310 offset in simplistic attempt to avoid collisions with
-// 3rdparty handles.
-const (
-	NetollyTCHandle = 0xb310 + iota
-	HTTPTracerTCHandle
-	TCTracerTCHandle
-)
-
 // ProbeDesc holds the information of the instrumentation points of a given
 // function/symbol
 type ProbeDesc struct {

diff --git a/pkg/internal/ebpf/common/tc_linux.go b/pkg/internal/ebpf/common/tc_linux.go
diff --git a/pkg/internal/ebpf/generictracer/generictracer.go b/pkg/internal/ebpf/generictracer/generictracer.go
@@ -481,9 +481,6 @@ func (p *Tracer) AlreadyInstrumentedLib(id uint64) bool {
 	return module != nil
 }
 
-func (p *Tracer) SetupTC() {
-}
-
 func (p *Tracer) Run(ctx context.Context, eventsChan chan<- []request.Span) {
 	// At this point we now have loaded the bpf objects, which means we should insert any
 	// pids that are allowed into the bpf map

diff --git a/pkg/internal/ebpf/generictracer/generictracer_notlinux.go b/pkg/internal/ebpf/generictracer/generictracer_notlinux.go
@@ -40,6 +40,5 @@ func (p *Tracer) UnlinkInstrumentedLib(_ uint64)                         {}
 func (p *Tracer) AlreadyInstrumentedLib(_ uint64) bool                   { return false }
 func (p *Tracer) Run(_ context.Context, _ chan<- []request.Span)         {}
 func (p *Tracer) Constants() map[string]any                              { return nil }
-func (p *Tracer) SetupTC()                                               {}
 func (p *Tracer) SetupTailCalls()                                        {}
 func (p *Tracer) RegisterOffsets(_ *exec.FileInfo, _ *goexec.Offsets)    {}
diff --git a/pkg/internal/ebpf/gotracer/gotracer.go b/pkg/internal/ebpf/gotracer/gotracer.go
@@ -401,8 +401,6 @@ func (p *Tracer) AlreadyInstrumentedLib(_ uint64) bool {
 	return false
 }
 
-func (p *Tracer) SetupTC() {}
-
 func (p *Tracer) Run(ctx context.Context, eventsChan chan<- []request.Span) {
 	ebpfcommon.SharedRingbuf(
 		p.cfg,