1 files changed, 8 insertions, 2 deletions

diff --git a/plugin/metrics/context.go b/plugin/metrics/context.go
index 7ee25ef4a..da6bdb12d 100644
--- a/plugin/metrics/context.go
+++ b/plugin/metrics/context.go
@@ -3,7 +3,7 @@ package metrics
 import (
 	"context"
 
-	"github.com/coredns/coredns/plugin/metrics/vars"
+	"github.com/coredns/coredns/core/dnsserver"
 )
 
 // WithServer returns the current server handling the request. It returns the
@@ -15,4 +15,10 @@ import (
 // Basic usage with a metric:
 //
 // <metric>.WithLabelValues(metrics.WithServer(ctx), labels..).Add(1)
-func WithServer(ctx context.Context) string { return vars.WithServer(ctx) }
+func WithServer(ctx context.Context) string {
+	srv := ctx.Value(dnsserver.Key{})
+	if srv == nil {
+		return ""
+	}
+	return srv.(*dnsserver.Server).Addr
+}