2 files changed, 3 insertions, 33 deletions

diff --git a/plugin/pkg/replacer/replacer.go b/plugin/pkg/replacer/replacer.go
index 1d65967e0..b9e1fcaa6 100644
--- a/plugin/pkg/replacer/replacer.go
+++ b/plugin/pkg/replacer/replacer.go
@@ -1,13 +1,11 @@
 package replacer
 
 import (
-	"context"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/coredns/coredns/plugin/pkg/dnstest"
-	"github.com/coredns/coredns/plugin/metadata"
 	"github.com/coredns/coredns/request"
 
 	"github.com/miekg/dns"
@@ -33,7 +31,7 @@ type replacer struct {
 // values into the replacer. rr may be nil if it is not
 // available. emptyValue should be the string that is used
 // in place of empty string (can still be empty string).
-func New(ctx context.Context, r *dns.Msg, rr *dnstest.Recorder, emptyValue string) Replacer {
+func New(r *dns.Msg, rr *dnstest.Recorder, emptyValue string) Replacer {
 	req := request.Request{W: rr, Req: r}
 	rep := replacer{
 		replacements: map[string]string{
@@ -47,8 +45,6 @@ func New(ctx context.Context, r *dns.Msg, rr *dnstest.Recorder, emptyValue strin
 			"{size}":   strconv.Itoa(req.Len()),
 			"{remote}": addrToRFC3986(req.IP()),
 			"{port}":   req.Port(),
-			"{local}":  addrToRFC3986(req.LocalIP()),
-			"{forward/resolving_proxy}": getMetadata(ctx, "forward/resolving_proxy"),
 		},
 		emptyValue: emptyValue,
 	}
@@ -62,8 +58,6 @@ func New(ctx context.Context, r *dns.Msg, rr *dnstest.Recorder, emptyValue strin
 		rep.replacements["{duration}"] = strconv.FormatFloat(time.Since(rr.Start).Seconds(), 'f', -1, 64) + "s"
 		if rr.Msg != nil {
 			rep.replacements[headerReplacer+"rflags}"] = flagsToString(rr.Msg.MsgHdr)
-			rep.replacements["{A}"] = answersCount(rr.Msg, dns.TypeA)
-			rep.replacements["{AAAA}"] = answersCount(rr.Msg, dns.TypeAAAA)
 		}
 	}
 
@@ -169,30 +163,6 @@ func addrToRFC3986(addr string) string {
 	return addr
 }
 
-//getMetadata will return value from Metadata or empty string
-func getMetadata(ctx context.Context, label string) string {
-	if ctx != nil {
-		valueFunc := metadata.ValueFunc(ctx, label)
-		if valueFunc != nil {
-			return valueFunc()
-		}
-	}
-	return ""
-}
-
-//answersCount will calculate a number of answers which have the type passed
-func answersCount(m *dns.Msg, rtype uint16) string {
-	count := 0
-	if m != nil {
-		for i := 0; i < len(m.Answer); i++ {
-			if m.Answer[i].Header().Rrtype == rtype {
-				count++
-			}
-		}
-	}
-	return strconv.Itoa(count)
-}
-
 const (
 	timeFormat     = "02/Jan/2006:15:04:05 -0700"
 	headerReplacer = "{>"
diff --git a/plugin/pkg/replacer/replacer_test.go b/plugin/pkg/replacer/replacer_test.go
index 53b41510f..2fcaafc92 100644
--- a/plugin/pkg/replacer/replacer_test.go
+++ b/plugin/pkg/replacer/replacer_test.go
@@ -17,7 +17,7 @@ func TestNewReplacer(t *testing.T) {
 	r.SetQuestion("example.org.", dns.TypeHINFO)
 	r.MsgHdr.AuthenticatedData = true
 
-	replaceValues := New(nil, r, w, "")
+	replaceValues := New(r, w, "")
 
 	switch v := replaceValues.(type) {
 	case replacer:
@@ -47,7 +47,7 @@ func TestSet(t *testing.T) {
 	r.SetQuestion("example.org.", dns.TypeHINFO)
 	r.MsgHdr.AuthenticatedData = true
 
-	repl := New(nil, r, w, "")
+	repl := New(r, w, "")
 
 	repl.Set("name", "coredns.io.")
 	repl.Set("type", "A")