Updates default collection interval to -1 for awscontainerinsightsreceiver and awscontainerinsightkueuereceiver

TravisStark · TravisStark · commit 8a83b08dd53e · 2025-07-22T08:28:45.000-04:00
diff --git a/go.mod b/go.mod
@@ -42,11 +42,11 @@ replace (
 replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250717174233-f514045fc484
 
 replace (
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250717174233-f514045fc484
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250717174233-f514045fc484
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250721131320-b5bbe3bd1873
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250721131320-b5bbe3bd1873
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20250717174233-f514045fc484
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20250717174233-f514045fc484
-	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250717174233-f514045fc484
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250721131320-b5bbe3bd1873
 )
 
 // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957
diff --git a/go.sum b/go.sum
@@ -229,16 +229,16 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/pr
 github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20250717174233-f514045fc484/go.mod h1:7prJseoHF7mXXAPdU+q1zoZdVOclFZsgNhoBriqBIp0=
 github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250717174233-f514045fc484 h1:cFRXqozAwclrrSJD/1fwrrebwNNVL8sAPvewZSmYl0k=
 github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20250717174233-f514045fc484/go.mod h1:K8inysgi51ecddal8W6MPqrYcjh65wm1PsVDV+zgCEA=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250717174233-f514045fc484 h1:KkQR49FSmepOqBfze1zNBmAi06DUUSQzOS+lzQkSPTY=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250717174233-f514045fc484/go.mod h1:78qZtZnv6jO7K56d1OUMtgTcH0rPcb4N8Zp4/EiMJ0o=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250717174233-f514045fc484 h1:NqDlh14x1674xIAnLC3iCvEmaLeGEorAzzWopMKAW9o=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250717174233-f514045fc484/go.mod h1:GipgrS7Hgv0MgjQ6c2CrEti5kWKsXSaqB+E2XrHmiy4=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250721131320-b5bbe3bd1873 h1:8SriTFa1DpZ1O+SA4UN5poiWBzswE5HZASo5KmIloDo=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20250721131320-b5bbe3bd1873/go.mod h1:78qZtZnv6jO7K56d1OUMtgTcH0rPcb4N8Zp4/EiMJ0o=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250721131320-b5bbe3bd1873 h1:FtH0ZsoPsGoN2wePoIOY/sybhbvo9nyS01NhqpbXoys=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20250721131320-b5bbe3bd1873/go.mod h1:GipgrS7Hgv0MgjQ6c2CrEti5kWKsXSaqB+E2XrHmiy4=
 github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20250717174233-f514045fc484 h1:7Eq8GHafdPwuj/zruhctXzYyhtXUmp0FVAcsHX0V6Co=
 github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20250717174233-f514045fc484/go.mod h1:iNL2C4bugyDA/nYSAu4O68xD859BudOWGd0+03+lWVs=
 github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20250717174233-f514045fc484 h1:ot2Q8zo4EQBwhCIOht3XkuRYkBsJhddWBQrng37LFWQ=
 github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20250717174233-f514045fc484/go.mod h1:tEB7CZP8f7qVEWH9y3F2sbI5EcvICSW3sZOFwXRge5U=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250717174233-f514045fc484 h1:hh+kKCO1UBFIvDIF4pxiwSbixO3AfbjOc36z6uuXujE=
-github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250717174233-f514045fc484/go.mod h1:Tc/PSUfe91PN6BoGKEHFo6V0gb23gxp7QLTdsrK2meI=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250721131320-b5bbe3bd1873 h1:sY5RiiJU7o3mEApYF6bwhtZoeZ3NNhxxxqs6n1Pv4QA=
+github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20250721131320-b5bbe3bd1873/go.mod h1:Tc/PSUfe91PN6BoGKEHFo6V0gb23gxp7QLTdsrK2meI=
 github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ=
 github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9/go.mod h1:eliMa/PW+RDr2QLWRmLH1R1ZA4RInpmvOzDDXtaIZkc=
 github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
diff --git a/translator/translate/otel/receiver/adapter/translator.go b/translator/translate/otel/receiver/adapter/translator.go
@@ -24,11 +24,11 @@ type translator struct {
 	// See otel.ConfigKey.
 	cfgKey string
 
-	// preferMetricCollectionInterval is an option to using the preferaable metric collection interval before
+	// preferMetricCollectionInterval is an option to using the preferable metric collection interval before
 	// using the interval key chain and defaultMetricCollectionInterval
 	preferMetricCollectionInterval time.Duration
 
-	// defaultMetricCollectionInterval is the fallback interval if it
+	// defaultMetricCollectionInterval is the fallback interval if
 	// it is not present in the interval keychain.
 	defaultMetricCollectionInterval time.Duration
 }
diff --git a/translator/translate/otel/receiver/adapter/translators.go b/translator/translate/otel/receiver/adapter/translators.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	defaultMetricsCollectionInterval = -1
+	defaultMetricsCollectionInterval = time.Minute
 	ebsPrefix                        = "ebs_"
 )
 
diff --git a/translator/translate/otel/receiver/awscontainerinsight/translator.go b/translator/translate/otel/receiver/awscontainerinsight/translator.go
@@ -32,7 +32,7 @@ const (
 	ecs = "ecs"
 	eks = "eks"
 
-	defaultMetricsCollectionInterval = -1
+	defaultMetricsCollectionInterval = -1 * time.Minute        // default to -1 to use default value defined in receiver
 	defaultLeaderLockName            = "cwagent-clusterleader" // To maintain backwards compatability with https://github.com/aws/amazon-cloudwatch-agent/blob/2dd89abaab4590cffbbc31ef89319b62809b09d1/plugins/inputs/k8sapiserver/k8sapiserver.go#L30
 )
 
diff --git a/translator/translate/otel/receiver/awscontainerinsightskueue/translator.go b/translator/translate/otel/receiver/awscontainerinsightskueue/translator.go
@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	defaultMetricsCollectionInterval = -1
+	defaultMetricsCollectionInterval = -1 * time.Minute // default to -1 to use default value defined in receiver
 )
 
 type translator struct {
diff --git a/translator/translate/otel/receiver/awsebsnvme/translator.go b/translator/translate/otel/receiver/awsebsnvme/translator.go
@@ -21,7 +21,7 @@ var (
 )
 
 const (
-	defaultCollectionInterval = -1 // default to -1 to use default value defined in receiver
+	defaultCollectionInterval = time.Minute
 	diskIOPrefix              = "diskio_"
 	ebsPrefix                 = diskIOPrefix + "ebs_"
 )

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`const (`
`29`		`- defaultMetricsCollectionInterval = -1`
	`29`	`+ defaultMetricsCollectionInterval = time.Minute`
`30`	`30`	`ebsPrefix = "ebs_"`
`31`	`31`	`)`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ const (`
`32`	`32`	`ecs = "ecs"`
`33`	`33`	`eks = "eks"`
`34`	`34`
`35`		`- defaultMetricsCollectionInterval = -1`
	`35`	`+ defaultMetricsCollectionInterval = -1 * time.Minute // default to -1 to use default value defined in receiver`
`36`	`36`	`defaultLeaderLockName = "cwagent-clusterleader" // To maintain backwards compatability with https://github.com/aws/amazon-cloudwatch-agent/blob/2dd89abaab4590cffbbc31ef89319b62809b09d1/plugins/inputs/k8sapiserver/k8sapiserver.go#L30`
`37`	`37`	`)`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`const (`
`19`		`- defaultMetricsCollectionInterval = -1`
	`19`	`+ defaultMetricsCollectionInterval = -1 * time.Minute // default to -1 to use default value defined in receiver`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`type translator struct {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ var (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`24`		`- defaultCollectionInterval = -1 // default to -1 to use default value defined in receiver`
	`24`	`+ defaultCollectionInterval = time.Minute`
`25`	`25`	`diskIOPrefix = "diskio_"`
`26`	`26`	`ebsPrefix = diskIOPrefix + "ebs_"`
`27`	`27`	`)`