Fix panic caused by missing metric labels in proxy. (#492)

299360fe · devnev · Miek Gieben · c68dc7c1 · 299360fe
Commit 299360fe authored Jan 23, 2017 by devnev Committed by Miek Gieben Jan 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

middleware/proxy/proxy.go middleware/proxy/proxy.go +3 -3

No files found.
--- a/middleware/proxy/proxy.go
+++ b/middleware/proxy/proxy.go
@@ -80,7 +80,7 @@ func (p Proxy) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
 			host := upstream.Select()
 			if host == nil {
-				RequestDuration.WithLabelValues(upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+				RequestDuration.WithLabelValues(state.Proto(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
 				return dns.RcodeServerFailure, errUnreachable
 			}
@@ -94,7 +94,7 @@ func (p Proxy) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
 			if backendErr == nil {
 				w.WriteMsg(reply)
-				RequestDuration.WithLabelValues(upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+				RequestDuration.WithLabelValues(state.Proto(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
 				return 0, nil
 			}
@@ -109,7 +109,7 @@ func (p Proxy) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
 			}(host, timeout)
 		}
-		RequestDuration.WithLabelValues(upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
+		RequestDuration.WithLabelValues(state.Proto(), upstream.From()).Observe(float64(time.Since(start) / time.Millisecond))
 		return dns.RcodeServerFailure, errUnreachable
 	}