feat(disk): Refactor disk usage calc

Author: samcm

example_config.yaml

@@ -13,5 +13,6 @@ execution:
     - "txpool"
 diskUsage:
   enabled: false
+  interval: 30m
   directories:
   - /data/ethereum

pkg/exporter/config.go

@@ -1,5 +1,7 @@
 package exporter
 
+import "github.com/ethpandaops/beacon/pkg/human"
+
 // Config holds the configuration for the ethereum sync status tool.
 type Config struct {
 	// Execution is the execution node to use.
@@ -29,8 +31,9 @@ type ExecutionNode struct {
 
 // DiskUsage configures the exporter to expose disk usage stats for these directories.
 type DiskUsage struct {
-	Enabled     bool     `yaml:"enabled"`
-	Directories []string `yaml:"directories"`
+	Enabled     bool           `yaml:"enabled"`
+	Directories []string       `yaml:"directories"`
+	Interval    human.Duration `yaml:"interval"`
 }
 
 // PairConfig holds the config for a Pair of Execution and Consensus Clients

pkg/exporter/disk/disk.go

@@ -21,24 +21,33 @@ type diskUsage struct {
 	log         logrus.FieldLogger
 	metrics     Metrics
 	directories []string
+	interval    time.Duration
 }
 
 // NewUsage returns a new DiskUsage instance.
-func NewUsage(ctx context.Context, log logrus.FieldLogger, namespace string, directories []string) (UsageMetrics, error) {
+func NewUsage(ctx context.Context, log logrus.FieldLogger, namespace string, directories []string, interval time.Duration) (UsageMetrics, error) {
 	return &diskUsage{
 		log:         log,
 		metrics:     NewMetrics(log, namespace),
 		directories: directories,
+		interval:    interval,
 	}, nil
 }
 
 func (d *diskUsage) StartAsync(ctx context.Context) {
+	d.log.WithField("directories", d.directories).Info("Starting disk usage metrics...")
+
+	_, err := d.GetUsage(ctx, d.directories)
+	if err != nil {
+		d.log.WithError(err).Error("Failed to get disk usage")
+	}
+
 	go func() {
 		for {
 			select {
 			case <-ctx.Done():
 				return
-			case <-time.After(time.Second * 60):
+			case <-time.After(d.interval):
 				if _, err := d.GetUsage(ctx, d.directories); err != nil {
 					d.log.WithError(err).Error("Failed to get disk usage")
 				}

pkg/exporter/exporter.go

@@ -53,7 +53,14 @@ func (e *exporter) Init(ctx context.Context) error {
 	if e.config.Execution.Enabled {
 		e.log.WithField("modules", strings.Join(e.config.Execution.Modules, ", ")).Info("Initializing execution...")
 
-		executionNode, err := execution.NewExecutionNode(ctx, e.log.WithField("exporter", "execution"), fmt.Sprintf("%s_exe", e.namespace), e.config.Execution.Name, e.config.Execution.URL, e.config.Execution.Modules)
+		executionNode, err := execution.NewExecutionNode(
+			ctx,
+			e.log.WithField("exporter", "execution"),
+			fmt.Sprintf("%s_exe", e.namespace),
+			e.config.Execution.Name,
+			e.config.Execution.URL,
+			e.config.Execution.Modules,
+		)
 		if err != nil {
 			return err
 		}
@@ -68,7 +75,18 @@ func (e *exporter) Init(ctx context.Context) error {
 	if e.config.DiskUsage.Enabled {
 		e.log.Info("Initializing disk usage...")
 
-		diskUsage, err := disk.NewUsage(ctx, e.log.WithField("exporter", "disk"), fmt.Sprintf("%s_disk", e.namespace), e.config.DiskUsage.Directories)
+		interval := e.config.DiskUsage.Interval.Duration
+		if interval == 0 {
+			interval = 30 * time.Minute
+		}
+
+		diskUsage, err := disk.NewUsage(
+			ctx,
+			e.log.WithField("exporter", "disk"),
+			fmt.Sprintf("%s_disk", e.namespace),
+			e.config.DiskUsage.Directories,
+			interval,
+		)
 		if err != nil {
 			return err
 		}
@@ -130,7 +148,7 @@ func (e *exporter) Serve(ctx context.Context, port int) error {
 	return nil
 }
 
-func (e *exporter) bootstrapConsensusClients(ctx context.Context) error {
+func (e *exporter) bootstrapConsensusClients(_ context.Context) error {
 	opts := *beacon.DefaultOptions().
 		EnableDefaultBeaconSubscription().
 		EnablePrometheusMetrics()