Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/beholder/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ func createConfigMetric(meter otelmetric.Meter, cfg Config) (otelmetric.Int64Gau

// Metrics config
attribute.String(
"metric_reader_interval", cfg.MetricReaderInterval.String()),
"metric_reader_interval", metricReaderInterval(cfg).String()),
attribute.String(
"metric_compressor", cfg.MetricCompressor),
}
Expand Down Expand Up @@ -544,7 +544,7 @@ func newMeterProvider(cfg Config, resource *sdkresource.Resource, auth Auth, cre
}

readerOpts := []sdkmetric.PeriodicReaderOption{
sdkmetric.WithInterval(cfg.MetricReaderInterval), // Default is 10s
sdkmetric.WithInterval(metricReaderInterval(cfg)), // Zero uses Beholder default (1s)
}
for _, p := range cfg.MetricProducers {
readerOpts = append(readerOpts, sdkmetric.WithProducer(p))
Expand Down
7 changes: 7 additions & 0 deletions pkg/beholder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,13 @@ func DefaultConfig() Config {
}
}

func metricReaderInterval(cfg Config) time.Duration {
if cfg.MetricReaderInterval > 0 {
return cfg.MetricReaderInterval
}
return DefaultConfig().MetricReaderInterval
}

func TestDefaultConfig() Config {
config := DefaultConfig()
// Should be only disabled for testing
Expand Down
15 changes: 15 additions & 0 deletions pkg/beholder/config_defaults_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package beholder

import (
"testing"
"time"

"github.com/stretchr/testify/assert"
)

func TestMetricReaderInterval_zeroUsesDefault(t *testing.T) {
t.Parallel()

assert.Equal(t, time.Second, metricReaderInterval(Config{}))
assert.Equal(t, 5*time.Second, metricReaderInterval(Config{MetricReaderInterval: 5 * time.Second}))
}
2 changes: 1 addition & 1 deletion pkg/beholder/httpclient.go
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ func newHTTPMeterProvider(config Config, resource *sdkresource.Resource, tlsConf
sdkmetric.WithReader(
sdkmetric.NewPeriodicReader(
exporter,
sdkmetric.WithInterval(config.MetricReaderInterval), // Default is 10s
sdkmetric.WithInterval(metricReaderInterval(config)), // Zero uses Beholder default (1s)
)),
sdkmetric.WithResource(resource),
sdkmetric.WithView(config.MetricViews...),
Expand Down
Loading