Browse Source

Skip collecting data directory stats in dev mode

In dev mode, the data directory is not set, so this metrics collection would
always fail and logs errors.
pull/20521/head
Melissa Kam 10 months ago
parent
commit
5d591bbdfb
  1. 10
      lib/hoststats/collector.go
  2. 48
      lib/hoststats/collector_test.go

10
lib/hoststats/collector.go

@ -109,11 +109,13 @@ func (c *Collector) collect() {
hs.CPU = cpus
// Collect disk stats
diskStats, err := c.collectDiskStats(c.dataDir)
if err != nil {
c.logger.Error("failed to collect dataDir disk stats", "error", err)
if c.dataDir != "" {
diskStats, err := c.collectDiskStats(c.dataDir)
if err != nil {
c.logger.Error("failed to collect dataDir disk stats", "error", err)
}
hs.DataDirStats = diskStats
}
hs.DataDirStats = diskStats
// Update the collected status object.
c.hostStatsLock.Lock()

48
lib/hoststats/collector_test.go

@ -0,0 +1,48 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: BUSL-1.1
package hoststats
import (
"testing"
"github.com/hashicorp/go-hclog"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/sdk/testutil"
)
// TestCollector_collect validates that metrics for host resource usage
// are collected as expected.
func TestCollector_collect(t *testing.T) {
testcases := map[string]struct {
skipDataDir bool
}{
"WithDataDirectory": {},
"NoDataDirectory": {
skipDataDir: true,
},
}
for name, tc := range testcases {
t.Run(name, func(t *testing.T) {
dataDir := ""
if !tc.skipDataDir {
dataDir = testutil.TempDir(t, "consul-config")
}
collector := initCollector(hclog.NewNullLogger(), dataDir)
collector.collect()
hs := collector.hostStats
require.NotNil(t, hs)
require.Greater(t, hs.Uptime, uint64(0))
require.NotNil(t, hs.Memory)
require.NotNil(t, hs.CPU)
if !tc.skipDataDir {
require.NotNil(t, hs.DataDirStats)
} else {
require.Nil(t, hs.DataDirStats)
}
})
}
}
Loading…
Cancel
Save