Updated new code with new struct names

Signed-off-by: Shmuel Kallner <[email protected]>

Author: shmuelk

pkg/epp/datalayer/endpoint.go

@@ -50,17 +50,17 @@ type ModelServer struct {
 }
 
 // NewEndpoint returns a new ModelServer with the given PodInfo and Metrics.
-func NewEndpoint(pod *PodInfo, metrics *Metrics) *ModelServer {
-	if pod == nil {
-		pod = &PodInfo{}
+func NewEndpoint(meta *EndpointMetadata, metrics *Metrics) *ModelServer {
+	if meta == nil {
+		meta = &EndpointMetadata{}
 	}
 	if metrics == nil {
 		metrics = NewMetrics()
 	}
 	ep := &ModelServer{
 		attributes: NewAttributes(),
 	}
-	ep.UpdatePod(pod)
+	ep.UpdateMetadata(meta)
 	ep.UpdateMetrics(metrics)
 	return ep
 }

pkg/epp/datalayer/factory_test.go

@@ -31,7 +31,7 @@ func TestFactory(t *testing.T) {
 	source := &DummySource{}
 	factory := NewEndpointFactory([]DataSource{source}, 100*time.Millisecond)
 
-	pod1 := &PodInfo{
+	pod1 := &EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod1",
 			Namespace: "default",
@@ -44,7 +44,7 @@ func TestFactory(t *testing.T) {
 	dup := factory.NewEndpoint(context.Background(), pod1, nil)
 	assert.Nil(t, dup, "expected to fail to create a duplicate collector")
 
-	pod2 := &PodInfo{
+	pod2 := &EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod2",
 			Namespace: "default",

pkg/epp/datalayer/metrics/datasource_test.go

@@ -50,7 +50,7 @@ func TestDatasource(t *testing.T) {
 
 	ctx := context.Background()
 	factory := datalayer.NewEndpointFactory([]datalayer.DataSource{source}, 100*time.Millisecond)
-	pod := &datalayer.PodInfo{
+	pod := &datalayer.EndpointMetadata{
 		NamespacedName: types.NamespacedName{
 			Name:      "pod1",
 			Namespace: "default",

pkg/epp/datalayer/metrics/extractor.go

@@ -138,7 +138,7 @@ func (ext *Extractor) Extract(ctx context.Context, data any, ep datalayer.Endpoi
 		}
 	}
 
-	logger := log.FromContext(ctx).WithValues("pod", ep.GetPod().NamespacedName)
+	logger := log.FromContext(ctx).WithValues("pod", 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

@@ -78,14 +78,14 @@ func TestLogger(t *testing.T) {
 	assert.Contains(t, logOutput, "\"Stale metrics\": \"[]\"")
 }
 
-var pod1 = &datalayer.PodInfo{
+var pod1 = &datalayer.EndpointMetadata{
 	NamespacedName: types.NamespacedName{
 		Name:      "pod1",
 		Namespace: "default",
 	},
 	Address: "1.2.3.4:5678",
 }
-var pod2 = &datalayer.PodInfo{
+var pod2 = &datalayer.EndpointMetadata{
 	NamespacedName: types.NamespacedName{
 		Name:      "pod2",
 		Namespace: "default",