misc renames

Signed-off-by: Oleg Vasilev <[email protected]>

neonvm/controllers/vm_controller.go

@@ -800,6 +800,8 @@ func (r *VMReconciler) doReconcile(ctx context.Context, vm *vmv1.VirtualMachine)
 		// do nothing
 	}
 
+	// Propagate TargetRevision to CurrentRevision. This is done only if the VM is fully
+	// reconciled and running.
 	if vm.Status.Phase == vmv1.VmRunning && vm.Spec.TargetRevision != nil {
 		rev := vm.Spec.TargetRevision.WithTime(time.Now())
 		vm.Status.CurrentRevision = &rev

pkg/agent/core/revsource/revsource.go

@@ -89,11 +89,11 @@ func Propagate(
 	now time.Time,
 	target vmv1.RevisionWithTime,
 	currentSlot *vmv1.Revision,
-	metricCB ObserveCallback,
+	cb ObserveCallback,
 ) {
-	if metricCB != nil {
+	if cb != nil {
 		diff := now.Sub(target.UpdatedAt.Time)
-		metricCB(diff, target.Flags)
+		cb(diff, target.Flags)
 	}
 	if currentSlot == nil {
 		return

pkg/agent/core/state.go

@@ -89,8 +89,8 @@ type Config struct {
 	// RevisionSource is the source of revisions to track the progress during scaling.
 	RevisionSource RevisionSource `json:"-"`
 
-	// PromMetricsCallbacks are the callbacks to update the Prometheus metrics.
-	PromMetricsCallbacks ObservabilityCallbacks `json:"-"`
+	// ObservabilityCallbacks are the callbacks to submit datapoints for observability.
+	ObservabilityCallbacks ObservabilityCallbacks `json:"-"`
 }
 
 type LogConfig struct {
@@ -222,6 +222,9 @@ type neonvmState struct {
 	OngoingRequested *api.Resources
 	RequestFailedAt  *time.Time
 
+	// TargetRevision is the revision agent works towards. Contrary to monitor/plugin, we
+	// store it not only in action, but also here. This is needed, because for NeonVM propagation
+	// happens after the changes are actually applied, when the action object is long gone.
 	TargetRevision  vmv1.RevisionWithTime
 	CurrentRevision vmv1.Revision
 }
@@ -889,7 +892,7 @@ func (s *state) updateNeonVMCurrentRevision(currentRevision vmv1.RevisionWithTim
 	revsource.Propagate(currentRevision.UpdatedAt.Time,
 		s.NeonVM.TargetRevision,
 		&s.NeonVM.CurrentRevision,
-		s.Config.PromMetricsCallbacks.NeonVMLatency,
+		s.Config.ObservabilityCallbacks.NeonVMLatency,
 	)
 	err := s.Config.RevisionSource.Observe(currentRevision.UpdatedAt.Time, currentRevision.Revision)
 	if err != nil {
@@ -1106,7 +1109,7 @@ func (h PluginHandle) RequestSuccessful(
 	revsource.Propagate(now,
 		targetRevision,
 		&h.s.Plugin.CurrentRevision,
-		h.s.Config.PromMetricsCallbacks.PluginLatency,
+		h.s.Config.ObservabilityCallbacks.PluginLatency,
 	)
 	return nil
 }
@@ -1181,7 +1184,7 @@ func (h MonitorHandle) DownscaleRequestAllowed(now time.Time, rev vmv1.RevisionW
 	revsource.Propagate(now,
 		rev,
 		&h.s.Monitor.CurrentRevision,
-		h.s.Config.PromMetricsCallbacks.MonitorLatency,
+		h.s.Config.ObservabilityCallbacks.MonitorLatency,
 	)
 }
 
@@ -1196,7 +1199,7 @@ func (h MonitorHandle) DownscaleRequestDenied(now time.Time, targetRevision vmv1
 	revsource.Propagate(now,
 		targetRevision,
 		&h.s.Monitor.CurrentRevision,
-		h.s.Config.PromMetricsCallbacks.MonitorLatency,
+		h.s.Config.ObservabilityCallbacks.MonitorLatency,
 	)
 }
 

pkg/agent/core/state_test.go

@@ -132,7 +132,7 @@ func Test_DesiredResourcesFromMetricsOrRequestedUpscaling(t *testing.T) {
 					},
 				},
 				RevisionSource: revsource.NewRevisionSource(nil),
-				PromMetricsCallbacks: core.ObservabilityCallbacks{
+				ObservabilityCallbacks: core.ObservabilityCallbacks{
 					PluginLatency:  nil,
 					MonitorLatency: nil,
 					NeonVMLatency:  nil,
@@ -206,7 +206,7 @@ var DefaultInitialStateConfig = helpers.InitialStateConfig{
 			Warn: nil,
 		},
 		RevisionSource: &helpers.NilRevisionSource{},
-		PromMetricsCallbacks: core.ObservabilityCallbacks{
+		ObservabilityCallbacks: core.ObservabilityCallbacks{
 			PluginLatency:  nil,
 			MonitorLatency: nil,
 			NeonVMLatency:  nil,
@@ -503,7 +503,7 @@ func TestPeriodicPluginRequest(t *testing.T) {
 		DefaultInitialStateConfig,
 		helpers.WithStoredWarnings(a.StoredWarnings()),
 		helpers.WithConfigSetting(func(c *core.Config) {
-			c.PromMetricsCallbacks.PluginLatency = latencyObserver.observe
+			c.ObservabilityCallbacks.PluginLatency = latencyObserver.observe
 			// This time, we will test plugin latency
 			c.RevisionSource = revsource.NewRevisionSource(nil)
 		}),

pkg/agent/runner.go

@@ -216,7 +216,7 @@ func (r *Runner) Run(ctx context.Context, logger *zap.Logger, vmInfoUpdated util
 				Warn: coreExecLogger.Warn,
 			},
 			RevisionSource: revisionSource,
-			PromMetricsCallbacks: core.ObservabilityCallbacks{
+			ObservabilityCallbacks: core.ObservabilityCallbacks{
 				PluginLatency:  WrapHistogramVec(&r.global.metrics.pluginLatency),
 				MonitorLatency: WrapHistogramVec(&r.global.metrics.monitorLatency),
 				NeonVMLatency:  WrapHistogramVec(&r.global.metrics.neonvmLatency),