rebase and update last changes

Signed-off-by: Nir Rozenbaum <[email protected]>

Author: nirrozenbaum

pkg/epp/metrics/collectors/inference_pool.go

@@ -18,6 +18,8 @@ package collectors
 
 import (
 	"k8s.io/component-base/metrics"
+	backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
+	podinfo "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/pod-info"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
 )
 
@@ -69,12 +71,21 @@ func (c *inferencePoolMetricsCollector) CollectWithStability(ch chan<- metrics.M
 	}
 
 	for _, pod := range podMetrics {
-		ch <- metrics.NewLazyConstMetric(
-			descInferencePoolPerPodQueueSize,
-			metrics.GaugeValue,
-			float64(pod.GetMetrics().WaitingQueueSize),
-			pool.Name,
-			pod.GetPod().NamespacedName.Name,
-		)
+		if podMetrics := getMetricsFromPodInfo(pod); podMetrics != nil {
+			ch <- metrics.NewLazyConstMetric(
+				descInferencePoolPerPodQueueSize,
+				metrics.GaugeValue,
+				float64(podMetrics.WaitingQueueSize),
+				pool.Name,
+				pod.GetPod().NamespacedName.Name,
+			)
+		}
 	}
 }
+func getMetricsFromPodInfo(pod podinfo.PodInfo) *backendmetrics.Metrics {
+	podMetrics, ok := pod.GetData()[backendmetrics.MetricsDataKey]
+	if !ok {
+		return nil // no entry in the map with metrics key
+	}
+	return podMetrics.(*backendmetrics.Metrics)
+}

pkg/epp/metrics/collectors/inference_pool_test.go

@@ -30,6 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 	"sigs.k8s.io/gateway-api-inference-extension/api/v1alpha2"
 	backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
+	podinfo "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/pod-info"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
 )
 
@@ -48,8 +49,10 @@ var (
 )
 
 func TestNoMetricsCollected(t *testing.T) {
-	pmf := backendmetrics.NewPodMetricsFactory(&backendmetrics.FakePodMetricsClient{}, time.Second)
-	datastore := datastore.NewDatastore(context.Background(), pmf)
+	podInfoFactory := podinfo.NewPodInfoFactory(map[podinfo.Scraper]*podinfo.ScraperConfig{
+		&backendmetrics.FakeMetricsScraper{}: podinfo.NewScraperConfig(time.Second, 5*time.Second),
+	})
+	datastore := datastore.NewDatastore(context.Background(), podInfoFactory)
 
 	collector := &inferencePoolMetricsCollector{
 		ds: datastore,
@@ -61,13 +64,15 @@ func TestNoMetricsCollected(t *testing.T) {
 }
 
 func TestMetricsCollected(t *testing.T) {
-	pmc := &backendmetrics.FakePodMetricsClient{
+	fms := &backendmetrics.FakeMetricsScraper{
 		Res: map[types.NamespacedName]*backendmetrics.Metrics{
 			pod1NamespacedName: pod1Metrics,
 		},
 	}
-	pmf := backendmetrics.NewPodMetricsFactory(pmc, time.Millisecond)
-	ds := datastore.NewDatastore(context.Background(), pmf)
+	podInfoFactory := podinfo.NewPodInfoFactory(map[podinfo.Scraper]*podinfo.ScraperConfig{
+		fms: podinfo.NewScraperConfig(time.Millisecond, 5*time.Millisecond),
+	})
+	ds := datastore.NewDatastore(context.Background(), podInfoFactory)
 
 	scheme := runtime.NewScheme()
 	fakeClient := fake.NewClientBuilder().