fix(metric): Fix merge conflicts

microsoft · Nov 21, 2024 · ed76032 · ed76032
2 parents f70c27e + 0737c12
commit ed76032
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -46,7 +46,11 @@ 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,7 +60,11 @@ var (
 
 	// Windows
 	HNSStatsGauge GaugeVec
+<<<<<<< HEAD
 	VFPStatsGauge GaugeVec
+=======
+	VFPStatsGauge CounterVec
+>>>>>>> 0737c12a56078040b985501e588bf11a5e659090
 
 	// Common gauges across os distributions
 	NodeConnectivityStatusGauge  GaugeVec