From 7fa6b8463f8064b3da8290bbc3645da796c92076 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@kernel.org>
Date: Sun, 2 Jun 2024 19:43:29 +0000
Subject: [PATCH] tetragon: Remove id from tracing sensors name

It's no longer needed, because all sensors are now placed
in policy directory.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 pkg/sensors/tracing/enforcer.go          | 5 +----
 pkg/sensors/tracing/generictracepoint.go | 2 --
 pkg/sensors/tracing/genericuprobe.go     | 5 +----
 pkg/sensors/tracing/policyhandler.go     | 9 +++------
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkg/sensors/tracing/enforcer.go b/pkg/sensors/tracing/enforcer.go
index 1c6e838546f..5c44da3b5c5 100644
--- a/pkg/sensors/tracing/enforcer.go
+++ b/pkg/sensors/tracing/enforcer.go
@@ -8,7 +8,6 @@ import (
 	"path"
 	"strings"
 	"sync"
-	"sync/atomic"
 
 	"github.com/cilium/tetragon/pkg/arch"
 	"github.com/cilium/tetragon/pkg/bpf"
@@ -95,8 +94,7 @@ func (kp *enforcerPolicy) PolicyHandler(
 		}
 	}
 	if len(spec.Enforcers) > 0 {
-		name := fmt.Sprintf("enforcer-sensor-%d", atomic.AddUint64(&sensorCounter, 1))
-		return kp.createEnforcerSensor(spec.Enforcers, spec.Lists, spec.Options, name, policy.TpName())
+		return kp.createEnforcerSensor(spec.Enforcers, spec.Lists, spec.Options, policy.TpName())
 	}
 
 	return nil, nil
@@ -185,7 +183,6 @@ func (kp *enforcerPolicy) createEnforcerSensor(
 	enforcers []v1alpha1.EnforcerSpec,
 	lists []v1alpha1.ListSpec,
 	opts []v1alpha1.OptionSpec,
-	name string,
 	policyName string,
 ) (*sensors.Sensor, error) {
 
diff --git a/pkg/sensors/tracing/generictracepoint.go b/pkg/sensors/tracing/generictracepoint.go
index 53a279af440..667c0149c26 100644
--- a/pkg/sensors/tracing/generictracepoint.go
+++ b/pkg/sensors/tracing/generictracepoint.go
@@ -47,8 +47,6 @@ var (
 	genericTracepointTable = tracepointTable{}
 
 	tracepointLog logrus.FieldLogger
-
-	sensorCounter uint64
 )
 
 type observerTracepointSensor struct {
diff --git a/pkg/sensors/tracing/genericuprobe.go b/pkg/sensors/tracing/genericuprobe.go
index c748bd64b0c..2df495f6b73 100644
--- a/pkg/sensors/tracing/genericuprobe.go
+++ b/pkg/sensors/tracing/genericuprobe.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"path"
-	"sync/atomic"
 
 	"github.com/cilium/ebpf"
 	"github.com/cilium/tetragon/pkg/api/ops"
@@ -493,7 +492,5 @@ func (k *observerUprobeSensor) PolicyHandler(
 		return nil, fmt.Errorf("uprobe sensor does not implement policy filtering")
 	}
 
-	name := fmt.Sprintf("gup-sensor-%d", atomic.AddUint64(&sensorCounter, 1))
-	policyName := p.TpName()
-	return createGenericUprobeSensor(name, spec, policyName)
+	return createGenericUprobeSensor("generic_uprobe", spec, p.TpName())
 }
diff --git a/pkg/sensors/tracing/policyhandler.go b/pkg/sensors/tracing/policyhandler.go
index 62f9d80fbba..16603d3ab89 100644
--- a/pkg/sensors/tracing/policyhandler.go
+++ b/pkg/sensors/tracing/policyhandler.go
@@ -6,7 +6,6 @@ package tracing
 import (
 	"errors"
 	"fmt"
-	"sync/atomic"
 
 	"github.com/cilium/tetragon/pkg/eventhandler"
 	"github.com/cilium/tetragon/pkg/policyfilter"
@@ -44,7 +43,7 @@ func (h policyHandler) PolicyHandler(
 
 	handler := eventhandler.GetCustomEventhandler(policy)
 	if len(spec.KProbes) > 0 {
-		name := fmt.Sprintf("gkp-sensor-%d", atomic.AddUint64(&sensorCounter, 1))
+		name := "generic_kprobe"
 		err := preValidateKprobes(name, spec.KProbes, spec.Lists)
 		if err != nil {
 			return nil, fmt.Errorf("validation failed: %w", err)
@@ -52,12 +51,10 @@ func (h policyHandler) PolicyHandler(
 		return createGenericKprobeSensor(spec, name, policyID, policyName, handler)
 	}
 	if len(spec.Tracepoints) > 0 {
-		name := fmt.Sprintf("gtp-sensor-%d", atomic.AddUint64(&sensorCounter, 1))
-		return createGenericTracepointSensor(spec, name, policyID, policyName, handler)
+		return createGenericTracepointSensor(spec, "generic_tracepoint", policyID, policyName, handler)
 	}
 	if len(spec.LsmHooks) > 0 {
-		name := fmt.Sprintf("glsm-sensor-%d", atomic.AddUint64(&sensorCounter, 1))
-		return createGenericLsmSensor(spec, name, policyID, policyName)
+		return createGenericLsmSensor(spec, "generic_lsm", policyID, policyName)
 	}
 	return nil, nil
 }