pkg/util/workqueue: delete deprecated metrics

This deletes deprecated metrics and simplifies registration.

Kubernetes-commit: 4532cfd85c00da6f64e03fcf05f5636adc1151c7

util/workqueue/delaying_queue.go

@@ -44,13 +44,12 @@ func NewNamedDelayingQueue(name string) DelayingInterface {
 
 func newDelayingQueue(clock clock.Clock, name string) DelayingInterface {
 	ret := &delayingType{
-		Interface:         NewNamed(name),
-		clock:             clock,
-		heartbeat:         clock.NewTicker(maxWait),
-		stopCh:            make(chan struct{}),
-		waitingForAddCh:   make(chan *waitFor, 1000),
-		metrics:           newRetryMetrics(name),
-		deprecatedMetrics: newDeprecatedRetryMetrics(name),
+		Interface:       NewNamed(name),
+		clock:           clock,
+		heartbeat:       clock.NewTicker(maxWait),
+		stopCh:          make(chan struct{}),
+		waitingForAddCh: make(chan *waitFor, 1000),
+		metrics:         newRetryMetrics(name),
 	}
 
 	go ret.waitingLoop()
@@ -77,8 +76,7 @@ type delayingType struct {
 	waitingForAddCh chan *waitFor
 
 	// metrics counts the number of retries
-	metrics           retryMetrics
-	deprecatedMetrics retryMetrics
+	metrics retryMetrics
 }
 
 // waitFor holds the data to add and the time it should be added
@@ -154,7 +152,6 @@ func (q *delayingType) AddAfter(item interface{}, duration time.Duration) {
 	}
 
 	q.metrics.retry()
-	q.deprecatedMetrics.retry()
 
 	// immediately add things with no delay
 	if duration <= 0 {