middleware/proxy: sane(r) metrics

Add proxy_proto and re-instate proto to be the protocol of the incoming
query ("tcp" or "udp").

middleware/proxy/metrics.go

@@ -16,7 +16,7 @@ var (
 		Name:      "request_duration_milliseconds",
 		Buckets:   append(prometheus.DefBuckets, []float64{50, 100, 200, 500, 1000, 2000, 3000, 4000, 5000, 10000}...),
 		Help:      "Histogram of the time (in milliseconds) each request took.",
-	}, []string{"proto", "from"})
+	}, []string{"proto", "proxy_proto", "from"})
 )
 
 // OnStartupMetrics sets up the metrics on startup. This is done for all proxy protocols.