Changeset 712 in code for trunk

Timestamp:

Nov 17, 2021, 2:58:19 PM (4 years ago)

Author:

contact

Message:

Add Prometheus instrumentation for the database

Location:

trunk

Files:

• cmd/soju/main.go (modified) (1 diff)
• db.go (modified) (2 diffs)
• db_postgres.go (modified) (2 diffs)
• db_sqlite.go (modified) (2 diffs)

trunk/cmd/soju/main.go

@@ -294 +294 @@
         }
 
+        if db, ok := db.(soju.MetricsCollectorDatabase); ok && srv.MetricsRegistry != nil {
+                srv.MetricsRegistry.MustRegister(db.MetricsCollector())
+        }
+
         sigCh := make(chan os.Signal, 1)
         signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)

trunk/db.go

@@ -7 +7 @@
         "strings"
         "time"
+
+        "github.com/prometheus/client_golang/prometheus"
 )
 
@@ -27 +29 @@
         ListDeliveryReceipts(ctx context.Context, networkID int64) ([]DeliveryReceipt, error)
         StoreClientDeliveryReceipts(ctx context.Context, networkID int64, client string, receipts []DeliveryReceipt) error
+}
+
+type MetricsCollectorDatabase interface {
+        Database
+        MetricsCollector() prometheus.Collector
 }
 

trunk/db_postgres.go

@@ -11 +11 @@
 
         _ "github.com/lib/pq"
+        "github.com/prometheus/client_golang/prometheus"
+        promcollectors "github.com/prometheus/client_golang/prometheus/collectors"
 )
 
@@ -147 +149 @@
 func (db *PostgresDB) Close() error {
         return db.db.Close()
+}
+
+func (db *PostgresDB) MetricsCollector() prometheus.Collector {
+        return promcollectors.NewDBStatsCollector(db.db, "main")
 }
 

trunk/db_sqlite.go

@@ -11 +11 @@
 
         _ "github.com/mattn/go-sqlite3"
+        "github.com/prometheus/client_golang/prometheus"
+        promcollectors "github.com/prometheus/client_golang/prometheus/collectors"
 )
 
@@ -239 +241 @@
 }
 
+func (db *SqliteDB) MetricsCollector() prometheus.Collector {
+        return promcollectors.NewDBStatsCollector(db.db, "main")
+}
+
 func (db *SqliteDB) Stats(ctx context.Context) (*DatabaseStats, error) {
         db.lock.RLock()