stats_collection_period -> stats_collect_period

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

diff --git a/docs/cri/config.md b/docs/cri/config.md
index caa55daf3e68b1f957e96e1a43d2eec4cc742f58..4437606bd64ee270f786de2542de42ac05744bc5 100644 (file)
--- a/docs/cri/config.md
+++ b/docs/cri/config.md
@@ -272,7 +272,7 @@ version = 3
     cdi_spec_dirs = ['/etc/cdi', '/var/run/cdi']
     drain_exec_sync_io_timeout = '0s'
     ignore_deprecation_warnings = []
-    stats_collection_period = '1s'
+    stats_collect_period = '1s'
     stats_retention_period = '2m'
 
     [plugins.'io.containerd.cri.v1.runtime'.containerd]

diff --git a/internal/cri/config/config.go b/internal/cri/config/config.go
index 018d2b712c084484b0c10bbce6bd54d1b7ac7123..4a60b67f6e1c96f9a4a53588913cb93d5b3ee799 100644 (file)
--- a/internal/cri/config/config.go
+++ b/internal/cri/config/config.go
@@ -428,12 +428,12 @@ type RuntimeConfig struct {
        // that should be ignored for checking "ContainerdHasNoDeprecationWarnings" condition.
        IgnoreDeprecationWarnings []string `toml:"ignore_deprecation_warnings" json:"ignoreDeprecationWarnings"`
 
-       // StatsCollectionPeriod is the period for collecting container/sandbox CPU stats
+       // StatsCollectPeriod is the period for collecting container/sandbox CPU stats
        // used for calculating UsageNanoCores. This matches cAdvisor's default housekeeping interval.
        // The string is in the golang duration format, see:
        //   https://golang.org/pkg/time/#ParseDuration
        // Default: "1s"
-       StatsCollectionPeriod string `toml:"stats_collection_period" json:"statsCollectionPeriod"`
+       StatsCollectPeriod string `toml:"stats_collect_period" json:"statsCollectPeriod"`
 
        // StatsRetentionPeriod is how long to retain CPU stats samples for calculating UsageNanoCores.
        // The string is in the golang duration format, see:
@@ -682,10 +682,10 @@ func ValidateRuntimeConfig(ctx context.Context, c *RuntimeConfig) ([]deprecation
                        return warnings, fmt.Errorf("invalid `drain_exec_sync_io_timeout`: %w", err)
                }
        }
-       // Validation for stats_collection_period
-       if c.StatsCollectionPeriod != "" {
-               if _, err := time.ParseDuration(c.StatsCollectionPeriod); err != nil {
-                       return warnings, fmt.Errorf("invalid `stats_collection_period`: %w", err)
+       // Validation for stats_collect_period
+       if c.StatsCollectPeriod != "" {
+               if _, err := time.ParseDuration(c.StatsCollectPeriod); err != nil {
+                       return warnings, fmt.Errorf("invalid `stats_collect_period`: %w", err)
                }
        }
        // Validation for stats_retention_period

diff --git a/internal/cri/server/stats_collector.go b/internal/cri/server/stats_collector.go
index e5e92ca3de8998be6d85f5e52657c82d8abeae6f..1e418f1ec0a5d1aea393f89ef7aeaee33e4c6195 100644 (file)
--- a/internal/cri/server/stats_collector.go
+++ b/internal/cri/server/stats_collector.go
@@ -76,8 +76,8 @@ func NewStatsCollector(config criconfig.Config) *StatsCollector {
        statsAge := defaultStatsAge
 
        // Use config values if provided
-       if config.StatsCollectionPeriod != "" {
-               if d, err := time.ParseDuration(config.StatsCollectionPeriod); err == nil {
+       if config.StatsCollectPeriod != "" {
+               if d, err := time.ParseDuration(config.StatsCollectPeriod); err == nil {
                        interval = d
                }
        }