Merge pull request #74 from nvaatstra/s3-snapshot-metrics

S3 snapshot metrics

Author: wojas

go.mod

@@ -5,7 +5,7 @@ go 1.19
 require (
 	github.com/CrowdStrike/csproto v0.23.1
 	github.com/PowerDNS/lmdb-go v1.9.0
-	github.com/PowerDNS/simpleblob v0.2.5
+	github.com/PowerDNS/simpleblob v0.2.7
 	github.com/bufbuild/buf v0.56.0
 	github.com/c2h5oh/datasize v0.0.0-20200825124411-48ed595a09d2
 	github.com/gogo/protobuf v1.3.2

go.sum

@@ -57,8 +57,8 @@ github.com/PowerDNS/go-tlsconfig v0.0.0-20221101135152-0956853b28df h1:WMUClevRP
 github.com/PowerDNS/go-tlsconfig v0.0.0-20221101135152-0956853b28df/go.mod h1:aKP0MVHWl7U3ruSXqAmzsoVVFm8HhYIpOmm1MwkDyDY=
 github.com/PowerDNS/lmdb-go v1.9.0 h1:pvdI8lzdeAfWJdkXc3XPZXCewX508awqfe5yMjSKNTE=
 github.com/PowerDNS/lmdb-go v1.9.0/go.mod h1:5beHlX2aYqXfMBI0+BBX3LDhV3YGHU5JgoDsirAFPlA=
-github.com/PowerDNS/simpleblob v0.2.5 h1:JI3pGI8KyzDXDL75ae5QPCw5588X6z6/nBzehiCe2TE=
-github.com/PowerDNS/simpleblob v0.2.5/go.mod h1:demorqIrYIbxW3wsU5SS5NufPyGseDW+xofeQZw4w3o=
+github.com/PowerDNS/simpleblob v0.2.7 h1:eslNYitaaaOgIqZdYWnMH1nJIc6HApIvBs63zzKBYQE=
+github.com/PowerDNS/simpleblob v0.2.7/go.mod h1:demorqIrYIbxW3wsU5SS5NufPyGseDW+xofeQZw4w3o=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=

syncer/receiver/metrics.go

@@ -63,7 +63,20 @@ var (
 			Help: "Number of bytes downloaded successfully",
 		},
 	)
-	// TODO: add total space used by all snapshots
+	metricSnapshotsStorageCount = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "lightningstream_receiver_snapshots_in_storage_count",
+			Help: "Number of snapshots in storage",
+		},
+		[]string{"lmdb"},
+	)
+	metricSnapshotsStorageBytes = prometheus.NewGaugeVec(
+		prometheus.GaugeOpts{
+			Name: "lightningstream_receiver_snapshots_in_storage_bytes",
+			Help: "Number of bytes occupied by snapshots in storage",
+		},
+		[]string{"lmdb"},
+	)
 )
 
 func init() {
@@ -74,4 +87,6 @@ func init() {
 	prometheus.MustRegister(metricSnapshotsLoadFailed)
 	prometheus.MustRegister(metricSnapshotsListFailed)
 	prometheus.MustRegister(metricSnapshotsLoadBytes)
+	prometheus.MustRegister(metricSnapshotsStorageCount)
+	prometheus.MustRegister(metricSnapshotsStorageBytes)
 }

syncer/receiver/receiver.go

@@ -164,6 +164,10 @@ func (r *Receiver) RunOnce(ctx context.Context, includingOwn bool) error {
 		return fmt.Errorf("list snapshots: %w", err)
 	}
 
+	// Update snapshot metrics
+	metricSnapshotsStorageCount.WithLabelValues(r.lmdbname).Set(float64(ls.Len()))
+	metricSnapshotsStorageBytes.WithLabelValues(r.lmdbname).Set(float64(ls.Size()))
+
 	// Signal success to health tracker
 	r.storageListHealth.AddSuccess()