diff --git a/client/keys.go b/client/keys.go
index f88f5b559e0..22874624183 100644
--- a/client/keys.go
+++ b/client/keys.go
@@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"go.etcd.io/etcd/pkg/pathutil"
 	"github.com/ugorji/go/codec"
+	"go.etcd.io/etcd/pkg/pathutil"
 )
 
 const (
diff --git a/clientv3/client.go b/clientv3/client.go
index 3adb190c799..57af96c2aec 100644
--- a/clientv3/client.go
+++ b/clientv3/client.go
@@ -27,11 +27,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils"
 	"go.etcd.io/etcd/clientv3/balancer"
 	"go.etcd.io/etcd/clientv3/balancer/picker"
 	"go.etcd.io/etcd/clientv3/balancer/resolver/endpoint"
 	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
-	"github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils"
 	"go.uber.org/zap"
 
 	"google.golang.org/grpc"
diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go
index 20349b4cdbc..f8ebe44e4ac 100644
--- a/clientv3/retry_interceptor.go
+++ b/clientv3/retry_interceptor.go
@@ -23,8 +23,8 @@ import (
 	"sync"
 	"time"
 
-	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/grpc-ecosystem/go-grpc-middleware/util/backoffutils"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
diff --git a/etcdctl/ctlv2/command/auth_commands.go b/etcdctl/ctlv2/command/auth_commands.go
index 6a2bc7bce4a..75823b203d3 100644
--- a/etcdctl/ctlv2/command/auth_commands.go
+++ b/etcdctl/ctlv2/command/auth_commands.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"strings"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 func NewAuthCommands() cli.Command {
diff --git a/etcdctl/ctlv2/command/error.go b/etcdctl/ctlv2/command/error.go
index 0a2f219d878..ca4f1e9b8be 100644
--- a/etcdctl/ctlv2/command/error.go
+++ b/etcdctl/ctlv2/command/error.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 const (
diff --git a/etcdctl/ctlv2/command/get_command.go b/etcdctl/ctlv2/command/get_command.go
index 97d24e2d108..fa87498ce6e 100644
--- a/etcdctl/ctlv2/command/get_command.go
+++ b/etcdctl/ctlv2/command/get_command.go
@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"os"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewGetCommand returns the CLI command for "get".
diff --git a/etcdctl/ctlv2/command/ls_command.go b/etcdctl/ctlv2/command/ls_command.go
index 73ce94aea83..f81bcbf8a46 100644
--- a/etcdctl/ctlv2/command/ls_command.go
+++ b/etcdctl/ctlv2/command/ls_command.go
@@ -17,8 +17,8 @@ package command
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 func NewLsCommand() cli.Command {
diff --git a/etcdctl/ctlv2/command/mk_command.go b/etcdctl/ctlv2/command/mk_command.go
index b31fb59b1ed..74d21c9f704 100644
--- a/etcdctl/ctlv2/command/mk_command.go
+++ b/etcdctl/ctlv2/command/mk_command.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewMakeCommand returns the CLI command for "mk".
diff --git a/etcdctl/ctlv2/command/mkdir_command.go b/etcdctl/ctlv2/command/mkdir_command.go
index 1839f298156..04178a025a0 100644
--- a/etcdctl/ctlv2/command/mkdir_command.go
+++ b/etcdctl/ctlv2/command/mkdir_command.go
@@ -18,8 +18,8 @@ import (
 	"errors"
 	"time"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewMakeDirCommand returns the CLI command for "mkdir".
diff --git a/etcdctl/ctlv2/command/rm_command.go b/etcdctl/ctlv2/command/rm_command.go
index 81c973c6fda..86ade29f08e 100644
--- a/etcdctl/ctlv2/command/rm_command.go
+++ b/etcdctl/ctlv2/command/rm_command.go
@@ -17,8 +17,8 @@ package command
 import (
 	"errors"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewRemoveCommand returns the CLI command for "rm".
diff --git a/etcdctl/ctlv2/command/role_commands.go b/etcdctl/ctlv2/command/role_commands.go
index 765ecfeb311..0a008a9e59c 100644
--- a/etcdctl/ctlv2/command/role_commands.go
+++ b/etcdctl/ctlv2/command/role_commands.go
@@ -20,9 +20,9 @@ import (
 	"reflect"
 	"strings"
 
+	"github.com/urfave/cli"
 	"go.etcd.io/etcd/client"
 	"go.etcd.io/etcd/pkg/pathutil"
-	"github.com/urfave/cli"
 )
 
 func NewRoleCommands() cli.Command {
diff --git a/etcdctl/ctlv2/command/set_command.go b/etcdctl/ctlv2/command/set_command.go
index 7ee8e1ab26f..7eb5ae6a507 100644
--- a/etcdctl/ctlv2/command/set_command.go
+++ b/etcdctl/ctlv2/command/set_command.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewSetCommand returns the CLI command for "set".
diff --git a/etcdctl/ctlv2/command/set_dir_command.go b/etcdctl/ctlv2/command/set_dir_command.go
index a0e1758c03e..a65f9223077 100644
--- a/etcdctl/ctlv2/command/set_dir_command.go
+++ b/etcdctl/ctlv2/command/set_dir_command.go
@@ -15,8 +15,8 @@
 package command
 
 import (
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewSetDirCommand returns the CLI command for "setDir".
diff --git a/etcdctl/ctlv2/command/update_command.go b/etcdctl/ctlv2/command/update_command.go
index 5907576a942..7c20fcb88b1 100644
--- a/etcdctl/ctlv2/command/update_command.go
+++ b/etcdctl/ctlv2/command/update_command.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"time"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewUpdateCommand returns the CLI command for "update".
diff --git a/etcdctl/ctlv2/command/update_dir_command.go b/etcdctl/ctlv2/command/update_dir_command.go
index 307fd1a0449..3783d919d80 100644
--- a/etcdctl/ctlv2/command/update_dir_command.go
+++ b/etcdctl/ctlv2/command/update_dir_command.go
@@ -18,8 +18,8 @@ import (
 	"errors"
 	"time"
 
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 // NewUpdateDirCommand returns the CLI command for "updatedir".
diff --git a/etcdctl/ctlv2/command/user_commands.go b/etcdctl/ctlv2/command/user_commands.go
index 9e7577b32ae..73ebb4d5045 100644
--- a/etcdctl/ctlv2/command/user_commands.go
+++ b/etcdctl/ctlv2/command/user_commands.go
@@ -20,8 +20,8 @@ import (
 	"strings"
 
 	"github.com/bgentry/speakeasy"
-	"go.etcd.io/etcd/client"
 	"github.com/urfave/cli"
+	"go.etcd.io/etcd/client"
 )
 
 func NewUserCommands() cli.Command {
diff --git a/etcdctl/ctlv3/command/alarm_command.go b/etcdctl/ctlv3/command/alarm_command.go
index 2d7cba1c75d..42b85bb2945 100644
--- a/etcdctl/ctlv3/command/alarm_command.go
+++ b/etcdctl/ctlv3/command/alarm_command.go
@@ -17,8 +17,8 @@ package command
 import (
 	"fmt"
 
-	v3 "go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	v3 "go.etcd.io/etcd/clientv3"
 )
 
 // NewAlarmCommand returns the cobra command for "alarm".
diff --git a/etcdctl/ctlv3/command/auth_command.go b/etcdctl/ctlv3/command/auth_command.go
index 31137e18f08..57025a052ce 100644
--- a/etcdctl/ctlv3/command/auth_command.go
+++ b/etcdctl/ctlv3/command/auth_command.go
@@ -17,8 +17,8 @@ package command
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 )
 
 // NewAuthCommand returns the cobra command for "auth".
diff --git a/etcdctl/ctlv3/command/defrag_command.go b/etcdctl/ctlv3/command/defrag_command.go
index cf59b064059..5bbb39dd74a 100644
--- a/etcdctl/ctlv3/command/defrag_command.go
+++ b/etcdctl/ctlv3/command/defrag_command.go
@@ -20,8 +20,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"go.etcd.io/etcd/mvcc/backend"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/mvcc/backend"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go
index 082cccc3023..19066a59422 100644
--- a/etcdctl/ctlv3/command/del_command.go
+++ b/etcdctl/ctlv3/command/del_command.go
@@ -17,8 +17,8 @@ package command
 import (
 	"fmt"
 
-	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/get_command.go b/etcdctl/ctlv3/command/get_command.go
index 63566bc3954..24bdaa9fb09 100644
--- a/etcdctl/ctlv3/command/get_command.go
+++ b/etcdctl/ctlv3/command/get_command.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strings"
 
-	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/move_leader_command.go b/etcdctl/ctlv3/command/move_leader_command.go
index a28448fe473..7c8010c962b 100644
--- a/etcdctl/ctlv3/command/move_leader_command.go
+++ b/etcdctl/ctlv3/command/move_leader_command.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 // NewMoveLeaderCommand returns the cobra command for "move-leader".
diff --git a/etcdctl/ctlv3/command/put_command.go b/etcdctl/ctlv3/command/put_command.go
index 09ba1d868af..0237dd38f6a 100644
--- a/etcdctl/ctlv3/command/put_command.go
+++ b/etcdctl/ctlv3/command/put_command.go
@@ -19,8 +19,8 @@ import (
 	"os"
 	"strconv"
 
-	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (
diff --git a/etcdctl/ctlv3/command/role_command.go b/etcdctl/ctlv3/command/role_command.go
index 5f4a4a84102..ff4ba02b333 100644
--- a/etcdctl/ctlv3/command/role_command.go
+++ b/etcdctl/ctlv3/command/role_command.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"fmt"
 
-	"go.etcd.io/etcd/clientv3"
 	"github.com/spf13/cobra"
+	"go.etcd.io/etcd/clientv3"
 )
 
 var (
diff --git a/etcdmain/config_test.go b/etcdmain/config_test.go
index ce0e4786f57..6c01184bee1 100644
--- a/etcdmain/config_test.go
+++ b/etcdmain/config_test.go
@@ -23,8 +23,8 @@ import (
 	"strings"
 	"testing"
 
-	"go.etcd.io/etcd/embed"
 	"github.com/ghodss/yaml"
+	"go.etcd.io/etcd/embed"
 )
 
 func TestConfigParsingMemberFlags(t *testing.T) {
diff --git a/etcdserver/api/etcdhttp/peer_test.go b/etcdserver/api/etcdhttp/peer_test.go
index b463eaff98c..095aa5da849 100644
--- a/etcdserver/api/etcdhttp/peer_test.go
+++ b/etcdserver/api/etcdhttp/peer_test.go
@@ -25,11 +25,11 @@ import (
 
 	"go.uber.org/zap"
 
+	"github.com/coreos/go-semver/semver"
 	"go.etcd.io/etcd/etcdserver/api/membership"
 	"go.etcd.io/etcd/etcdserver/api/rafthttp"
 	"go.etcd.io/etcd/pkg/testutil"
 	"go.etcd.io/etcd/pkg/types"
-	"github.com/coreos/go-semver/semver"
 )
 
 type fakeCluster struct {
diff --git a/etcdserver/api/membership/member.go b/etcdserver/api/membership/member.go
index 32085a7dd83..6a3e79305f2 100644
--- a/etcdserver/api/membership/member.go
+++ b/etcdserver/api/membership/member.go
@@ -22,8 +22,8 @@ import (
 	"sort"
 	"time"
 
-	"go.etcd.io/etcd/pkg/types"
 	"github.com/coreos/pkg/capnslog"
+	"go.etcd.io/etcd/pkg/types"
 )
 
 var (
diff --git a/etcdserver/api/v3rpc/interceptor.go b/etcdserver/api/v3rpc/interceptor.go
index 5f6e7b6ba28..aca4d3589f1 100644
--- a/etcdserver/api/v3rpc/interceptor.go
+++ b/etcdserver/api/v3rpc/interceptor.go
@@ -25,8 +25,8 @@ import (
 	"go.etcd.io/etcd/pkg/types"
 	"go.etcd.io/etcd/raft"
 
-	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"github.com/coreos/pkg/capnslog"
+	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
diff --git a/etcdserver/util.go b/etcdserver/util.go
index 7a781df9c1c..fe5024ef00d 100644
--- a/etcdserver/util.go
+++ b/etcdserver/util.go
@@ -20,11 +20,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/golang/protobuf/proto"
 	"go.etcd.io/etcd/etcdserver/api/membership"
 	"go.etcd.io/etcd/etcdserver/api/rafthttp"
 	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"go.etcd.io/etcd/pkg/types"
-	"github.com/golang/protobuf/proto"
 
 	"go.uber.org/zap"
 )
diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go
index 0b31d31452c..af369fe6992 100644
--- a/proxy/grpcproxy/cache/store.go
+++ b/proxy/grpcproxy/cache/store.go
@@ -20,10 +20,10 @@ import (
 	"errors"
 	"sync"
 
+	"github.com/golang/groupcache/lru"
 	"go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
 	pb "go.etcd.io/etcd/etcdserver/etcdserverpb"
 	"go.etcd.io/etcd/pkg/adt"
-	"github.com/golang/groupcache/lru"
 )
 
 var (
diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go
index d3d65829212..edbeaaa9723 100644
--- a/proxy/httpproxy/reverse.go
+++ b/proxy/httpproxy/reverse.go
@@ -27,8 +27,8 @@ import (
 	"sync/atomic"
 	"time"
 
-	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
 	"github.com/coreos/pkg/capnslog"
+	"go.etcd.io/etcd/etcdserver/api/v2http/httptypes"
 )
 
 var (