From 44f1c4dd94d03181f58a463d30b301e6b33e1098 Mon Sep 17 00:00:00 2001
From: Han Kang <hankang@google.com>
Date: Thu, 29 Jun 2023 12:27:55 -0700
Subject: [PATCH] fix duplicate metrics issue

---
 test/instrumentation/error.go                 |  2 +-
 test/instrumentation/main.go                  |  9 ++++++--
 .../testdata/pkg/kubelet/metrics/metrics.go   | 23 +++++++++++++++++++
 .../testdata/stable-metrics-list.yaml         | 17 --------------
 .../testdata/test-stable-metrics-list.yaml    | 17 ++++++++++++++
 5 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/test/instrumentation/error.go b/test/instrumentation/error.go
index b7e628358d7..0443f4bfefb 100644
--- a/test/instrumentation/error.go
+++ b/test/instrumentation/error.go
@@ -25,7 +25,7 @@ import (
 const (
 	errNotDirectCall                = "Opts for STABLE metric was not directly passed to new metric function"
 	errPositionalArguments          = "Positional arguments are not supported"
-	errStabilityLevel               = "StabilityLevel should be passed STABLE, ALPHA or removed"
+	errStabilityLevel               = "StabilityLevel should be passed STABLE, BETA, ALPHA or removed"
 	errInvalidNewMetricCall         = "Invalid new metric call, please ensure code compiles"
 	errNonStringAttribute           = "Non string attribute is not supported"
 	errBadVariableAttribute         = "Metric attribute was not correctly set. Please use only global consts in same file"
diff --git a/test/instrumentation/main.go b/test/instrumentation/main.go
index 451023cc21a..3cd12bb1a93 100644
--- a/test/instrumentation/main.go
+++ b/test/instrumentation/main.go
@@ -55,7 +55,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "USAGE: %s <DIR or FILE or '-'> [...]\n", os.Args[0])
 		os.Exit(64)
 	}
-
+	stableMetricNames := map[string]struct{}{}
 	stableMetrics := []metric{}
 	errors := []error{}
 
@@ -66,7 +66,12 @@ func main() {
 			continue
 		}
 		ms, es := searchPathForStableMetrics(arg)
-		stableMetrics = append(stableMetrics, ms...)
+		for _, m := range ms {
+			if _, ok := stableMetricNames[m.Name]; !ok {
+				stableMetrics = append(stableMetrics, m)
+			}
+			stableMetricNames[m.Name] = struct{}{}
+		}
 		errors = append(errors, es...)
 	}
 	if addStdin {
diff --git a/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go b/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go
index 8e87f70030a..0d87bdccaad 100644
--- a/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go
+++ b/test/instrumentation/testdata/pkg/kubelet/metrics/metrics.go
@@ -132,6 +132,27 @@ var (
 		},
 		testLabels,
 	)
+	// healthcheck is a Prometheus Gauge metrics used for recording the results of a k8s healthcheck.
+	healthcheck = metrics.NewGaugeVec(
+		&metrics.GaugeOpts{
+			Namespace:      "kubernetes",
+			Name:           "healthcheck",
+			Help:           "This metric records the result of a single healthcheck.",
+			StabilityLevel: metrics.BETA,
+		},
+		[]string{"name", "type"},
+	)
+
+	// healthchecksTotal is a Prometheus Counter metrics used for counting the results of a k8s healthcheck.
+	healthchecksTotal = metrics.NewCounterVec(
+		&metrics.CounterOpts{
+			Namespace:      "kubernetes",
+			Name:           "healthchecks_total",
+			Help:           "This metric records the results of all healthcheck.",
+			StabilityLevel: metrics.BETA,
+		},
+		[]string{"name", "type", "status"},
+	)
 	// PodWorkerDuration is a Histogram that tracks the duration (in seconds) in takes to sync a single pod.
 	// Broken down by the operation type.
 	SummaryMaxAge = metrics.NewSummary(
@@ -567,6 +588,8 @@ func Register(collectors ...metrics.StableCollector) {
 		legacyregistry.MustRegister(NodeName)
 		legacyregistry.MustRegister(PodWorkerDuration)
 		legacyregistry.MustRegister(PodStartDuration)
+		legacyregistry.MustRegister(healthcheck)
+		legacyregistry.MustRegister(healthchecksTotal)
 		legacyregistry.MustRegister(CgroupManagerDuration)
 		legacyregistry.MustRegister(PodWorkerStartDuration)
 		legacyregistry.MustRegister(ContainersPerPodCount)
diff --git a/test/instrumentation/testdata/stable-metrics-list.yaml b/test/instrumentation/testdata/stable-metrics-list.yaml
index 13d3c70da62..29716399727 100644
--- a/test/instrumentation/testdata/stable-metrics-list.yaml
+++ b/test/instrumentation/testdata/stable-metrics-list.yaml
@@ -417,23 +417,6 @@
   labels:
   - name
   - type
-- name: healthcheck
-  namespace: kubernetes
-  help: This metric records the result of a single healthcheck.
-  type: Gauge
-  stabilityLevel: BETA
-  labels:
-  - name
-  - type
-- name: healthchecks_total
-  namespace: kubernetes
-  help: This metric records the results of all healthcheck.
-  type: Counter
-  stabilityLevel: BETA
-  labels:
-  - name
-  - status
-  - type
 - name: healthchecks_total
   namespace: kubernetes
   help: This metric records the results of all healthcheck.
diff --git a/test/instrumentation/testdata/test-stable-metrics-list.yaml b/test/instrumentation/testdata/test-stable-metrics-list.yaml
index 4b6453d943f..4fc74a5849f 100644
--- a/test/instrumentation/testdata/test-stable-metrics-list.yaml
+++ b/test/instrumentation/testdata/test-stable-metrics-list.yaml
@@ -192,6 +192,23 @@
   labels:
   - namespace
   - persistentvolumeclaim
+- name: healthcheck
+  namespace: kubernetes
+  help: This metric records the result of a single healthcheck.
+  type: Gauge
+  stabilityLevel: BETA
+  labels:
+  - name
+  - type
+- name: healthchecks_total
+  namespace: kubernetes
+  help: This metric records the results of all healthcheck.
+  type: Counter
+  stabilityLevel: BETA
+  labels:
+  - name
+  - status
+  - type
 - name: priority_level_seat_utilization
   subsystem: subsystem
   namespace: namespace