From 51f3d7784427dfb0e26d9d803856c8cdad084b7a Mon Sep 17 00:00:00 2001
From: danielqsj <qsj.daniel@gmail.com>
Date: Mon, 15 Apr 2019 16:18:01 +0800
Subject: [PATCH] clean SinceInMicroseconds, convert to SinceInSeconds

Kubernetes-commit: ab182552b485ceed96c3b05d284ae9480377daf8
---
 util/workqueue/metrics.go      | 11 ++---------
 util/workqueue/metrics_test.go | 16 ----------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/util/workqueue/metrics.go b/util/workqueue/metrics.go
index a3911bf2..556e6432 100644
--- a/util/workqueue/metrics.go
+++ b/util/workqueue/metrics.go
@@ -131,16 +131,14 @@ func (m *defaultQueueMetrics) updateUnfinishedWork() {
 	var total float64
 	var oldest float64
 	for _, t := range m.processingStartTimes {
-		age := m.sinceInMicroseconds(t)
+		age := m.sinceInSeconds(t)
 		total += age
 		if age > oldest {
 			oldest = age
 		}
 	}
-	// Convert to seconds; microseconds is unhelpfully granular for this.
-	total /= 1000000
 	m.unfinishedWorkSeconds.Set(total)
-	m.longestRunningProcessor.Set(oldest / 1000000)
+	m.longestRunningProcessor.Set(oldest)
 }
 
 type noMetrics struct{}
@@ -150,11 +148,6 @@ func (noMetrics) get(item t)            {}
 func (noMetrics) done(item t)           {}
 func (noMetrics) updateUnfinishedWork() {}
 
-// Gets the time since the specified start in microseconds.
-func (m *defaultQueueMetrics) sinceInMicroseconds(start time.Time) float64 {
-	return float64(m.clock.Since(start).Nanoseconds() / time.Microsecond.Nanoseconds())
-}
-
 // Gets the time since the specified start in seconds.
 func (m *defaultQueueMetrics) sinceInSeconds(start time.Time) float64 {
 	return m.clock.Since(start).Seconds()
diff --git a/util/workqueue/metrics_test.go b/util/workqueue/metrics_test.go
index d1178285..4848f68f 100644
--- a/util/workqueue/metrics_test.go
+++ b/util/workqueue/metrics_test.go
@@ -167,22 +167,6 @@ func (m *testMetricsProvider) NewRetriesMetric(name string) CounterMetric {
 	return &m.retries
 }
 
-func TestSinceInMicroseconds(t *testing.T) {
-	mp := testMetricsProvider{}
-	c := clock.NewFakeClock(time.Now())
-	mf := queueMetricsFactory{metricsProvider: &mp}
-	m := mf.newQueueMetrics("test", c)
-	dqm := m.(*defaultQueueMetrics)
-
-	for _, i := range []int{1, 50, 100, 500, 1000, 10000, 100000, 1000000} {
-		n := c.Now()
-		c.Step(time.Duration(i) * time.Microsecond)
-		if e, a := float64(i), dqm.sinceInMicroseconds(n); e != a {
-			t.Errorf("Expected %v, got %v", e, a)
-		}
-	}
-}
-
 func TestMetrics(t *testing.T) {
 	mp := testMetricsProvider{}
 	t0 := time.Unix(0, 0)