From 4b61cf22d4fca0bc38b489e8485dc3f97d84a99a Mon Sep 17 00:00:00 2001 From: SataQiu Date: Sat, 12 Oct 2019 15:58:13 +0800 Subject: [PATCH] clean up for component-base/metrics --- staging/src/k8s.io/component-base/metrics/counter_test.go | 4 +++- staging/src/k8s.io/component-base/metrics/gauge_test.go | 6 ++++-- .../src/k8s.io/component-base/metrics/histogram_test.go | 4 +++- .../component-base/metrics/legacyregistry/registry.go | 4 +++- staging/src/k8s.io/component-base/metrics/metric.go | 4 +++- staging/src/k8s.io/component-base/metrics/opts.go | 3 ++- .../src/k8s.io/component-base/metrics/processstarttime.go | 8 +++++--- .../src/k8s.io/component-base/metrics/registry_test.go | 1 + staging/src/k8s.io/component-base/metrics/summary_test.go | 6 ++++-- .../src/k8s.io/component-base/metrics/version_parser.go | 6 ++++-- .../k8s.io/component-base/metrics/version_parser_test.go | 3 ++- staging/src/k8s.io/component-base/metrics/wrappers.go | 1 - 12 files changed, 34 insertions(+), 16 deletions(-) diff --git a/staging/src/k8s.io/component-base/metrics/counter_test.go b/staging/src/k8s.io/component-base/metrics/counter_test.go index c1d1a22e56c..b12a86292b4 100644 --- a/staging/src/k8s.io/component-base/metrics/counter_test.go +++ b/staging/src/k8s.io/component-base/metrics/counter_test.go @@ -18,10 +18,12 @@ package metrics import ( "bytes" + "testing" + "github.com/blang/semver" "github.com/prometheus/common/expfmt" + apimachineryversion "k8s.io/apimachinery/pkg/version" - "testing" ) func TestCounter(t *testing.T) { diff --git a/staging/src/k8s.io/component-base/metrics/gauge_test.go b/staging/src/k8s.io/component-base/metrics/gauge_test.go index ada349ac979..5af78823373 100644 --- a/staging/src/k8s.io/component-base/metrics/gauge_test.go +++ b/staging/src/k8s.io/component-base/metrics/gauge_test.go @@ -17,9 +17,11 @@ limitations under the License. package metrics import ( - "github.com/blang/semver" - apimachineryversion "k8s.io/apimachinery/pkg/version" "testing" + + "github.com/blang/semver" + + apimachineryversion "k8s.io/apimachinery/pkg/version" ) func TestGauge(t *testing.T) { diff --git a/staging/src/k8s.io/component-base/metrics/histogram_test.go b/staging/src/k8s.io/component-base/metrics/histogram_test.go index 895178b9a71..c0aa58208c7 100644 --- a/staging/src/k8s.io/component-base/metrics/histogram_test.go +++ b/staging/src/k8s.io/component-base/metrics/histogram_test.go @@ -17,10 +17,12 @@ limitations under the License. package metrics import ( + "testing" + "github.com/blang/semver" "github.com/prometheus/client_golang/prometheus" + apimachineryversion "k8s.io/apimachinery/pkg/version" - "testing" ) func TestHistogram(t *testing.T) { diff --git a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go index fb963ad3200..54146bebff2 100644 --- a/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go +++ b/staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go @@ -17,10 +17,12 @@ limitations under the License. package legacyregistry import ( + "net/http" + "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "k8s.io/component-base/metrics" - "net/http" ) var ( diff --git a/staging/src/k8s.io/component-base/metrics/metric.go b/staging/src/k8s.io/component-base/metrics/metric.go index 0337829e911..ea00bcf9a8b 100644 --- a/staging/src/k8s.io/component-base/metrics/metric.go +++ b/staging/src/k8s.io/component-base/metrics/metric.go @@ -17,11 +17,13 @@ limitations under the License. package metrics import ( + "sync" + "github.com/blang/semver" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" + "k8s.io/klog" - "sync" ) /* diff --git a/staging/src/k8s.io/component-base/metrics/opts.go b/staging/src/k8s.io/component-base/metrics/opts.go index 0b5e2c381c3..fcc20e42ac4 100644 --- a/staging/src/k8s.io/component-base/metrics/opts.go +++ b/staging/src/k8s.io/component-base/metrics/opts.go @@ -18,9 +18,10 @@ package metrics import ( "fmt" - "github.com/prometheus/client_golang/prometheus" "sync" "time" + + "github.com/prometheus/client_golang/prometheus" ) // KubeOpts is superset struct for prometheus.Opts. The prometheus Opts structure diff --git a/staging/src/k8s.io/component-base/metrics/processstarttime.go b/staging/src/k8s.io/component-base/metrics/processstarttime.go index 70912798532..56c5a36d63e 100644 --- a/staging/src/k8s.io/component-base/metrics/processstarttime.go +++ b/staging/src/k8s.io/component-base/metrics/processstarttime.go @@ -17,11 +17,13 @@ limitations under the License. package metrics import ( - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/procfs" - "k8s.io/klog" "os" "time" + + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/procfs" + + "k8s.io/klog" ) var processStartTime = prometheus.NewGaugeVec( diff --git a/staging/src/k8s.io/component-base/metrics/registry_test.go b/staging/src/k8s.io/component-base/metrics/registry_test.go index 1b7ea08f605..39f17f542f9 100644 --- a/staging/src/k8s.io/component-base/metrics/registry_test.go +++ b/staging/src/k8s.io/component-base/metrics/registry_test.go @@ -22,6 +22,7 @@ import ( "github.com/blang/semver" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" + apimachineryversion "k8s.io/apimachinery/pkg/version" ) diff --git a/staging/src/k8s.io/component-base/metrics/summary_test.go b/staging/src/k8s.io/component-base/metrics/summary_test.go index 2facd2e446d..1bed2d317e9 100644 --- a/staging/src/k8s.io/component-base/metrics/summary_test.go +++ b/staging/src/k8s.io/component-base/metrics/summary_test.go @@ -17,9 +17,11 @@ limitations under the License. package metrics import ( - "github.com/blang/semver" - apimachineryversion "k8s.io/apimachinery/pkg/version" "testing" + + "github.com/blang/semver" + + apimachineryversion "k8s.io/apimachinery/pkg/version" ) func TestSummary(t *testing.T) { diff --git a/staging/src/k8s.io/component-base/metrics/version_parser.go b/staging/src/k8s.io/component-base/metrics/version_parser.go index d2f7aee437c..d52bd74bdfd 100644 --- a/staging/src/k8s.io/component-base/metrics/version_parser.go +++ b/staging/src/k8s.io/component-base/metrics/version_parser.go @@ -18,9 +18,11 @@ package metrics import ( "fmt" - "github.com/blang/semver" - apimachineryversion "k8s.io/apimachinery/pkg/version" "regexp" + + "github.com/blang/semver" + + apimachineryversion "k8s.io/apimachinery/pkg/version" ) const ( diff --git a/staging/src/k8s.io/component-base/metrics/version_parser_test.go b/staging/src/k8s.io/component-base/metrics/version_parser_test.go index 735053c1126..1c9a8ab27db 100644 --- a/staging/src/k8s.io/component-base/metrics/version_parser_test.go +++ b/staging/src/k8s.io/component-base/metrics/version_parser_test.go @@ -17,8 +17,9 @@ limitations under the License. package metrics import ( - apimachineryversion "k8s.io/apimachinery/pkg/version" "testing" + + apimachineryversion "k8s.io/apimachinery/pkg/version" ) func TestVersionParsing(t *testing.T) { diff --git a/staging/src/k8s.io/component-base/metrics/wrappers.go b/staging/src/k8s.io/component-base/metrics/wrappers.go index f41dacd1169..c860cb0af30 100644 --- a/staging/src/k8s.io/component-base/metrics/wrappers.go +++ b/staging/src/k8s.io/component-base/metrics/wrappers.go @@ -18,7 +18,6 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - dto "github.com/prometheus/client_model/go" )