agent/billing: Use autoscaling.neon.tech/billing-endpoint-id for events

Sometimes we want to provide neon/endpoint-id but not have billing
events generated for it.

pkg/agent/billing/billing.go

@@ -68,10 +68,6 @@ type vmMetricsSeconds struct {
 	activeTime time.Duration
 }
 
-const (
-	EndpointLabel string = "neon/endpoint-id"
-)
-
 func RunBillingMetricsCollector(
 	backgroundCtx context.Context,
 	parentLogger *zap.Logger,
@@ -152,10 +148,13 @@ func (s *metricsState) collect(logger *zap.Logger, store VMStoreForNode, metrics
 		})
 	}
 	for _, vm := range vmsOnThisNode {
-		endpointID, isEndpoint := vm.Labels[EndpointLabel]
+		if vm.Annotations == nil {
+			continue
+		}
+		endpointID, isEndpoint := vm.Annotations[api.AnnotationBillingEndpointID]
 		metricsBatch.inc(isEndpointFlag(isEndpoint), autoscalingEnabledFlag(api.HasAutoscalingEnabled(vm)), vm.Status.Phase)
 		if !isEndpoint {
-			// we're only reporting metrics for VMs with endpoint IDs, and this VM doesn't have one
+			// we're only reporting metrics for VMs with tenant IDs, and this VM doesn't have one
 			continue
 		}
 

pkg/agent/watch.go

@@ -151,8 +151,8 @@ func makeVMEvent(logger *zap.Logger, vm *vmapi.VirtualMachine, kind vmEventKind)
 	}
 
 	endpointID := ""
-	if vm.Labels != nil {
-		endpointID = vm.Labels[billing.EndpointLabel] // billing needs endpoint IDs anyways, just grab the label name from there
+	if vm.Annotations != nil {
+		endpointID = vm.Labels[api.AnnotationBillingEndpointID] // billing needs endpoint IDs anyways, just grab the label name from there
 	}
 
 	return vmEvent{

pkg/api/vminfo.go

@@ -23,6 +23,7 @@ const (
 	LabelEnableAutoscaling        = "autoscaling.neon.tech/enabled"
 	AnnotationAutoscalingBounds   = "autoscaling.neon.tech/bounds"
 	AnnotationAutoscalingConfig   = "autoscaling.neon.tech/config"
+	AnnotationBillingEndpointID   = "autoscaling.neon.tech/billing-endpoint-id"
 )
 
 // HasAutoscalingEnabled returns true iff the object has the label that enables autoscaling