fix: map_drops_total replaced with ProcessCacheEvicted and drop event…

…cache usuage in mapmetrics map_drops_total replaced with ProcessCacheEvicted and drop eventcache usuage in mapmetrics Signed-off-by: sadath-12 <sadathsadu2002@gmail.com>
cilium · Feb 22, 2024 · 36d7177 · 36d7177
1 parent 9f641c0
commit 36d7177
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 53 deletions.
diff --git a/pkg/eventcache/eventcache.go b/pkg/eventcache/eventcache.go
@@ -247,7 +247,3 @@ func New(s *server.Server) *Cache {
 func Get() *Cache {
 	return cache
 }
-
-func (ec *Cache) len() int {
-	return len(ec.cache)
-}
diff --git a/pkg/eventcache/metrics.go b/pkg/eventcache/metrics.go
diff --git a/pkg/metrics/mapmetrics/mapmetrics.go b/pkg/metrics/mapmetrics/mapmetrics.go
@@ -10,12 +10,6 @@ import (
 )
 
 var (
-	MapDrops = prometheus.NewCounterVec(prometheus.CounterOpts{
-		Namespace:   consts.MetricsNamespace,
-		Name:        "map_drops_total",
-		Help:        "The total number of entries dropped per LRU map.",
-		ConstLabels: nil,
-	}, []string{"map"})
 	MapSize = metrics.NewBPFGauge(prometheus.NewDesc(
 		prometheus.BuildFQName(consts.MetricsNamespace, "", "map_in_use"),
 		"The total number of in-use entries per map.",
@@ -28,15 +22,10 @@ var (
 	))
 )
 
-func InitMetrics(registry *prometheus.Registry) {
-	registry.MustRegister(MapDrops)
+func InitMetrics(_ *prometheus.Registry) {
 	// custom collectors are registered independently
 }
 
-func MapDropInc(mapName string) {
-	MapDrops.WithLabelValues(mapName).Inc()
-}
-
 // bpfCollector implements prometheus.Collector. It collects metrics directly from BPF maps.
 // NB: We can't register individual BPF collectors collecting map metrics, because they share the
 // metrics descriptors. Sending duplicate descriptors from different collectors results in

diff --git a/pkg/metrics/metricsconfig/initmetrics.go b/pkg/metrics/metricsconfig/initmetrics.go
@@ -4,7 +4,6 @@
 package metricsconfig
 
 import (
-	"github.com/cilium/tetragon/pkg/eventcache"
 	"github.com/cilium/tetragon/pkg/grpc/tracing"
 	"github.com/cilium/tetragon/pkg/metrics/errormetrics"
 	"github.com/cilium/tetragon/pkg/metrics/eventcachemetrics"
@@ -46,7 +45,6 @@ func InitAllMetrics(registry *prometheus.Registry) {
 
 	// register BPF collectors
 	registry.MustRegister(mapmetrics.NewBPFCollector(
-		eventcache.NewBPFCollector(),
 		observer.NewBPFCollector(),
 		process.NewBPFCollector(),
 	))

diff --git a/pkg/process/cache.go b/pkg/process/cache.go
@@ -11,7 +11,6 @@ import (
 	"github.com/cilium/tetragon/api/v1/tetragon"
 	"github.com/cilium/tetragon/pkg/logger"
 	"github.com/cilium/tetragon/pkg/metrics/errormetrics"
-	"github.com/cilium/tetragon/pkg/metrics/mapmetrics"
 	lru "github.com/hashicorp/golang-lru/v2"
 )
 
@@ -132,7 +131,7 @@ func NewCache(
 	lruCache, err := lru.NewWithEvict(
 		processCacheSize,
 		func(_ string, _ *ProcessInternal) {
-			mapmetrics.MapDropInc("processLru")
+			errormetrics.ErrorTotalInc(errormetrics.ProcessCacheEvicted)
 		},
 	)
 	if err != nil {
@@ -160,9 +159,6 @@ func (pc *Cache) get(processID string) (*ProcessInternal, error) {
 // clone or execve events
 func (pc *Cache) add(process *ProcessInternal) bool {
 	evicted := pc.cache.Add(process.process.ExecId, process)
-	if evicted {
-		errormetrics.ErrorTotalInc(errormetrics.ProcessCacheEvicted)
-	}
 	return evicted
 }