register db metrics in separate function

stellar · Jan 31, 2025 · a58da1a · a58da1a
1 parent 4294b13
commit a58da1a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/internal/db/db.go b/internal/db/db.go
@@ -41,17 +41,22 @@ func OpenDBConnectionPool(dataSourceName string, metricsRegistry *prometheus.Reg
 	sqlxDB.SetConnMaxIdleTime(MaxDBConnIdleTime)
 	sqlxDB.SetMaxOpenConns(MaxOpenDBConns)
 
-	if metricsRegistry != nil {
-		collector := sqlstats.NewStatsCollector("wallet-backend-db", sqlxDB)
-		metricsRegistry.MustRegister(collector)
-	}
-
 	err = sqlxDB.Ping()
 	if err != nil {
 		return nil, fmt.Errorf("error pinging app DB connection pool: %w", err)
 	}
 
-	return &ConnectionPoolImplementation{DB: sqlxDB}, nil
+	db := &ConnectionPoolImplementation{DB: sqlxDB}
+	if metricsRegistry != nil {
+		db.registerMetrics(metricsRegistry)
+	}
+
+	return db, nil
+}
+
+func (db *ConnectionPoolImplementation) registerMetrics(metricsRegistry *prometheus.Registry) {
+	collector := sqlstats.NewStatsCollector("wallet-backend-db", db.DB)
+	metricsRegistry.MustRegister(collector)
 }
 
 func (db *ConnectionPoolImplementation) BeginTxx(ctx context.Context, opts *sql.TxOptions) (Transaction, error) {

diff --git a/internal/services/ingest.go b/internal/services/ingest.go
@@ -110,11 +110,11 @@ func NewIngestService(
 		ingestionDuration:                   ingestionDuration,
 	}
 
-	ingestService.RegisterMetrics(metricsRegistry)
+	ingestService.registerMetrics(metricsRegistry)
 	return ingestService, nil
 }
 
-func (m *ingestService) RegisterMetrics(registry *prometheus.Registry) {
+func (m *ingestService) registerMetrics(registry *prometheus.Registry) {
 	registry.MustRegister(
 		m.numPaymentOpsIngestedPerLedger,
 		m.numTssTransactionsIngestedPerLedger,