From d1f17fa7e061d91aa0af7e1fb959a68db899c812 Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Wed, 7 Sep 2016 11:10:16 +0100 Subject: Cleanup: put middleware helper functions in pkgs (#245) Move all (almost all) Go files in middleware into their own packages. This makes for better naming and discoverability. Lot of changes elsewhere to make this change. The middleware.State was renamed to request.Request which is better, but still does not cover all use-cases. It was also moved out middleware because it is used by `dnsserver` as well. A pkg/dnsutil packages was added for shared, handy, dns util functions. All normalize functions are now put in normalize.go --- middleware/metrics/handler.go | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'middleware/metrics/handler.go') diff --git a/middleware/metrics/handler.go b/middleware/metrics/handler.go index 1bdc34897..6cac7e81e 100644 --- a/middleware/metrics/handler.go +++ b/middleware/metrics/handler.go @@ -4,13 +4,16 @@ import ( "time" "github.com/miekg/coredns/middleware" + "github.com/miekg/coredns/middleware/pkg/dnsrecorder" + "github.com/miekg/coredns/middleware/pkg/rcode" + "github.com/miekg/coredns/request" "github.com/miekg/dns" "golang.org/x/net/context" ) func (m Metrics) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) { - state := middleware.State{W: w, Req: r} + state := request.Request{W: w, Req: r} qname := state.QName() zone := middleware.Zones(m.ZoneNames).Matches(qname) @@ -19,35 +22,35 @@ func (m Metrics) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) } // Record response to get status code and size of the reply. - rw := middleware.NewResponseRecorder(w) + rw := dnsrecorder.New(w) status, err := m.Next.ServeDNS(ctx, rw, r) - Report(state, zone, rw.Rcode(), rw.Size(), rw.Start()) + Report(state, zone, rcode.ToString(rw.Rcode), rw.Size, rw.Start) return status, err } // Report is a plain reporting function that the server can use for REFUSED and other // queries that are turned down because they don't match any middleware. -func Report(state middleware.State, zone, rcode string, size int, start time.Time) { +func Report(req request.Request, zone, rcode string, size int, start time.Time) { if requestCount == nil { // no metrics are enabled return } // Proto and Family - net := state.Proto() + net := req.Proto() fam := "1" - if state.Family() == 2 { + if req.Family() == 2 { fam = "2" } - typ := state.QType() + typ := req.QType() requestCount.WithLabelValues(zone, net, fam).Inc() requestDuration.WithLabelValues(zone).Observe(float64(time.Since(start) / time.Millisecond)) - if state.Do() { + if req.Do() { requestDo.WithLabelValues(zone).Inc() } @@ -59,10 +62,10 @@ func Report(state middleware.State, zone, rcode string, size int, start time.Tim if typ == dns.TypeIXFR || typ == dns.TypeAXFR { responseTransferSize.WithLabelValues(zone, net).Observe(float64(size)) - requestTransferSize.WithLabelValues(zone, net).Observe(float64(state.Size())) + requestTransferSize.WithLabelValues(zone, net).Observe(float64(req.Size())) } else { responseSize.WithLabelValues(zone, net).Observe(float64(size)) - requestSize.WithLabelValues(zone, net).Observe(float64(state.Size())) + requestSize.WithLabelValues(zone, net).Observe(float64(req.Size())) } responseRcode.WithLabelValues(zone, rcode).Inc() -- cgit v1.2.3 k/fix/http-lowercase-headers Unnamed repository; edit this file 'description' to name the repository.
aboutsummaryrefslogtreecommitdiff
path: root/integration/bunjs-only-snippets/readFileSync.txt (unfollow)
AgeCommit message (Expand)AuthorFilesLines
2022-06-22Slightly customize the `events` polyfill so it uses ESMGravatar Jarred Sumner 1-1/+522
2022-06-22Fix memory bugs in escapeHTML & arrayBufferToStringGravatar Jarred Sumner 1-65/+61