[MM-54445] Review metrics (#523)

* Update rtcd * Review metrics
mattermost · Sep 13, 2023 · 15fd276 · 15fd276
1 parent 00a57a6
commit 15fd276
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/mattermost/calls-recorder v0.4.2
 	github.com/mattermost/logr/v2 v2.0.16
 	github.com/mattermost/mattermost/server/public v0.0.9-0.20230824163353-69c11cfe1403
-	github.com/mattermost/rtcd v0.11.1
+	github.com/mattermost/rtcd v0.11.3-0.20230908175616-86c644a7881a
 	github.com/mattermost/squirrel v0.2.0
 	github.com/pion/interceptor v0.1.12
 	github.com/pion/rtp v1.7.13
@@ -76,7 +76,7 @@ require (
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect
 	github.com/prometheus/procfs v0.11.0 // indirect
-	github.com/pyroscope-io/godeltaprof v0.1.1 // indirect
+	github.com/pyroscope-io/godeltaprof v0.1.2 // indirect
 	github.com/segmentio/backo-go v1.0.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/tidwall/gjson v1.14.4 // indirect

diff --git a/go.sum b/go.sum
@@ -300,8 +300,8 @@ github.com/mattermost/logr/v2 v2.0.16 h1:jnePX4cPskC3WDFvUardh/xZfxNdsFXbEERJQ1k
 github.com/mattermost/logr/v2 v2.0.16/go.mod h1:1dm/YhTpozsqANXxo5Pi5zYLBsal2xY0pX+JZNbzYJY=
 github.com/mattermost/mattermost/server/public v0.0.9-0.20230824163353-69c11cfe1403 h1:/rxsEaisu+Rb5mWfoIEnbFqscJeKVkspj+BWzchUAfs=
 github.com/mattermost/mattermost/server/public v0.0.9-0.20230824163353-69c11cfe1403/go.mod h1:sgXQrYzs+IJy51mB8E8OBljagk2u3YwQRoYlBH5goiw=
-github.com/mattermost/rtcd v0.11.1 h1:xaP/s0/WX8rDqHq05l8b4QLLJuRZXucr9Qh6cHTQSHk=
-github.com/mattermost/rtcd v0.11.1/go.mod h1:ketmoC7+9IOjynE5YJgR6GrFTG1b78byVlkVsLcCDa0=
+github.com/mattermost/rtcd v0.11.3-0.20230908175616-86c644a7881a h1:P50VjrExE/n76eDr/tUoxuYOcrzrMcqx+Zv0Z4de1sg=
+github.com/mattermost/rtcd v0.11.3-0.20230908175616-86c644a7881a/go.mod h1:joytuiIDWx/BI+XP3hEUWCVTpKEZmEj2iIpIFgFlCyg=
 github.com/mattermost/squirrel v0.2.0 h1:8ZWeyf+MWQ2cL7hu9REZgLtz2IJi51qqZEovI3T3TT8=
 github.com/mattermost/squirrel v0.2.0/go.mod h1:NPPtk+CdpWre4GxMGoOpzEVFVc0ZoEFyJBZGCtn9nSU=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -433,8 +433,8 @@ github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7z
 github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk=
 github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/pyroscope-io/godeltaprof v0.1.1 h1:+Mmi+b9gR3s/qufuQSxOBjyXZR1fmvS/C12Q73PIPvw=
-github.com/pyroscope-io/godeltaprof v0.1.1/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
+github.com/pyroscope-io/godeltaprof v0.1.2 h1:MdlEmYELd5w+lvIzmZvXGNMVzW2Qc9jDMuJaPOR75g4=
+github.com/pyroscope-io/godeltaprof v0.1.2/go.mod h1:psMITXp90+8pFenXkKIpNhrfmI9saQnPbba27VIaiQE=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

diff --git a/server/performance/metrics.go b/server/performance/metrics.go
@@ -25,7 +25,7 @@ type Metrics struct {
 	registry   *prometheus.Registry
 	rtcMetrics *perf.Metrics
 
-	WebSocketConnections             *prometheus.GaugeVec
+	WebSocketConnections             prometheus.Gauge
 	WebSocketEventCounters           *prometheus.CounterVec
 	ClusterEventCounters             *prometheus.CounterVec
 	StoreOpCounters                  *prometheus.CounterVec
@@ -43,14 +43,12 @@ func NewMetrics() *Metrics {
 	}))
 	m.registry.MustRegister(collectors.NewGoCollector())
 
-	m.WebSocketConnections = prometheus.NewGaugeVec(prometheus.GaugeOpts{
+	m.WebSocketConnections = prometheus.NewGauge(prometheus.GaugeOpts{
 		Namespace: metricsNamespace,
 		Subsystem: metricsSubSystemWS,
 		Name:      "connections_total",
 		Help:      "The total number of active WebSocket connections.",
-	},
-		[]string{"callID"},
-	)
+	})
 	m.registry.MustRegister(m.WebSocketConnections)
 
 	m.WebSocketEventCounters = prometheus.NewCounterVec(
@@ -136,12 +134,12 @@ func (m *Metrics) IncWebSocketEvent(direction, evType string) {
 	m.WebSocketEventCounters.With(prometheus.Labels{"direction": direction, "type": evType}).Inc()
 }
 
-func (m *Metrics) IncWebSocketConn(callID string) {
-	m.WebSocketConnections.With(prometheus.Labels{"callID": callID}).Inc()
+func (m *Metrics) IncWebSocketConn() {
+	m.WebSocketConnections.Inc()
 }
 
-func (m *Metrics) DecWebSocketConn(callID string) {
-	m.WebSocketConnections.With(prometheus.Labels{"callID": callID}).Dec()
+func (m *Metrics) DecWebSocketConn() {
+	m.WebSocketConnections.Dec()
 }
 
 func (m *Metrics) IncClusterEvent(evType string) {

diff --git a/server/websocket.go b/server/websocket.go
@@ -680,8 +680,8 @@ func (p *Plugin) handleJoin(userID, connID string, joinData CallsClientJoinData)
 
 	p.unlockCall(channelID)
 
-	p.metrics.IncWebSocketConn(channelID)
-	defer p.metrics.DecWebSocketConn(channelID)
+	p.metrics.IncWebSocketConn()
+	defer p.metrics.DecWebSocketConn()
 	p.track(evCallUserJoined, map[string]interface{}{
 		"ParticipantID": userID,
 		"ChannelID":     channelID,