[*] SourceConn.GetMetricInterval() now returns time.Duration (#1315)

Author: pashagolub

internal/reaper/logparser.go

@@ -43,7 +43,7 @@ type LogParser struct {
 	ctx              context.Context
 	LogsMatchRegex   *regexp.Regexp
 	SourceConn       *sources.SourceConn
-	Interval         int
+	Interval         time.Duration
 	StoreCh          chan<- metrics.MeasurementEnvelope
 	eventCounts      map[string]int64 // for the specific DB. [WARNING: 34, ERROR: 10, ...], zeroed on storage send
 	eventCountsTotal map[string]int64 // for the whole instance
@@ -97,7 +97,7 @@ func NewLogParser(ctx context.Context, mdb *sources.SourceConn, storeCh chan<- m
 }
 
 func (lp *LogParser) HasSendIntervalElapsed() bool {
-	return lp.lastSendTime.IsZero() || lp.lastSendTime.Before(time.Now().Add(-time.Second*time.Duration(lp.Interval)))
+	return lp.lastSendTime.IsZero() || lp.lastSendTime.Before(time.Now().Add(-lp.Interval))
 }
 
 func (lp *LogParser) ParseLogs() error {

internal/reaper/logparser_test.go

@@ -48,7 +48,7 @@ func TestNewLogParser(t *testing.T) {
 		assert.Equal(t, tempDir, lp.Directory)
 		assert.Equal(t, "en", lp.ServerMessagesLang)
 		assert.Equal(t, false, lp.TruncateOnRotation)
-		assert.Equal(t, 60, lp.Interval)
+		assert.Equal(t, 60*time.Second, lp.Interval)
 		assert.NotNil(t, lp.LogsMatchRegex)
 		assert.NoError(t, mock.ExpectationsWereMet())
 	})

internal/reaper/psutil.go

@@ -40,7 +40,7 @@ func goPsutilCalcCPUUtilization(probe0, probe1 cpu.TimesStat) float64 {
 }
 
 // GetGoPsutilCPU simulates "psutil" metric output. Assumes the result from last call as input
-func GetGoPsutilCPU(interval int) (metrics.Measurements, error) {
+func GetGoPsutilCPU(interval time.Duration) (metrics.Measurements, error) {
 	prevCPULoadTimeStatsLock.RLock()
 	prevTime := prevCPULoadTimestamp
 	prevTimeStat := prevCPULoadTimeStats
@@ -50,7 +50,7 @@ func GetGoPsutilCPU(interval int) (metrics.Measurements, error) {
 	if err != nil {
 		return nil, err
 	}
-	if time.Since(prevTime) >= time.Duration(int(time.Second)*interval) {
+	if time.Since(prevTime) >= interval {
 		prevCPULoadTimeStatsLock.Lock() // update the cache
 		prevCPULoadTimeStats = curCallStats[0]
 		prevCPULoadTimestamp = time.Now()

internal/reaper/psutil_test.go

@@ -18,7 +18,7 @@ func TestGetGoPsutilCPU(t *testing.T) {
 	time.Sleep(100 * time.Millisecond)
 
 	// Call the GetGoPsutilCPU function with a 1-second interval
-	result, err := GetGoPsutilCPU(1.0)
+	result, err := GetGoPsutilCPU(time.Second)
 	a.NoError(err)
 	a.NotEmpty(result)
 

internal/reaper/reaper.go

@@ -344,8 +344,8 @@ func (r *Reaper) reapMetricMeasurements(ctx context.Context, md *sources.SourceC
 			metricStoreMessages, err = r.FetchMetric(ctx, md, metricName)
 		}
 
-		if time.Since(t1) > (time.Second * time.Duration(interval)) {
-			l.Warningf("Total fetching time of %v bigger than %vs interval", time.Since(t1), interval)
+		if time.Since(t1) > interval {
+			l.Warningf("Total fetching time of %v bigger than %v interval", time.Since(t1), interval)
 		}
 
 		if err != nil {
@@ -385,7 +385,7 @@ func (r *Reaper) reapMetricMeasurements(ctx context.Context, md *sources.SourceC
 		select {
 		case <-ctx.Done():
 			return
-		case <-time.After(time.Second * time.Duration(interval)):
+		case <-time.After(interval):
 			// continue
 		}
 	}
@@ -482,7 +482,7 @@ func (r *Reaper) FetchMetric(ctx context.Context, md *sources.SourceConn, metric
 	}
 	l := log.GetLogger(ctx)
 
-	if metric.IsInstanceLevel && r.Metrics.InstanceLevelCacheMaxSeconds > 0 && time.Second*time.Duration(md.GetMetricInterval(metricName)) < r.Metrics.CacheAge() {
+	if metric.IsInstanceLevel && r.Metrics.InstanceLevelCacheMaxSeconds > 0 && md.GetMetricInterval(metricName) < r.Metrics.CacheAge() {
 		cacheKey = fmt.Sprintf("%s:%s", md.GetClusterIdentifier(), metricName)
 	}
 	data = r.measurementCache.Get(cacheKey, r.Metrics.CacheAge())

internal/sources/conn.go

@@ -128,13 +128,13 @@ func (md *SourceConn) GetDatabaseName() string {
 }
 
 // GetMetricInterval returns the metric interval for the connection
-func (md *SourceConn) GetMetricInterval(name string) int {
+func (md *SourceConn) GetMetricInterval(name string) time.Duration {
 	md.RLock()
 	defer md.RUnlock()
 	if md.IsInRecovery && len(md.MetricsStandby) > 0 {
-		return md.MetricsStandby[name]
+		return time.Duration(md.MetricsStandby[name]) * time.Second
 	}
-	return md.Metrics[name]
+	return time.Duration(md.Metrics[name]) * time.Second
 }
 
 // IsClientOnSameHost checks if the pgwatch client is running on the same host as the PostgreSQL server

internal/sources/conn_test.go

@@ -181,20 +181,20 @@ func TestSourceConn_GetMetricInterval(t *testing.T) {
 
 	t.Run("primary uses Metrics", func(t *testing.T) {
 		md.IsInRecovery = false
-		assert.Equal(t, 15, md.GetMetricInterval("foo"))
-		assert.Equal(t, 25, md.GetMetricInterval("bar"))
+		assert.Equal(t, 15*time.Second, md.GetMetricInterval("foo"))
+		assert.Equal(t, 25*time.Second, md.GetMetricInterval("bar"))
 	})
 
 	t.Run("standby uses MetricsStandby if present", func(t *testing.T) {
 		md.IsInRecovery = true
-		assert.Equal(t, 35, md.GetMetricInterval("foo"))
-		assert.Equal(t, 0, md.GetMetricInterval("bar"))
+		assert.Equal(t, 35*time.Second, md.GetMetricInterval("foo"))
+		assert.Equal(t, time.Duration(0), md.GetMetricInterval("bar"))
 	})
 
 	t.Run("standby with empty MetricsStandby falls back to Metrics", func(t *testing.T) {
 		md.IsInRecovery = true
 		md.MetricsStandby = metrics.MetricIntervals{}
-		assert.Equal(t, 15, md.GetMetricInterval("foo"))
+		assert.Equal(t, 15*time.Second, md.GetMetricInterval("foo"))
 	})
 }