9 files changed, 10 insertions, 18 deletions
diff --git a/plugin/proxy/dns.go b/plugin/proxy/dns.go
index f555b0d29..04245ec46 100644
--- a/plugin/proxy/dns.go
+++ b/plugin/proxy/dns.go
@@ -1,13 +1,12 @@
 package proxy
 
 import (
+	"context"
 	"net"
 	"time"
 
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/proxy/dnstap.go b/plugin/proxy/dnstap.go
index 8611c8254..4e5a8bd40 100644
--- a/plugin/proxy/dnstap.go
+++ b/plugin/proxy/dnstap.go
@@ -1,14 +1,13 @@
 package proxy
 
 import (
+	"context"
 	"time"
 
 	"github.com/coredns/coredns/plugin/dnstap"
 	"github.com/coredns/coredns/plugin/dnstap/msg"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )
diff --git a/plugin/proxy/dnstap_test.go b/plugin/proxy/dnstap_test.go
index ffee1d470..b31ed451b 100644
--- a/plugin/proxy/dnstap_test.go
+++ b/plugin/proxy/dnstap_test.go
@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"testing"
 	"time"
 
@@ -9,8 +10,6 @@ import (
 	mwtest "github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	tap "github.com/dnstap/golang-dnstap"
 	"github.com/miekg/dns"
 )
diff --git a/plugin/proxy/exchanger.go b/plugin/proxy/exchanger.go
index c0d4f7227..e96dac5a4 100644
--- a/plugin/proxy/exchanger.go
+++ b/plugin/proxy/exchanger.go
@@ -1,10 +1,10 @@
 package proxy
 
 import (
-	"github.com/coredns/coredns/request"
-
 	"context"
 
+	"github.com/coredns/coredns/request"
+
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/proxy/google.go b/plugin/proxy/google.go
index 85591061e..9fc824092 100644
--- a/plugin/proxy/google.go
+++ b/plugin/proxy/google.go
@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
@@ -14,8 +15,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/log"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/proxy/grpc.go b/plugin/proxy/grpc.go
index 8b596c89a..905fa729d 100644
--- a/plugin/proxy/grpc.go
+++ b/plugin/proxy/grpc.go
@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/trace"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/miekg/dns"
 	opentracing "github.com/opentracing/opentracing-go"
diff --git a/plugin/proxy/grpc_test.go b/plugin/proxy/grpc_test.go
index 1deee60ab..976ac3299 100644
--- a/plugin/proxy/grpc_test.go
+++ b/plugin/proxy/grpc_test.go
@@ -1,6 +1,7 @@
 package proxy
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
@@ -9,8 +10,6 @@ import (
 	"github.com/coredns/coredns/plugin/test"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	"google.golang.org/grpc/grpclog"
 )
diff --git a/plugin/proxy/lookup.go b/plugin/proxy/lookup.go
index bd4952bdd..44bee4b0e 100644
--- a/plugin/proxy/lookup.go
+++ b/plugin/proxy/lookup.go
@@ -3,6 +3,7 @@ package proxy
 // functions other plugin might want to use to do lookup in the same style as the proxy.
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"sync/atomic"
@@ -11,8 +12,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/healthcheck"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 )
 
diff --git a/plugin/proxy/proxy.go b/plugin/proxy/proxy.go
index 042ac0578..5aeaa2a54 100644
--- a/plugin/proxy/proxy.go
+++ b/plugin/proxy/proxy.go
@@ -2,6 +2,7 @@
 package proxy
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"net"
@@ -13,8 +14,6 @@ import (
 	"github.com/coredns/coredns/plugin/pkg/healthcheck"
 	"github.com/coredns/coredns/request"
 
-	"context"
-
 	"github.com/miekg/dns"
 	ot "github.com/opentracing/opentracing-go"
 )