Make messages and variable names somewhat more consistent

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

Author: shmuelk

pkg/epp/backend/metrics/fake.go

@@ -38,7 +38,7 @@ type FakePodMetrics struct {
 }
 
 func (fpm *FakePodMetrics) String() string {
-	return fmt.Sprintf("Pod: %v; Metrics: %v", fpm.GetMetadata(), fpm.GetMetrics())
+	return fmt.Sprintf("Metadata: %v; Metrics: %v", fpm.GetMetadata(), fpm.GetMetrics())
 }
 
 func (fpm *FakePodMetrics) GetMetadata() *backend.Pod {
@@ -49,8 +49,8 @@ func (fpm *FakePodMetrics) GetMetrics() *MetricsState {
 	return fpm.Metrics
 }
 
-func (fpm *FakePodMetrics) UpdateMetadata(pod *datalayer.EndpointMetadata) {
-	fpm.Pod = pod
+func (fpm *FakePodMetrics) UpdateMetadata(metadata *datalayer.EndpointMetadata) {
+	fpm.Pod = metadata
 }
 func (fpm *FakePodMetrics) GetAttributes() *datalayer.Attributes {
 	return fpm.Attributes

pkg/epp/backend/metrics/pod_metrics.go

@@ -52,7 +52,7 @@ type PodMetricsClient interface {
 }
 
 func (pm *podMetrics) String() string {
-	return fmt.Sprintf("Pod: %v; Metrics: %v", pm.GetMetadata(), pm.GetMetrics())
+	return fmt.Sprintf("Metadata: %v; Metrics: %v", pm.GetMetadata(), pm.GetMetrics())
 }
 
 func (pm *podMetrics) GetMetadata() *datalayer.EndpointMetadata {
@@ -72,7 +72,7 @@ func (pm *podMetrics) UpdateMetadata(pod *datalayer.EndpointMetadata) {
 func (pm *podMetrics) startRefreshLoop(ctx context.Context) {
 	pm.startOnce.Do(func() {
 		go func() {
-			pm.logger.V(logutil.DEFAULT).Info("Starting refresher", "pod", pm.GetMetadata())
+			pm.logger.V(logutil.DEFAULT).Info("Starting refresher", "metadata", pm.GetMetadata())
 			ticker := time.NewTicker(pm.interval)
 			defer ticker.Stop()
 			for {
@@ -83,7 +83,7 @@ func (pm *podMetrics) startRefreshLoop(ctx context.Context) {
 					return
 				case <-ticker.C: // refresh metrics periodically
 					if err := pm.refreshMetrics(); err != nil {
-						pm.logger.V(logutil.TRACE).Error(err, "Failed to refresh metrics", "pod", pm.GetMetadata())
+						pm.logger.V(logutil.TRACE).Error(err, "Failed to refresh metrics", "metadata", pm.GetMetadata())
 					}
 				}
 			}
@@ -114,7 +114,7 @@ func (pm *podMetrics) refreshMetrics() error {
 }
 
 func (pm *podMetrics) stopRefreshLoop() {
-	pm.logger.V(logutil.DEFAULT).Info("Stopping refresher", "pod", pm.GetMetadata())
+	pm.logger.V(logutil.DEFAULT).Info("Stopping refresher", "metadata", pm.GetMetadata())
 	pm.stopOnce.Do(func() {
 		close(pm.done)
 	})

pkg/epp/datalayer/endpoint.go

@@ -68,7 +68,7 @@ func NewEndpoint(meta *EndpointMetadata, metrics *Metrics) *ModelServer {
 // String returns a representation of the ModelServer. For brevity, only names of
 // extended attributes are returned and not their values.
 func (srv *ModelServer) String() string {
-	return fmt.Sprintf("Pod: %v; Metrics: %v; Attributes: %v", srv.GetMetadata(), srv.GetMetrics(), srv.Keys())
+	return fmt.Sprintf("Metadata: %v; Metrics: %v; Attributes: %v", srv.GetMetadata(), srv.GetMetrics(), srv.Keys())
 }
 
 func (srv *ModelServer) GetMetadata() *EndpointMetadata {

pkg/epp/datalayer/metrics/extractor.go

@@ -153,7 +153,7 @@ func (ext *Extractor) Extract(ctx context.Context, data any, ep datalayer.Endpoi
 		}
 	}
 
-	logger := log.FromContext(ctx).WithValues("pod", ep.GetMetadata().NamespacedName)
+	logger := log.FromContext(ctx).WithValues("endpoint", ep.GetMetadata().NamespacedName)
 	if updated {
 		clone.UpdateTime = time.Now()
 		logger.V(logutil.TRACE).Info("Refreshed metrics", "updated", clone)

pkg/epp/datalayer/metrics/logger_test.go

@@ -72,10 +72,10 @@ func TestLogger(t *testing.T) {
 
 	logOutput := b.read()
 	assert.Contains(t, logOutput, "Refreshing Prometheus Metrics	{\"ReadyPods\": 2}")
-	assert.Contains(t, logOutput, "Current Pods and metrics gathered	{\"Fresh metrics\": \"[Pod: {NamespacedName:default/pod1 PodName: Address:1.2.3.4:5678")
+	assert.Contains(t, logOutput, "Current Pods and metrics gathered	{\"Fresh metrics\": \"[Metadata: {NamespacedName:default/pod1 PodName: Address:1.2.3.4:5678")
 	assert.Contains(t, logOutput, "Metrics: {ActiveModels:map[modelA:1] WaitingModels:map[modelB:2] MaxActiveModels:5")
 	assert.Contains(t, logOutput, "RunningQueueSize:3 WaitingQueueSize:7 KVCacheUsagePercent:42.5 KvCacheMaxTokenCapacity:2048")
-	assert.Contains(t, logOutput, "Pod: {NamespacedName:default/pod2 PodName: Address:1.2.3.4:5679")
+	assert.Contains(t, logOutput, "Metadata: {NamespacedName:default/pod2 PodName: Address:1.2.3.4:5679")
 	assert.Contains(t, logOutput, "\"Stale metrics\": \"[]\"")
 }
 

pkg/epp/datastore/datastore.go

@@ -343,7 +343,7 @@ func (ds *datastore) podResyncAll(ctx context.Context, reader client.Reader) err
 	ds.pods.Range(func(k, v any) bool {
 		ep := v.(datalayer.Endpoint)
 		if exist := activePods[ep.GetMetadata().PodName]; !exist {
-			logger.V(logutil.VERBOSE).Info("Removing pod", "pod", ep.GetMetadata())
+			logger.V(logutil.VERBOSE).Info("Removing pod", "pod", ep.GetMetadata().PodName)
 			ds.PodDelete(ep.GetMetadata().PodName)
 		}
 		return true