Merge branch 'main' into invite

matrix-org · Jul 5, 2023 · d53e14a · d53e14a
2 parents 178f53e + 5a87c70
commit d53e14a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/roomserver/internal/api.go b/roomserver/internal/api.go
@@ -126,6 +126,7 @@ func (r *RoomserverInternalAPI) SetFederationAPI(fsAPI fsAPI.RoomserverFederatio
 		KeyRing:             keyRing,
 		ACLs:                r.ServerACLs,
 		Queryer:             r.Queryer,
+		EnableMetrics:       r.enableMetrics,
 	}
 	r.Inviter = &perform.Inviter{
 		DB:      r.DB,

diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
@@ -91,7 +91,7 @@ type Inputer struct {
 
 	Queryer       *query.Queryer
 	UserAPI       userapi.RoomserverUserAPI
-	enableMetrics bool
+	EnableMetrics bool
 }
 
 // If a room consumer is inactive for a while then we will allow NATS
@@ -178,7 +178,7 @@ func (r *Inputer) startWorkerForRoom(roomID string) {
 // will look to see if we have a worker for that room which has its
 // own consumer. If we don't, we'll start one.
 func (r *Inputer) Start() error {
-	if r.enableMetrics {
+	if r.EnableMetrics {
 		prometheus.MustRegister(roomserverInputBackpressure, processRoomEventDuration)
 	}
 	_, err := r.JetStream.Subscribe(