Merge pull request #2153 from swetharepakula/cleanup-neg-metrics

Cleanup NEG Metrics
kubernetes · May 30, 2023 · 2c89f80 · 2c89f80
2 parents 6b2e60c + ec8a4af
commit 2c89f80
Show file tree

Hide file tree

Showing 15 changed files with 322 additions and 402 deletions.
diff --git a/pkg/neg/controller.go b/pkg/neg/controller.go
@@ -40,7 +40,7 @@ import (
 	"k8s.io/ingress-gce/pkg/flags"
 	usageMetrics "k8s.io/ingress-gce/pkg/metrics"
 	"k8s.io/ingress-gce/pkg/neg/metrics"
-	syncMetrics "k8s.io/ingress-gce/pkg/neg/metrics"
+	syncMetrics "k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	"k8s.io/ingress-gce/pkg/neg/readiness"
 	"k8s.io/ingress-gce/pkg/neg/syncers/labels"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
@@ -56,6 +56,7 @@ import (
 func init() {
 	// register prometheus metrics
 	metrics.RegisterMetrics()
+	syncMetrics.RegisterMetrics()
 }
 
 // Controller is network endpoint group controller.
@@ -163,7 +164,7 @@ func NewController(
 	recorder := eventBroadcaster.NewRecorder(negScheme,
 		apiv1.EventSource{Component: "neg-controller"})
 
-	syncerMetrics := metrics.NewNegMetricsCollector(flags.F.NegMetricsExportInterval, logger)
+	syncerMetrics := syncMetrics.NewNegMetricsCollector(flags.F.NegMetricsExportInterval, logger)
 	manager := newSyncerManager(
 		namer,
 		recorder,

diff --git a/pkg/neg/manager.go b/pkg/neg/manager.go
@@ -37,6 +37,7 @@ import (
 	"k8s.io/client-go/tools/record"
 	negv1beta1 "k8s.io/ingress-gce/pkg/apis/svcneg/v1beta1"
 	"k8s.io/ingress-gce/pkg/neg/metrics"
+	"k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	"k8s.io/ingress-gce/pkg/neg/readiness"
 	negsyncer "k8s.io/ingress-gce/pkg/neg/syncers"
 	podlabels "k8s.io/ingress-gce/pkg/neg/syncers/labels"
@@ -81,7 +82,7 @@ type syncerManager struct {
 	// key consists of service namespace, name and targetPort. Value is the corresponding syncer.
 	syncerMap map[negtypes.NegSyncerKey]negtypes.NegSyncer
 	// syncCollector collect sync related metrics
-	syncerMetrics *metrics.SyncerMetrics
+	syncerMetrics *metricscollector.SyncerMetrics
 
 	// reflector handles NEG readiness gate and conditions for pods in NEG.
 	reflector readiness.Reflector
@@ -126,7 +127,7 @@ func newSyncerManager(namer negtypes.NetworkEndpointGroupNamer,
 	endpointSliceLister cache.Indexer,
 	nodeLister cache.Indexer,
 	svcNegLister cache.Indexer,
-	syncerMetrics *metrics.SyncerMetrics,
+	syncerMetrics *metricscollector.SyncerMetrics,
 	enableNonGcpMode bool,
 	enableDualStackNEG bool,
 	numGCWorkers int,

diff --git a/pkg/neg/manager_test.go b/pkg/neg/manager_test.go
@@ -42,7 +42,7 @@ import (
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/record"
 	negv1beta1 "k8s.io/ingress-gce/pkg/apis/svcneg/v1beta1"
-	"k8s.io/ingress-gce/pkg/neg/metrics"
+	"k8s.io/ingress-gce/pkg/neg/metrics/metricscollector"
 	"k8s.io/ingress-gce/pkg/neg/syncers/labels"
 	"k8s.io/ingress-gce/pkg/neg/types"
 	negtypes "k8s.io/ingress-gce/pkg/neg/types"
@@ -92,7 +92,7 @@ func NewTestSyncerManager(kubeClient kubernetes.Interface) (*syncerManager, *gce
 		testContext.EndpointSliceInformer.GetIndexer(),
 		testContext.NodeInformer.GetIndexer(),
 		testContext.SvcNegInformer.GetIndexer(),
-		metrics.FakeSyncerMetrics(),
+		metricscollector.FakeSyncerMetrics(),
 		false, //enableNonGcpMode
 		testContext.EnableDualStackNEG,
 		testContext.NumGCWorkers,

diff --git a/pkg/neg/metrics/endpoint_metrics.go b/pkg/neg/metrics/endpoint_metrics.go
diff --git a/pkg/neg/metrics/label_propagation_metrics.go b/pkg/neg/metrics/label_propagation_metrics.go