rebase on braydonk-refresh-interval

GoogleCloudPlatform · Dec 2, 2021 · 1f10ccd · 1f10ccd
1 parent 0d2aa4e
commit 1f10ccd
Show file tree

Hide file tree

Showing 75 changed files with 122 additions and 154 deletions.
diff --git a/apps/apache.go b/apps/apache.go
@@ -44,7 +44,7 @@ func (r MetricsReceiverApache) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "httpd",
 			Config: map[string]interface{}{
-				"collection_interval": r.CollectionIntervalString(),
+				"collection_interval": r.CollectionInterval,
 				"endpoint":            r.ServerStatusURL,
 			},
 		},

diff --git a/apps/builtinconf.go b/apps/builtinconf.go
@@ -14,7 +14,11 @@
 
 package apps
 
-import cg "github.com/GoogleCloudPlatform/ops-agent/confgenerator"
+import (
+	"time"
+
+	cg "github.com/GoogleCloudPlatform/ops-agent/confgenerator"
+)
 
 var (
 	BuiltInConfStructs = map[string]*cg.UnifiedConfig{
@@ -39,7 +43,7 @@ var (
 				Receivers: map[string]cg.MetricsReceiver{
 					"hostmetrics": &MetricsReceiverHostmetrics{
 						ConfigComponent:       cg.ConfigComponent{Type: "hostmetrics"},
-						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"},
+						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60},
 					},
 				},
 				Processors: map[string]cg.MetricsProcessor{
@@ -78,15 +82,15 @@ var (
 				Receivers: map[string]cg.MetricsReceiver{
 					"hostmetrics": &MetricsReceiverHostmetrics{
 						ConfigComponent:       cg.ConfigComponent{Type: "hostmetrics"},
-						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"},
+						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60},
 					},
 					"iis": &MetricsReceiverIis{
 						ConfigComponent:       cg.ConfigComponent{Type: "iis"},
-						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"},
+						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60},
 					},
 					"mssql": &MetricsReceiverMssql{
 						ConfigComponent:       cg.ConfigComponent{Type: "mssql"},
-						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: "60s"},
+						MetricsReceiverShared: cg.MetricsReceiverShared{CollectionInterval: time.Second * 60},
 					},
 				},
 				Processors: map[string]cg.MetricsProcessor{

diff --git a/apps/cassandra.go b/apps/cassandra.go
@@ -58,7 +58,7 @@ func (r MetricsReceiverCassandra) Pipelines() []otel.Pipeline {
 
 	config := map[string]interface{}{
 		"target_system":       targetSystem,
-		"collection_interval": r.CollectionIntervalString(),
+		"collection_interval": r.CollectionInterval,
 		"endpoint":            r.Endpoint,
 		"jar_path":            jarPath,
 	}

diff --git a/apps/hostmetrics.go b/apps/hostmetrics.go
@@ -34,7 +34,7 @@ func (r MetricsReceiverHostmetrics) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "hostmetrics",
 			Config: map[string]interface{}{
-				"collection_interval": r.CollectionIntervalString(),
+				"collection_interval": r.CollectionInterval,
 				"scrapers": map[string]interface{}{
 					"cpu":        struct{}{},
 					"load":       struct{}{},

diff --git a/apps/iis.go b/apps/iis.go
@@ -34,7 +34,7 @@ func (r MetricsReceiverIis) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "windowsperfcounters",
 			Config: map[string]interface{}{
-				"collection_interval": r.CollectionIntervalString(),
+				"collection_interval": r.CollectionInterval,
 				"perfcounters": []map[string]interface{}{
 					{
 						"object":    "Web Service",

diff --git a/apps/jvm.go b/apps/jvm.go
@@ -53,7 +53,7 @@ func (r MetricsReceiverJVM) Pipelines() []otel.Pipeline {
 
 	config := map[string]interface{}{
 		"target_system":       "jvm",
-		"collection_interval": r.CollectionIntervalString(),
+		"collection_interval": r.CollectionInterval,
 		"endpoint":            r.Endpoint,
 		"jar_path":            jarPath,
 	}

diff --git a/apps/mssql.go b/apps/mssql.go
@@ -34,7 +34,7 @@ func (m MetricsReceiverMssql) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "windowsperfcounters",
 			Config: map[string]interface{}{
-				"collection_interval": m.CollectionIntervalString(),
+				"collection_interval": m.CollectionInterval,
 				"perfcounters": []map[string]interface{}{
 					{
 						"object":    "SQLServer:General Statistics",

diff --git a/apps/nginx.go b/apps/nginx.go
@@ -44,7 +44,7 @@ func (r MetricsReceiverNginx) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "nginx",
 			Config: map[string]interface{}{
-				"collection_interval": r.CollectionIntervalString(),
+				"collection_interval": r.CollectionInterval,
 				"endpoint":            r.StubStatusURL,
 			},
 		},

diff --git a/apps/redis.go b/apps/redis.go
@@ -46,7 +46,7 @@ func (r MetricsReceiverRedis) Pipelines() []otel.Pipeline {
 		Receiver: otel.Component{
 			Type: "redis",
 			Config: map[string]interface{}{
-				"collection_interval": r.CollectionIntervalString(),
+				"collection_interval": r.CollectionInterval,
 				"endpoint":            r.Address,
 				"password":            r.Password,
 			},

diff --git a/confgenerator/built-in-config-linux.yaml b/confgenerator/built-in-config-linux.yaml
@@ -13,7 +13,7 @@ metrics:
   receivers:
     hostmetrics:
       type: hostmetrics
-      collection_interval: 60s
+      collection_interval: 1m0s
   processors:
     metrics_filter:
       type: exclude_metrics

diff --git a/confgenerator/built-in-config-windows.yaml b/confgenerator/built-in-config-windows.yaml
@@ -11,13 +11,13 @@ metrics:
   receivers:
     hostmetrics:
       type: hostmetrics
-      collection_interval: 60s
+      collection_interval: 1m0s
     iis:
       type: iis
-      collection_interval: 60s
+      collection_interval: 1m0s
     mssql:
       type: mssql
-      collection_interval: 60s
+      collection_interval: 1m0s
   processors:
     metrics_filter:
       type: exclude_metrics

diff --git a/confgenerator/config.go b/confgenerator/config.go
@@ -141,18 +141,6 @@ func newValidator() *validator.Validate {
 	v.RegisterValidationCtx("platform", func(ctx context.Context, fl validator.FieldLevel) bool {
 		return ctx.Value(platformKey) == fl.Param()
 	})
-	// duration validates that the value is a valid duration and >= the parameter
-	v.RegisterValidation("duration", func(fl validator.FieldLevel) bool {
-		t, err := time.ParseDuration(fl.Field().String())
-		if err != nil {
-			return false
-		}
-		tmin, err := time.ParseDuration(fl.Param())
-		if err != nil {
-			panic(err)
-		}
-		return t >= tmin
-	})
 	// multipleof_time validates that the value duration is a multiple of the parameter
 	v.RegisterValidation("multipleof_time", func(fl validator.FieldLevel) bool {
 		t, ok := fl.Field().Interface().(time.Duration)
@@ -372,15 +360,7 @@ type MetricsReceiver interface {
 }
 
 type MetricsReceiverShared struct {
-	CollectionInterval string `yaml:"collection_interval" validate:"required,duration=10s"` // time.Duration format
-}
-
-func (m MetricsReceiverShared) CollectionIntervalString() string {
-	// TODO: Remove when https://github.com/goccy/go-yaml/pull/246 is merged
-	if m.CollectionInterval != "" {
-		return m.CollectionInterval
-	}
-	return "60s"
+	CollectionInterval time.Duration `yaml:"collection_interval" validate:"required,min=10s"` // time.Duration format
 }
 
 var MetricsReceiverTypes = &componentTypeRegistry{

diff --git a/...d/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error b/...d/linux/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error
@@ -1,4 +1,4 @@
-[5:28] "collection_interval" must be a duration of at least 10s
+[5:28] "collection_interval" must be a minimum of 10s
    2 |   receivers:
    3 |     receiver_1:
    4 |       type: hostmetrics

diff --git a/...valid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error b/...valid/linux/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error
@@ -1,9 +1 @@
-[5:28] "collection_interval" must be a duration of at least 10s
-   2 |   receivers:
-   3 |     receiver_1:
-   4 |       type: hostmetrics
->  5 |       collection_interval: 24
-                                  ^
-   6 |   service:
-   7 |     pipelines:
-   8 |       default_pipeline:
+cannot unmarshal uint64 into Go struct field UnifiedConfig.Metrics of type time.Duration
diff --git a/...windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error b/...windows/metrics-receiver_invalid_parameter_collection_interval_below_minimum/golden_error
@@ -1,4 +1,4 @@
-[5:28] "collection_interval" must be a duration of at least 10s
+[5:28] "collection_interval" must be a minimum of 10s
    2 |   receivers:
    3 |     receiver_1:
    4 |       type: hostmetrics

diff --git a/...lid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error b/...lid/windows/metrics-receiver_invalid_parameter_malformed_collection_interval/golden_error
@@ -1,9 +1 @@
-[5:28] "collection_interval" must be a duration of at least 10s
-   2 |   receivers:
-   3 |     receiver_1:
-   4 |       type: hostmetrics
->  5 |       collection_interval: 24
-                                  ^
-   6 |   service:
-   7 |     pipelines:
-   8 |       default_pipeline:
+cannot unmarshal uint64 into Go struct field UnifiedConfig.Metrics of type time.Duration
diff --git a/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf b/...tor/testdata/valid/linux/all-backward_compatible_with_explicit_exporters/golden_otel.conf
@@ -344,7 +344,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf b/confgenerator/testdata/valid/linux/all-built_in_config/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf b/confgenerator/testdata/valid/linux/all-user_config_file_deleted/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-custom_log_level/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-default_overrides_disable_all/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-pipeline_multiple_pipelines/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-processor_order/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf b/.../testdata/valid/linux/logging-processor_parse_json_and_parse_regex_types/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/...tdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf b/...tdata/valid/linux/logging-processor_parse_regex_type_on_default_pipeline/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_apache_refresh_interval/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_cassandra/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/...nerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf b/...nerator/testdata/valid/linux/logging-receiver_cassandra_refresh_interval/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_files_refresh_interval/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/...ator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf b/...ator/testdata/valid/linux/logging-receiver_files_type_multiple_receivers/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_mysql/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_mysql_refresh_interval/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_nginx/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_nginx_refresh_interval/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}

diff --git a/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf b/confgenerator/testdata/valid/linux/logging-receiver_redis/golden_otel.conf
@@ -349,7 +349,7 @@ processors:
     - gce
 receivers:
   hostmetrics/default__pipeline_hostmetrics:
-    collection_interval: 60s
+    collection_interval: 1m0s
     scrapers:
       cpu: {}
       disk: {}