fix(metric): Missed update

microsoft · Nov 21, 2024 · 703a51f · 703a51f
1 parent ed76032
commit 703a51f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -46,11 +46,7 @@ func InitializeMetrics() {
 		hnsStatsDescription,
 		utils.Direction,
 	)
-<<<<<<< HEAD
 	VFPStatsGauge = exporter.CreatePrometheusGaugeVecForMetric(
-=======
-	VFPStatsGauge = exporter.CreatePrometheusCounterVecForMetric(
->>>>>>> 0737c12a56078040b985501e588bf11a5e659090
 		exporter.DefaultRegistry,
 		vfpStats,
 		vfpStatsDescription,

diff --git a/pkg/metrics/types.go b/pkg/metrics/types.go
@@ -60,11 +60,7 @@ var (
 
 	// Windows
 	HNSStatsGauge GaugeVec
-<<<<<<< HEAD
 	VFPStatsGauge GaugeVec
-=======
-	VFPStatsGauge CounterVec
->>>>>>> 0737c12a56078040b985501e588bf11a5e659090
 
 	// Common gauges across os distributions
 	NodeConnectivityStatusGauge  GaugeVec