Remove unused selector cache from old dynamic targeting implementation (#954)

* Remove unused selector cache from old dynamic targeting implementation

* make generate-mocks

Author: ptnapoleon

controllers/disruption_controller.go

@@ -70,7 +70,6 @@ type DisruptionReconciler struct {
 	log                        *zap.SugaredLogger
 	SafetyNets                 []safemode.Safemode
 	ExpiredDisruptionGCDelay   *time.Duration
-	CacheContextStore          map[string]CtxTuple
 	DisruptionsWatchersManager watchers.DisruptionsWatchersManager
 	ChaosPodService            services.ChaosPodService
 	CloudService               cloudservice.CloudServicesProvidersManager
@@ -79,12 +78,6 @@ type DisruptionReconciler struct {
 	FinalizerDeletionDelay     time.Duration
 }
 
-type CtxTuple struct {
-	Ctx                      context.Context
-	CancelFunc               context.CancelFunc
-	DisruptionNamespacedName types.NamespacedName
-}
-
 const TargetsCountLogLimit = 50
 
 func (r *DisruptionReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, err error) {
@@ -1095,10 +1088,6 @@ func (r *DisruptionReconciler) ReportMetrics(ctx context.Context) {
 		if err := r.MetricsSink.MetricPodsGauge(float64(chaosPodsCount)); err != nil {
 			r.BaseLog.Errorw("error sending pods.gauge metric", "error", err)
 		}
-
-		if err := r.MetricsSink.MetricSelectorCacheGauge(float64(len(r.CacheContextStore))); err != nil {
-			r.BaseLog.Errorw("error sending selector.cache.gauge metric", "error", err)
-		}
 	}
 }
 

main.go

@@ -225,7 +225,6 @@ func main() {
 		TracerSink:                 tracerSink,
 		TargetSelector:             targetSelector,
 		ExpiredDisruptionGCDelay:   gcPtr,
-		CacheContextStore:          make(map[string]controllers.CtxTuple),
 		ChaosPodService:            chaosPodService,
 		CloudService:               cloudProviderManager,
 		DisruptionsDeletionTimeout: cfg.Controller.DisruptionDeletionTimeout,
@@ -462,13 +461,6 @@ func main() {
 	// called, the broadcaster isn't actually initiated
 	defer broadcaster.Shutdown()
 
-	// erase/close caches contexts
-	defer func() {
-		for _, contextTuple := range disruptionReconciler.CacheContextStore {
-			contextTuple.CancelFunc()
-		}
-	}()
-
 	// +kubebuilder:scaffold:builder
 
 	logger.Infow("starting chaos-controller")

o11y/metrics/datadog/datadog.go

@@ -219,11 +219,6 @@ func (d Sink) MetricWatcherCalls(tags []string) error {
 	return d.metricWithStatus(d.prefix+"watcher.calls_total", tags)
 }
 
-// MetricSelectorCacheGauge reports how many caches are still in the cache array to prevent leaks
-func (d Sink) MetricSelectorCacheGauge(gauge float64) error {
-	return d.client.Gauge(d.prefix+"selector.cache.gauge", gauge, []string{}, 1)
-}
-
 // MetricTooLate reports when a scheduled disruption misses its aloted time to be scheduled
 // specific to cron and rollout controllers
 func (d Sink) MetricTooLate(tags []string) error {

o11y/metrics/metrics.go

@@ -36,7 +36,6 @@ type Sink interface {
 	MetricStuckOnRemovalGauge(gauge float64) error
 	MetricDisruptionsGauge(gauge float64, tags []string) error
 	MetricDisruptionsCount(kind chaostypes.DisruptionKindName, tags []string) error
-	MetricSelectorCacheGauge(gauge float64) error
 	MetricWatcherCalls(tags []string) error
 	MetricPodsGauge(gauge float64) error
 	MetricRestart() error

o11y/metrics/noop/noop.go

@@ -203,13 +203,6 @@ func (n Sink) MetricWatcherCalls(tags []string) error {
 	return nil
 }
 
-// MetricSelectorCacheGauge reports how many caches are still in the cache array to prevent leaks
-func (n Sink) MetricSelectorCacheGauge(gauge float64) error {
-	n.log.Debugf("NOOP: MetricSelectorCacheGauge %f\n", gauge)
-
-	return nil
-}
-
 // MetricTooLate reports when a scheduled disruption misses its aloted time to be scheduled
 // specific to cron and rollout controllers
 func (n Sink) MetricTooLate(tags []string) error {