Skip to content

Commit 79b282b

Browse files
committed
Updates from review comments
Signed-off-by: Shmuel Kallner <[email protected]>
1 parent e4f723b commit 79b282b

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

pkg/epp/backend/metrics/pod_metrics.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525

2626
"github.com/go-logr/logr"
2727

28-
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend"
2928
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datalayer"
3029
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
3130
)
@@ -35,7 +34,7 @@ const (
3534
)
3635

3736
type podMetrics struct {
38-
pod atomic.Pointer[backend.Pod]
37+
metadata atomic.Pointer[datalayer.EndpointMetadata]
3938
metrics atomic.Pointer[MetricsState]
4039
pmc PodMetricsClient
4140
ds datalayer.PoolInfo
@@ -49,23 +48,23 @@ type podMetrics struct {
4948
}
5049

5150
type PodMetricsClient interface {
52-
FetchMetrics(ctx context.Context, pod *backend.Pod, existing *MetricsState) (*MetricsState, error)
51+
FetchMetrics(ctx context.Context, pod *datalayer.EndpointMetadata, existing *MetricsState) (*MetricsState, error)
5352
}
5453

5554
func (pm *podMetrics) String() string {
5655
return fmt.Sprintf("Pod: %v; Metrics: %v", pm.GetMetadata(), pm.GetMetrics())
5756
}
5857

59-
func (pm *podMetrics) GetMetadata() *backend.Pod {
60-
return pm.pod.Load()
58+
func (pm *podMetrics) GetMetadata() *datalayer.EndpointMetadata {
59+
return pm.metadata.Load()
6160
}
6261

6362
func (pm *podMetrics) GetMetrics() *MetricsState {
6463
return pm.metrics.Load()
6564
}
6665

6766
func (pm *podMetrics) UpdateMetadata(pod *datalayer.EndpointMetadata) {
68-
pm.pod.Store(pod)
67+
pm.metadata.Store(pod)
6968
}
7069

7170
// start starts a goroutine exactly once to periodically update metrics. The goroutine will be

pkg/epp/backend/metrics/types.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,17 @@ type PodMetricsFactory struct {
5252
refreshMetricsInterval time.Duration
5353
}
5454

55-
func (f *PodMetricsFactory) NewEndpoint(parentCtx context.Context, pod *datalayer.EndpointMetadata, ds datalayer.PoolInfo) PodMetrics {
55+
func (f *PodMetricsFactory) NewEndpoint(parentCtx context.Context, metadata *datalayer.EndpointMetadata, ds datalayer.PoolInfo) datalayer.Endpoint {
5656
pm := &podMetrics{
5757
pmc: f.pmc,
5858
ds: ds,
5959
interval: f.refreshMetricsInterval,
6060
startOnce: sync.Once{},
6161
stopOnce: sync.Once{},
6262
done: make(chan struct{}),
63-
logger: log.FromContext(parentCtx).WithValues("pod", pod.NamespacedName),
63+
logger: log.FromContext(parentCtx).WithValues("endpoint", metadata.NamespacedName),
6464
}
65-
pm.pod.Store(pod)
65+
pm.metadata.Store(metadata)
6666
pm.metrics.Store(NewMetricsState())
6767

6868
pm.startRefreshLoop(parentCtx)

0 commit comments

Comments
 (0)