From ab934b97cbb2940280c345e6e568fefa0cce7322 Mon Sep 17 00:00:00 2001 From: Joakim Recht Date: Tue, 21 Nov 2023 00:26:54 +0100 Subject: [PATCH] Remove room_id from metrics, cardinality becomes too high and the prom scaper can't handle it --- roomserver/internal/input/input.go | 6 +++--- roomserver/internal/input/input_events.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go index 404751532..662571632 100644 --- a/roomserver/internal/input/input.go +++ b/roomserver/internal/input/input.go @@ -276,8 +276,8 @@ func (w *worker) _next() { if scope := sentry.CurrentHub().Scope(); scope != nil { scope.SetTag("event_id", inputRoomEvent.Event.EventID()) } - roomserverInputBackpressure.With(prometheus.Labels{"room_id": w.roomID}).Inc() - defer roomserverInputBackpressure.With(prometheus.Labels{"room_id": w.roomID}).Dec() + roomserverInputBackpressure.With(prometheus.Labels{}).Inc() + defer roomserverInputBackpressure.With(prometheus.Labels{}).Dec() // Process the room event. If something goes wrong then we'll tell // NATS to terminate the message. We'll store the error result as @@ -428,5 +428,5 @@ var roomserverInputBackpressure = prometheus.NewGaugeVec( Name: "input_backpressure", Help: "How many events are queued for input for a given room", }, - []string{"room_id"}, + []string{}, ) diff --git a/roomserver/internal/input/input_events.go b/roomserver/internal/input/input_events.go index 77b50d0e2..b8d6fae15 100644 --- a/roomserver/internal/input/input_events.go +++ b/roomserver/internal/input/input_events.go @@ -62,7 +62,7 @@ var processRoomEventDuration = prometheus.NewHistogramVec( 7000, 8000, 9000, 10000, 15000, 20000, }, }, - []string{"room_id"}, + []string{}, ) // processRoomEvent can only be called once at a time @@ -95,9 +95,7 @@ func (r *Inputer) processRoomEvent( started := time.Now() defer func() { timetaken := time.Since(started) - processRoomEventDuration.With(prometheus.Labels{ - "room_id": input.Event.RoomID().String(), - }).Observe(float64(timetaken.Milliseconds())) + processRoomEventDuration.With(prometheus.Labels{}).Observe(float64(timetaken.Milliseconds())) }() // Parse and validate the event JSON