Fix compile with latest coredns

Signed-off-by: Miek Gieben <[email protected]>

Author: miekg

fuzz.go

@@ -3,9 +3,8 @@
 package proxy
 
 import (
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin/pkg/fuzz"
-
-	"github.com/caddyserver/caddy"
 )
 
 // Fuzz fuzzes proxy.

metrics.go

@@ -4,17 +4,18 @@ import (
 	"github.com/coredns/coredns/plugin"
 
 	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
 )
 
 // Metrics the proxy plugin exports.
 var (
-	RequestCount = prometheus.NewCounterVec(prometheus.CounterOpts{
+	RequestCount = promauto.NewCounterVec(prometheus.CounterOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "proxy",
 		Name:      "request_count_total",
 		Help:      "Counter of requests made per protocol, proxy protocol, family and upstream.",
 	}, []string{"server", "proto", "proxy_proto", "family", "to"})
-	RequestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{
+	RequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{
 		Namespace: plugin.Namespace,
 		Subsystem: "proxy",
 		Name:      "request_duration_seconds",

proxy_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/caddyserver/caddy/caddyfile"
+	"github.com/coredns/caddy/caddyfile"
 )
 
 func TestStop(t *testing.T) {

setup.go

@@ -1,12 +1,10 @@
 package proxy
 
 import (
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/core/dnsserver"
 	"github.com/coredns/coredns/plugin"
-	"github.com/coredns/coredns/plugin/metrics"
 	clog "github.com/coredns/coredns/plugin/pkg/log"
-
-	"github.com/caddyserver/caddy"
 )
 
 var log = clog.NewWithPlugin("proxy")
@@ -32,11 +30,6 @@ func setup(c *caddy.Controller) error {
 		return P
 	})
 
-	c.OnStartup(func() error {
-		metrics.MustRegister(c, RequestCount, RequestDuration)
-		return nil
-	})
-
 	for i := range upstreams {
 		u := upstreams[i]
 		c.OnStartup(func() error {

upstream.go

@@ -6,12 +6,12 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/coredns/caddy/caddyfile"
 	"github.com/coredns/coredns/plugin"
 	"github.com/coredns/coredns/plugin/pkg/parse"
 	"github.com/coredns/coredns/plugin/pkg/tls"
 	"github.com/coredns/proxy/healthcheck"
 
-	"github.com/caddyserver/caddy/caddyfile"
 	"github.com/miekg/dns"
 )
 

upstream_test.go

@@ -5,9 +5,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/coredns/caddy"
 	"github.com/coredns/coredns/plugin/test"
-
-	"github.com/caddyserver/caddy"
 )
 
 func TestAllowedDomain(t *testing.T) {