Remove usage of UnregisterTelemetry

DataDog · Dec 26, 2024 · 057c6ed · 057c6ed
1 parent 50ae141
commit 057c6ed
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/pkg/ebpf/telemetry/perf_metrics.go b/pkg/ebpf/telemetry/perf_metrics.go
@@ -158,13 +158,6 @@ func (p *perfUsageCollector) registerRingBuffer(rb *manager.RingBuffer) {
 	p.ringBuffers = append(p.ringBuffers, rb)
 }
 
-// UnregisterTelemetry unregisters the PerfMap and RingBuffers from telemetry
-func UnregisterTelemetry(m *manager.Manager) {
-	if perfCollector != nil {
-		perfCollector.unregisterTelemetry(m)
-	}
-}
-
 func (p *perfUsageCollector) unregisterTelemetry(m *manager.Manager) {
 	p.mtx.Lock()
 	defer p.mtx.Unlock()

diff --git a/pkg/network/tracer/connection/ebpf_tracer.go b/pkg/network/tracer/connection/ebpf_tracer.go
@@ -24,7 +24,6 @@ import (
 	telemetryComponent "github.com/DataDog/datadog-agent/comp/core/telemetry"
 	ddebpf "github.com/DataDog/datadog-agent/pkg/ebpf"
 	"github.com/DataDog/datadog-agent/pkg/ebpf/maps"
-	ebpftelemetry "github.com/DataDog/datadog-agent/pkg/ebpf/telemetry"
 	"github.com/DataDog/datadog-agent/pkg/network"
 	"github.com/DataDog/datadog-agent/pkg/network/config"
 	netebpf "github.com/DataDog/datadog-agent/pkg/network/ebpf"
@@ -341,7 +340,6 @@ func (t *ebpfTracer) Stop() {
 	t.stopOnce.Do(func() {
 		close(t.exitTelemetry)
 		ddebpf.RemoveNameMappings(t.m)
-		ebpftelemetry.UnregisterTelemetry(t.m)
 		_ = t.m.Stop(manager.CleanAll)
 		t.closeConsumer.Stop()
 		t.ongoingConnectCleaner.Stop()

diff --git a/pkg/network/usm/ebpf_main.go b/pkg/network/usm/ebpf_main.go
@@ -281,7 +281,6 @@ func (e *ebpfProgram) Start() error {
 
 // Close stops the ebpf program and cleans up all resources.
 func (e *ebpfProgram) Close() error {
-	ebpftelemetry.UnregisterTelemetry(e.Manager.Manager)
 	var err error
 	// We need to stop the perf maps and ring buffers before stopping the protocols, as we need to stop sending events
 	// to them. If we don't do this, we might send events on closed channels which will panic.

diff --git a/pkg/security/probe/probe_ebpf.go b/pkg/security/probe/probe_ebpf.go
@@ -34,7 +34,6 @@ import (
 
 	"github.com/DataDog/datadog-agent/pkg/config/env"
 	ddebpf "github.com/DataDog/datadog-agent/pkg/ebpf"
-	ebpftelemetry "github.com/DataDog/datadog-agent/pkg/ebpf/telemetry"
 	"github.com/DataDog/datadog-agent/pkg/security/config"
 	"github.com/DataDog/datadog-agent/pkg/security/ebpf"
 	"github.com/DataDog/datadog-agent/pkg/security/ebpf/kernel"
@@ -1670,7 +1669,6 @@ func (p *EBPFProbe) Close() error {
 	}
 
 	ddebpf.RemoveNameMappings(p.Manager)
-	ebpftelemetry.UnregisterTelemetry(p.Manager)
 	// Stopping the manager will stop the perf map reader and unload eBPF programs
 	if err := p.Manager.Stop(manager.CleanAll); err != nil {
 		return err