remove the monitor sampler

pkg/monitor/api.go

@@ -63,8 +63,6 @@ func Start(ctx context.Context, restConfig *rest.Config, additionalEventInterval
 
 	// add interval creation at the same point where we add the monitors
 	startClusterOperatorMonitoring(ctx, m, configClient)
-
-	m.StartSampling(ctx)
 	return m, nil
 }
 

pkg/monitor/monitor.go

@@ -1,7 +1,6 @@
 package monitor
 
 import (
-	"context"
 	"fmt"
 	"sort"
 	"strconv"
@@ -44,37 +43,6 @@ func NewMonitorWithInterval(interval time.Duration) *Monitor {
 
 var _ Interface = &Monitor{}
 
-// StartSampling starts sampling every interval until the provided context is done.
-// A sample is captured when the context is closed.
-func (m *Monitor) StartSampling(ctx context.Context) {
-	if m.interval == 0 {
-		return
-	}
-	go func() {
-		ticker := time.NewTicker(m.interval)
-		defer ticker.Stop()
-		hasConditions := false
-		for {
-			select {
-			case <-ticker.C:
-			case <-ctx.Done():
-				hasConditions = m.sample(hasConditions)
-				return
-			}
-			hasConditions = m.sample(hasConditions)
-		}
-	}()
-}
-
-// AddSampler adds a sampler function to the list of samplers to run every interval.
-// Conditions discovered this way are recorded with a start and end time if they persist
-// across multiple sampling intervals.
-func (m *Monitor) AddSampler(fn SamplerFunc) {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.samplers = append(m.samplers, fn)
-}
-
 func (m *Monitor) CurrentResourceState() monitorapi.ResourcesMap {
 	m.recordedResourceLock.Lock()
 	defer m.recordedResourceLock.Unlock()
@@ -235,31 +203,6 @@ func (m *Monitor) RecordAt(t time.Time, conditions ...monitorapi.Condition) {
 	}
 }
 
-func (m *Monitor) sample(hasPrevious bool) bool {
-	m.lock.Lock()
-	samplers := m.samplers
-	m.lock.Unlock()
-
-	now := time.Now().UTC()
-	var conditions []*monitorapi.Condition
-	for _, fn := range samplers {
-		conditions = append(conditions, fn(now)...)
-	}
-	if len(conditions) == 0 {
-		if !hasPrevious {
-			return false
-		}
-	}
-
-	m.lock.Lock()
-	defer m.lock.Unlock()
-	m.samples = append(m.samples, &sample{
-		at:         now,
-		conditions: conditions,
-	})
-	return len(conditions) > 0
-}
-
 func (m *Monitor) snapshot() ([]*sample, monitorapi.Intervals, monitorapi.Intervals) {
 	m.lock.Lock()
 	defer m.lock.Unlock()

pkg/monitor/noop.go

@@ -19,4 +19,3 @@ func (*noOpMonitor) Record(conditions ...monitorapi.Condition)
 func (*noOpMonitor) RecordAt(t time.Time, conditions ...monitorapi.Condition)      {}
 func (*noOpMonitor) StartInterval(t time.Time, condition monitorapi.Condition) int { return 0 }
 func (*noOpMonitor) EndInterval(startedInterval int, t time.Time)                  {}
-func (*noOpMonitor) AddSampler(fn SamplerFunc)                                     {}

pkg/monitor/operator.go

@@ -263,26 +263,6 @@ func startClusterOperatorMonitoring(ctx context.Context, m Recorder, client conf
 		},
 	)
 
-	m.AddSampler(func(now time.Time) []*monitorapi.Condition {
-		var conditions []*monitorapi.Condition
-		for _, obj := range cvInformer.GetStore().List() {
-			cv, ok := obj.(*configv1.ClusterVersion)
-			if !ok {
-				continue
-			}
-			if len(cv.Status.History) > 0 {
-				if cv.Status.History[0].State != configv1.CompletedUpdate {
-					conditions = append(conditions, &monitorapi.Condition{
-						Level:   monitorapi.Warning,
-						Locator: locateClusterVersion(cv),
-						Message: fmt.Sprintf("cluster is updating to %s", versionOrImage(cv.Status.History[0])),
-					})
-				}
-			}
-		}
-		return conditions
-	})
-
 	go cvInformer.Run(ctx.Done())
 }
 

pkg/monitor/types.go

@@ -29,8 +29,6 @@ type Recorder interface {
 
 	StartInterval(t time.Time, condition monitorapi.Condition) int
 	EndInterval(startedInterval int, t time.Time)
-
-	AddSampler(fn SamplerFunc)
 }
 
 type ConditionalSampler interface {