Update tests

Author: damemi

internal/pkg/instrumentation/manager_test.go

@@ -173,7 +173,7 @@ func fakeManager(fnNames ...string) *Manager {
 	m := &Manager{
 		logger: slog.Default(),
 		cp:     NewNoopConfigProvider(nil),
-		probes: make(map[probe.ID]probe.Probe),
+		probes: make(map[probe.ID]ProbeReference),
 		proc: &process.Info{
 			ID:        1,
 			Functions: fn,
@@ -182,7 +182,7 @@ func fakeManager(fnNames ...string) *Manager {
 		},
 	}
 	for _, p := range probes {
-		m.probes[p.Manifest().ID] = p
+		m.probes[p.Manifest().ID] = ProbeReference{probe: p}
 	}
 	m.filterUnusedProbes()
 
@@ -239,7 +239,7 @@ func TestRunStoppingByContext(t *testing.T) {
 	m := &Manager{
 		otelController: ctrl,
 		logger:         slog.Default(),
-		probes:         map[probe.ID]probe.Probe{{}: p},
+		probes:         map[probe.ID]ProbeReference{{}: ProbeReference{probe: p}},
 		cp:             NewNoopConfigProvider(nil),
 		proc:           new(process.Info),
 	}
@@ -289,7 +289,7 @@ func TestRunStoppingByStop(t *testing.T) {
 	m := &Manager{
 		otelController: ctrl,
 		logger:         slog.Default(),
-		probes:         map[probe.ID]probe.Probe{{}: &p},
+		probes:         map[probe.ID]ProbeReference{{}: ProbeReference{probe: &p}},
 		cp:             NewNoopConfigProvider(nil),
 		proc:           new(process.Info),
 	}
@@ -335,10 +335,6 @@ func newSlowProbe(stop chan struct{}) slowProbe {
 	}
 }
 
-func (p slowProbe) Load(*link.Executable, *process.Info, *sampling.Config) error {
-	return nil
-}
-
 func (p slowProbe) Run(func(ptrace.ScopeSpans)) {
 }
 
@@ -348,6 +344,18 @@ func (p slowProbe) Close() error {
 	return nil
 }
 
+func (p slowProbe) Spec() (*ebpf.CollectionSpec, error) {
+	return nil, nil
+}
+
+func (p slowProbe) GetConsts() []probe.Const {
+	return []probe.Const{}
+}
+
+func (p slowProbe) GetUprobes() []probe.Uprobe {
+	return []probe.Uprobe{}
+}
+
 type noopProbe struct {
 	loaded, running, closed atomic.Bool
 }
@@ -362,14 +370,6 @@ func (p *noopProbe) Spec() (*ebpf.CollectionSpec, error) {
 	return nil, nil
 }
 
-func (p *noopProbe) SetCollection(*ebpf.Collection) {
-	return
-}
-
-func (p *noopProbe) GetCollection() (*ebpf.Collection) {
-	return nil
-}
-
 func (p *noopProbe) GetConsts() []probe.Const {
 	return nil
 }
@@ -382,9 +382,9 @@ func (p *noopProbe) UpdateClosers(...io.Closer) []io.Closer {
 	return nil
 }
 
-func (p *noopProbe) Init(*sampling.Config) error {
+func (p *noopProbe) InitStartupConfig(*ebpf.Collection, *sampling.Config) (io.Closer, error) {
 	p.loaded.Store(true)
-	return nil
+	return nil, nil
 }
 
 func (p *noopProbe) Run(func(ptrace.ScopeSpans)) {
@@ -445,10 +445,10 @@ func TestConfigProvider(t *testing.T) {
 
 	m := &Manager{
 		logger: slog.Default(),
-		probes: map[probe.ID]probe.Probe{
-			netHTTPClientProbeID:       &noopProbe{},
-			netHTTPServerProbeID:       &noopProbe{},
-			somePackageProducerProbeID: &noopProbe{},
+		probes: map[probe.ID]ProbeReference{
+			netHTTPClientProbeID:       ProbeReference{probe: &noopProbe{}},
+			netHTTPServerProbeID:       ProbeReference{probe: &noopProbe{}},
+			somePackageProducerProbeID: ProbeReference{probe: &noopProbe{}},
 		},
 		cp: newDummyProvider(Config{
 			InstrumentationLibraryConfigs: map[LibraryID]Library{
@@ -469,17 +469,17 @@ func TestConfigProvider(t *testing.T) {
 	go func() { runErr <- m.Run(runCtx) }()
 
 	probeRunning := func(id probe.ID) bool {
-		p := m.probes[id].(*noopProbe)
+		p := m.probes[id].probe.(*noopProbe)
 		return p.loaded.Load() && p.running.Load()
 	}
 
 	probePending := func(id probe.ID) bool {
-		p := m.probes[id].(*noopProbe)
+		p := m.probes[id].probe.(*noopProbe)
 		return !p.loaded.Load() && !p.running.Load()
 	}
 
 	probeClosed := func(id probe.ID) bool {
-		p := m.probes[id].(*noopProbe)
+		p := m.probes[id].probe.(*noopProbe)
 		return p.closed.Load()
 	}
 
@@ -586,7 +586,7 @@ func TestRunStopDeadlock(t *testing.T) {
 	m := &Manager{
 		otelController: ctrl,
 		logger:         slog.Default(),
-		probes:         map[probe.ID]probe.Probe{{}: p},
+		probes:         map[probe.ID]ProbeReference{{}: ProbeReference{probe: p}},
 		cp:             NewNoopConfigProvider(nil),
 		proc:           new(process.Info),
 	}
@@ -635,7 +635,7 @@ func TestStopBeforeLoad(t *testing.T) {
 	m := &Manager{
 		otelController: ctrl,
 		logger:         slog.Default(),
-		probes:         map[probe.ID]probe.Probe{{}: &p},
+		probes:         map[probe.ID]ProbeReference{{}: ProbeReference{probe: &p}},
 		cp:             NewNoopConfigProvider(nil),
 		proc:           new(process.Info),
 	}
@@ -656,7 +656,7 @@ func TestStopBeforeRun(t *testing.T) {
 	m := &Manager{
 		otelController: ctrl,
 		logger:         slog.Default(),
-		probes:         map[probe.ID]probe.Probe{{}: &p},
+		probes:         map[probe.ID]ProbeReference{{}: ProbeReference{probe: &p}},
 		cp:             NewNoopConfigProvider(nil),
 		proc:           new(process.Info),
 	}

internal/pkg/instrumentation/probe/probe.go

@@ -150,11 +150,6 @@ func (i *Base[BPFObj, BPFEvent]) GetUprobes() []*Uprobe {
 	return i.Uprobes
 }
 
-func (i *Base[BPFObj, BPFEvent]) UpdateClosers(closers ...io.Closer) []io.Closer {
-	i.closers = append(i.closers, closers...)
-	return i.closers
-}
-
 func (i *Base[BPFObj, BPFEvent]) GetConsts() []Const {
 	return i.Consts
 }