Merge pull request #83828 from SataQiu/cleanup-component-base-20191012

Clean up for component-base/metrics

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) {

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) {

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) {

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 (

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"
 )
 
 /*

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

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(

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"
 )
 

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) {

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 (

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) {

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"
 )