From 2e2fa296379f04e959b9b2c07899c65e738bdfd0 Mon Sep 17 00:00:00 2001
From: Adam Chalmers <achalmers@cloudflare.com>
Date: Tue, 16 Apr 2019 15:26:31 -0500
Subject: [PATCH] TUN-1732: cloudflared metrics should track userHostnames

---
 origin/metrics.go | 15 +++++++++++++--
 origin/tunnel.go  |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/origin/metrics.go b/origin/metrics.go
index 6cc53960..70db8d42 100644
--- a/origin/metrics.go
+++ b/origin/metrics.go
@@ -55,8 +55,9 @@ type TunnelMetrics struct {
 	regFail    *prometheus.CounterVec
 	rpcFail    *prometheus.CounterVec
 
-	muxerMetrics *muxerMetrics
-	tunnelsHA    tunnelsForHA
+	muxerMetrics        *muxerMetrics
+	tunnelsHA           tunnelsForHA
+	userHostnamesCounts *prometheus.CounterVec
 }
 
 func newMuxerMetrics() *muxerMetrics {
@@ -364,6 +365,15 @@ func NewTunnelMetrics() *TunnelMetrics {
 	)
 	prometheus.MustRegister(registerFail)
 
+	userHostnamesCounts := prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "user_hostnames_counts",
+			Help: "Which user hostnames cloudflared is serving",
+		},
+		[]string{"userHostname"},
+	)
+	prometheus.MustRegister(userHostnamesCounts)
+
 	registerSuccess := prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Name: "tunnel_register_success",
@@ -389,6 +399,7 @@ func NewTunnelMetrics() *TunnelMetrics {
 		regSuccess:                     registerSuccess,
 		regFail:                        registerFail,
 		rpcFail:                        rpcFail,
+		userHostnamesCounts:            userHostnamesCounts,
 	}
 }
 
diff --git a/origin/tunnel.go b/origin/tunnel.go
index a84b87d2..960ec42f 100644
--- a/origin/tunnel.go
+++ b/origin/tunnel.go
@@ -396,6 +396,8 @@ func RegisterTunnel(
 		}
 	}
 
+	config.Metrics.userHostnamesCounts.WithLabelValues(registration.Url).Inc()
+
 	config.Logger.Infof("Route propagating, it may take up to 1 minute for your new route to become functional")
 	return nil
 }