eventcachemetrics: Constrain error label values

Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
cilium · Feb 26, 2024 · 79dd881 · 79dd881
1 parent d9c9a7a
commit 79dd881
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/pkg/grpc/exec/exec.go b/pkg/grpc/exec/exec.go
@@ -70,7 +70,7 @@ func GetProcessExec(event *MsgExecveEventUnix, useCache bool) *tetragon.ProcessE
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessExec: nil Process.Pid", notify.EventType(tetragonEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(tetragonEvent)).Inc()
 		return nil
 	}
 
@@ -394,7 +394,7 @@ func GetProcessExit(event *MsgExitEventUnix) *tetragon.ProcessExit {
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessExit: nil Process.Pid", notify.EventType(tetragonEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(tetragonEvent)).Inc()
 		return nil
 	}
 

diff --git a/pkg/grpc/tracing/tracing.go b/pkg/grpc/tracing/tracing.go
@@ -335,7 +335,7 @@ func GetProcessKprobe(event *MsgGenericKprobeUnix) *tetragon.ProcessKprobe {
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessKprobe: nil Process.Pid", notify.EventType(tetragonEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(tetragonEvent)).Inc()
 		return nil
 	}
 
@@ -447,7 +447,7 @@ func (msg *MsgGenericTracepointUnix) HandleMessage() *tetragon.GetEventsResponse
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessTracepoint: nil Process.Pid", notify.EventType(tetragonEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(tetragonEvent)).Inc()
 		return nil
 	}
 
@@ -574,7 +574,7 @@ func GetProcessLoader(msg *MsgProcessLoaderUnix) *tetragon.ProcessLoader {
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessLoader: nil Process.Pid", notify.EventType(notifyEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(notifyEvent)).Inc()
 		return nil
 	}
 
@@ -683,7 +683,7 @@ func GetProcessUprobe(event *MsgGenericUprobeUnix) *tetragon.ProcessUprobe {
 	}
 
 	if tetragonProcess.Pid == nil {
-		eventcachemetrics.EventCacheError("GetProcessUprobe: nil Process.Pid", notify.EventType(tetragonEvent)).Inc()
+		eventcachemetrics.EventCacheError(eventcachemetrics.NilProcessPid, notify.EventType(tetragonEvent)).Inc()
 		return nil
 	}
 

diff --git a/pkg/metrics/eventcachemetrics/eventcachemetrics.go b/pkg/metrics/eventcachemetrics/eventcachemetrics.go
@@ -23,6 +23,16 @@ var cacheEntryTypeLabelValues = map[CacheEntryType]string{
 	PodInfo:     "pod_info",
 }
 
+type CacheError int
+
+const (
+	NilProcessPid CacheError = iota
+)
+
+var cacheErrorLabelValues = map[CacheError]string{
+	NilProcessPid: "nil_process_pid",
+}
+
 var (
 	processInfoErrors = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace:   consts.MetricsNamespace,
@@ -97,8 +107,8 @@ func PodInfoError(eventType tetragon.EventType) prometheus.Counter {
 }
 
 // Get a new handle on an processInfoErrors metric for an eventType
-func EventCacheError(err string, eventType tetragon.EventType) prometheus.Counter {
-	return eventCacheErrorsTotal.WithLabelValues(err, eventType.String())
+func EventCacheError(t CacheError, eventType tetragon.EventType) prometheus.Counter {
+	return eventCacheErrorsTotal.WithLabelValues(cacheErrorLabelValues[t], eventType.String())
 }
 
 // Get a new handle on the eventCacheRetriesTotal metric for an entryType