feat: write aggregated metrics to storage

luissimas · Jul 2, 2024 · 2dbf3ae · 2dbf3ae
1 parent 9b1c91f
commit 2dbf3ae
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 16 deletions.
diff --git a/internal/collector/collector.go b/internal/collector/collector.go
@@ -41,10 +41,7 @@ func (c *Collector) CollectMetrics(root fs.FS, collectionTime time.Time) error {
 		return err
 	}
 
-	// Write metrics to storage
-	for name, metric := range collected.Notes {
-		c.storage.WriteMetric(name, metric, collectionTime)
-	}
+	c.storage.WriteMetrics(collected, collectionTime)
 	slog.Debug("Collected metrics", slog.Duration("duration", time.Since(start)))
 
 	return nil

diff --git a/internal/storage/fake.go b/internal/storage/fake.go
@@ -14,8 +14,7 @@ func NewFakeStorage() FakeStorage {
 	return FakeStorage{}
 }
 
-func (f FakeStorage) WriteMetric(noteName string, metric metrics.NoteMetrics, timestamp time.Time) {
-
+func (f FakeStorage) WriteMetrics(zettelkastenMetrics metrics.Metrics, timestamp time.Time) {
 }
 
 func (f FakeStorage) IsEmpty() bool {

diff --git a/internal/storage/influxdb.go b/internal/storage/influxdb.go
@@ -5,11 +5,13 @@ import (
 
 	influxdb2 "github.com/influxdata/influxdb-client-go/v2"
 	"github.com/influxdata/influxdb-client-go/v2/api"
+
 	"github.com/luissimas/zettelkasten-exporter/internal/metrics"
 )
 
-// The measurement name to be used for all metrics within the InfluxDB bucket.
-const measurementName = "notes"
+// The measurement names to be used for metrics within the InfluxDB bucket.
+const notesMeasurementName = "notes"
+const totalMeasurementName = "total"
 
 // InfluxDBStorage represents the implementation of a metric storage using InfluxDB.
 type InfluxDBStorage struct {
@@ -26,16 +28,32 @@ func NewInfluxDBStorage(url, org, bucket, token string) InfluxDBStorage {
 }
 
 // WriteMetric writes `metric` for `noteName` to the storage with `timestamp`.
-func (i InfluxDBStorage) WriteMetric(noteName string, metric metrics.NoteMetrics, timestamp time.Time) {
+func (i InfluxDBStorage) WriteMetrics(zettelkastenMetrics metrics.Metrics, timestamp time.Time) {
+	// Aggregated metrics
 	point := influxdb2.NewPoint(
-		measurementName,
-		map[string]string{"name": noteName},
+		totalMeasurementName,
+		map[string]string{},
 		map[string]interface{}{
-			"link_count":     metric.LinkCount,
-			"word_count":     metric.WordCount,
-			"backlink_count": metric.BacklinkCount,
+			"note_count": zettelkastenMetrics.NoteCount,
+			"link_count": zettelkastenMetrics.LinkCount,
+			"word_count": zettelkastenMetrics.WordCount,
 		},
 		timestamp,
 	)
 	i.writeAPI.WritePoint(point)
+
+	// Individual note metrics
+	for name, metric := range zettelkastenMetrics.Notes {
+		point := influxdb2.NewPoint(
+			notesMeasurementName,
+			map[string]string{"name": name},
+			map[string]interface{}{
+				"link_count":     metric.LinkCount,
+				"word_count":     metric.WordCount,
+				"backlink_count": metric.BacklinkCount,
+			},
+			timestamp,
+		)
+		i.writeAPI.WritePoint(point)
+	}
 }
diff --git a/internal/storage/storage.go b/internal/storage/storage.go
@@ -8,6 +8,6 @@ import (
 
 // Storage represents a storage for metrics.
 type Storage interface {
-	// WriteMetric writes the note metric to the storage.
-	WriteMetric(noteName string, metric metrics.NoteMetrics, timestamp time.Time)
+	// WriteMetric writes the `zettelkastenMetrics` to the storage.
+	WriteMetrics(zettelkastenMetrics metrics.Metrics, timestamp time.Time)
 }