Merge branch 'master' into MM-47853-true-up-review-telemetry-off-non-air-gapped

einterfaces/metrics.go

@@ -4,12 +4,15 @@
 package einterfaces
 
 import (
+	"database/sql"
+
 	"github.com/mattermost/mattermost-server/v6/model"
 	"github.com/mattermost/mattermost-server/v6/shared/mlog"
 )
 
 type MetricsInterface interface {
 	Register()
+	RegisterDBCollector(db *sql.DB, name string)
 
 	IncrementPostCreate()
 	IncrementWebhookPost()

einterfaces/mocks/MetricsInterface.go

@@ -9,6 +9,8 @@ import (
 	mock "github.com/stretchr/testify/mock"
 
 	model "github.com/mattermost/mattermost-server/v6/model"
+
+	sql "database/sql"
 )
 
 // MetricsInterface is an autogenerated mock type for the MetricsInterface type
@@ -302,6 +304,11 @@ func (_m *MetricsInterface) Register() {
 	_m.Called()
 }
 
+// RegisterDBCollector provides a mock function with given fields: db, name
+func (_m *MetricsInterface) RegisterDBCollector(db *sql.DB, name string) {
+	_m.Called(db, name)
+}
+
 // SetReplicaLagAbsolute provides a mock function with given fields: node, value
 func (_m *MetricsInterface) SetReplicaLagAbsolute(node string, value float64) {
 	_m.Called(node, value)