chore: Drop custom workqueue metrics provider (#1607)

kubernetes-sigs · Aug 29, 2024 · ee2f7d5 · ee2f7d5
1 parent 9df2d5f
commit ee2f7d5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 126 deletions.
diff --git a/pkg/controllers/disruption/orchestration/queue.go b/pkg/controllers/disruption/orchestration/queue.go
@@ -129,8 +129,7 @@ func NewQueue(kubeClient client.Client, recorder events.Recorder, cluster *state
 		RateLimitingInterface: workqueue.NewRateLimitingQueueWithConfig(
 			workqueue.NewItemExponentialFailureRateLimiter(queueBaseDelay, queueMaxDelay),
 			workqueue.RateLimitingQueueConfig{
-				Name:            "disruption.workqueue",
-				MetricsProvider: metrics.WorkqueueMetricsProvider{},
+				Name: "disruption.workqueue",
 			}),
 		providerIDToCommand: map[string]*Command{},
 		kubeClient:          kubeClient,

diff --git a/pkg/controllers/node/termination/suite_test.go b/pkg/controllers/node/termination/suite_test.go
@@ -861,13 +861,13 @@ var _ = Describe("Termination", func() {
 			}})
 			ExpectApplied(ctx, env.Client, lo.Map(pods, func(p *corev1.Pod, _ int) client.Object { return p })...)
 
-			wqDepthBefore, _ := FindMetricWithLabelValues("karpenter_workqueue_depth", map[string]string{"name": "eviction.workqueue"})
+			wqDepthBefore, _ := FindMetricWithLabelValues("workqueue_adds_total", map[string]string{"name": "eviction.workqueue"})
 			Expect(env.Client.Delete(ctx, node)).To(Succeed())
 			node = ExpectNodeExists(ctx, env.Client, node.Name)
 			ExpectObjectReconciled(ctx, env.Client, terminationController, node)
-			wqDepthAfter, ok := FindMetricWithLabelValues("karpenter_workqueue_depth", map[string]string{"name": "eviction.workqueue"})
+			wqDepthAfter, ok := FindMetricWithLabelValues("workqueue_adds_total", map[string]string{"name": "eviction.workqueue"})
 			Expect(ok).To(BeTrue())
-			Expect(lo.FromPtr(wqDepthAfter.GetGauge().Value) - lo.FromPtr(wqDepthBefore.GetGauge().Value)).To(BeNumerically("==", 5))
+			Expect(lo.FromPtr(wqDepthAfter.GetCounter().Value) - lo.FromPtr(wqDepthBefore.GetCounter().Value)).To(BeNumerically("==", 5))
 		})
 	})
 })

diff --git a/pkg/controllers/node/termination/terminator/eviction.go b/pkg/controllers/node/termination/terminator/eviction.go
@@ -23,8 +23,6 @@ import (
 	"sync"
 	"time"
 
-	"sigs.k8s.io/karpenter/pkg/metrics"
-
 	"github.com/awslabs/operatorpkg/singleton"
 	"github.com/samber/lo"
 	corev1 "k8s.io/api/core/v1"
@@ -95,8 +93,7 @@ func NewQueue(kubeClient client.Client, recorder events.Recorder) *Queue {
 		RateLimitingInterface: workqueue.NewRateLimitingQueueWithConfig(
 			workqueue.NewItemExponentialFailureRateLimiter(evictionQueueBaseDelay, evictionQueueMaxDelay),
 			workqueue.RateLimitingQueueConfig{
-				Name:            "eviction.workqueue",
-				MetricsProvider: metrics.WorkqueueMetricsProvider{},
+				Name: "eviction.workqueue",
 			}),
 		set:        sets.New[QueueKey](),
 		kubeClient: kubeClient,
@@ -206,8 +203,7 @@ func (q *Queue) Reset() {
 	q.RateLimitingInterface = workqueue.NewRateLimitingQueueWithConfig(
 		workqueue.NewItemExponentialFailureRateLimiter(evictionQueueBaseDelay, evictionQueueMaxDelay),
 		workqueue.RateLimitingQueueConfig{
-			Name:            "eviction.workqueue",
-			MetricsProvider: metrics.WorkqueueMetricsProvider{},
+			Name: "eviction.workqueue",
 		})
 	q.set = sets.New[QueueKey]()
 }
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -93,5 +93,5 @@ var (
 
 func init() {
 	crmetrics.Registry.MustRegister(NodeClaimsCreatedTotal, NodeClaimsTerminatedTotal, NodeClaimsDisruptedTotal,
-		NodesCreatedTotal, NodesTerminatedTotal, workqueueDepth, workqueueAdds, workqueueLatency, workDuration, workqueueUnfinished, workqueueLongestRunningProcessor, workqueueRetries)
+		NodesCreatedTotal, NodesTerminatedTotal)
 }
diff --git a/pkg/metrics/workqueue_provider.go b/pkg/metrics/workqueue_provider.go