diff --git a/go.mod b/go.mod index a82c3ea889..fca6d675b1 100644 --- a/go.mod +++ b/go.mod @@ -7,38 +7,38 @@ replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.2024 // Replace with https://github.com/amazon-contributing/opentelemetry-collector-contrib, there are no requirements for all receivers/processors/exporters // to be all replaced since there are some changes that will always be from upstream replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240801174630-e08453fb681f + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240814153608-54274089671b ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240801174630-e08453fb681f +replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240814153608-54274089671b replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240801174630-e08453fb681f + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240814153608-54274089671b ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240801174630-e08453fb681f + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240814153608-54274089671b // Replace with contrib to revert upstream change https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/20519 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240801174630-e08453fb681f + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240814153608-54274089671b ) -replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240801174630-e08453fb681f +replace github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240814153608-54274089671b replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240801174630-e08453fb681f - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240801174630-e08453fb681f + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240814153608-54274089671b ) // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957 @@ -89,7 +89,7 @@ replace github.com/aws/aws-sdk-go => github.com/aws/aws-sdk-go v1.48.6 require ( github.com/BurntSushi/toml v1.3.2 github.com/Jeffail/gabs v1.4.0 - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240801174630-e08453fb681f + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240814153608-54274089671b github.com/aws/aws-sdk-go v1.53.11 github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.30.2 github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 @@ -192,7 +192,7 @@ require ( github.com/alecthomas/participle v0.4.1 // indirect github.com/alecthomas/participle/v2 v2.1.1 // indirect github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect - github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240801174630-e08453fb681f // indirect + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240814153608-54274089671b // indirect github.com/antchfx/jsonquery v1.1.5 // indirect github.com/antchfx/xmlquery v1.3.9 // indirect github.com/antchfx/xpath v1.2.0 // indirect diff --git a/go.sum b/go.sum index b5e93a8962..16ae70f31f 100644 --- a/go.sum +++ b/go.sum @@ -177,50 +177,50 @@ github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483/go.mod h1:RcDobYh8k5VP6TNybz9m++gL3ijVI5wueVr0EM10VsU= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240801174630-e08453fb681f h1:PqWKAXvOs3Aevj4a4MWrxpbsEij0qRggTGp4LeLyIFA= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240801174630-e08453fb681f/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240801174630-e08453fb681f h1:f/vNTuxrk+qmo2SugJnNknQuArGRazjzglaQoZkRc1c= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240801174630-e08453fb681f/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240801174630-e08453fb681f h1:6t6//SHAwXK2V94MuxLEzmpjnhSyaeSnpDzqboHiMF0= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240801174630-e08453fb681f/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240801174630-e08453fb681f h1:/8f4So+qI4klFbEsHwwRr00egj0bwSebctvfcparHUQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240801174630-e08453fb681f/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240801174630-e08453fb681f h1:rc/Ux0GFnOHS+soaGGOnYkkqjlWM3NHBkHnwFM8yRkg= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240801174630-e08453fb681f/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240801174630-e08453fb681f h1:VrJJyh1yw+VxWl5W4txtojZJy4Qwy2orioGSmCfODEA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240801174630-e08453fb681f/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240801174630-e08453fb681f h1:auodWG+DtAxfUrRgC4X7kPnSigeI54U2KvhztdaC+E4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240801174630-e08453fb681f/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240801174630-e08453fb681f h1:vI7tbcmKUZoTeZnJeYZTZ0WismjnayLgU3vRQtGKn3g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240801174630-e08453fb681f/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240801174630-e08453fb681f h1:S5gDuyRsO146ORVAilgaxA3wdvUo5egIpgL+CLXh1qM= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240801174630-e08453fb681f/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240801174630-e08453fb681f h1:WAqRd7LCBJAkAmbVKbYF0QzrV1kMDfIvKoPt0hE7FUA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240801174630-e08453fb681f/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240801174630-e08453fb681f h1:92qxb0kCwaGpRKkZXCkQjtHa3nn5X98C58XxqA+3iYY= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240801174630-e08453fb681f/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240801174630-e08453fb681f h1:fHez4mb6ssd8MRfYkeBAYBP432pp/I9IX5SCcpwf6yg= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240801174630-e08453fb681f/go.mod h1:WkLIVRD7DNz7zNXQ6CyTajsJFhsV52hgNovjr6fVm1g= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240801174630-e08453fb681f h1:4ZWiHNfjS6n6xb1uWC6MHR+yhdl7PyuI02l6ZCLWeBs= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240801174630-e08453fb681f/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240801174630-e08453fb681f h1:tQeYqCjYwH5IisoHRHmRXGarZV/Unwb9cTDLleZ9G4A= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240801174630-e08453fb681f/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240801174630-e08453fb681f h1:U7zRqrOBMClLENwcasczR254US0op3MlKFjnNoDaxeg= -github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240801174630-e08453fb681f/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240801174630-e08453fb681f h1:f5ewI3fLsCKFhw7G4YufgtSKyWJvvLwxG0d10lh+kBM= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240801174630-e08453fb681f/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240801174630-e08453fb681f h1:lqk1TkgI/9wmTf7Y7knRTOeZ4fMWnhGkdgd+24WBvsE= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240801174630-e08453fb681f/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240801174630-e08453fb681f h1:EiLWJr7DeLb9zdYLyiQEcWeJyQKyjtql3RGakVGB9Vo= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240801174630-e08453fb681f/go.mod h1:TgRVPbdaFu8pWg4H5yCqVznsRVe8wQJRfEeUpduTKT8= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240801174630-e08453fb681f h1:mX3vysBfqs6K8z2Yll7Ty7ndqYgLnSf469N/5Y0Lzgg= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240801174630-e08453fb681f/go.mod h1:tvoacZuBVf9lftcH2O6rKjumRCFAy+ycjKk3QJFaFXQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240801174630-e08453fb681f h1:34RS/ytE8dYuPRrxodmLNHf3ziTMXmO+brFVl3jjPt4= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240801174630-e08453fb681f/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240801174630-e08453fb681f h1:KhlZ2nFC/re7OO+8kyjAoOvM/Rum17/vZXhzttMCbNE= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240801174630-e08453fb681f/go.mod h1:NfNPpD1AYb1Z8C/0iNtViQUmI8Nzxnr3Q4RY9EreG5c= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240801174630-e08453fb681f h1:YhkYxnxXy2e4ZUZOVNpHPxVMbCUOuu2T6t9Pqcv2Dlc= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240801174630-e08453fb681f/go.mod h1:FMPwht01yV4UvBAWkPFO/5jAkGFtfsmz1TRaoYgWeqU= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240814153608-54274089671b h1:fjQb8CKWfuOHg9iAHiBB2myNwn+qdWysXhmXWwO9JHM= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240814153608-54274089671b/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240814153608-54274089671b h1:dd1lgAXMoyN2n71K69HtEDUducf9nhHJS6Fu7EgjuA4= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240814153608-54274089671b/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240814153608-54274089671b h1:BA3xye28/jI/wdyE0HIzTa/czP8nXbqkB693ZNLN8OU= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240814153608-54274089671b/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240814153608-54274089671b h1:+5v9B2VjIbhF8TTVqcn3DbloI0D4DLvhDiMx5Vc4cDs= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240814153608-54274089671b/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240814153608-54274089671b h1:wyjvxNMK97SCqAU+ONkePjMafDwPq/zBPTCyms2FD80= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240814153608-54274089671b/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240814153608-54274089671b h1:v2MHxgTcBAsT7TC6UqmVbOl85eR/ZFA7KwgbeZCTJec= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240814153608-54274089671b/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240814153608-54274089671b h1:rlPOLZ3WVG1DchFnPNW9iiYH9gqMYcOOBPe0UpsmiuQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240814153608-54274089671b/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240814153608-54274089671b h1:nthATp3FOL1XvI1cyny571b1hmrK5uu6vHOzHrfh4jk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240814153608-54274089671b/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240814153608-54274089671b h1:GI/nHdjzI/+GUhSAx8iFfKz/WRJU6oLfYeMCdBbm1G4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240814153608-54274089671b/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240814153608-54274089671b h1:c7YFk21hZZgYcyh3/qxR4nmTqnYsjnJ7jSeHQ45IP/A= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240814153608-54274089671b/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240814153608-54274089671b h1:RPexNTFFv6wGOjQUK0Enx4p/sxaXY0VRIWZVhz5HUnI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240814153608-54274089671b/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240814153608-54274089671b h1:7wRm+qFlK3BI+cBRWe7jCXTgiJh+AvjBSSkA5v/waPk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240814153608-54274089671b/go.mod h1:WkLIVRD7DNz7zNXQ6CyTajsJFhsV52hgNovjr6fVm1g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240814153608-54274089671b h1:tlagxWDhrw+Gac4dWfSfZ6EcnMRSYzHlTdF4mfgsknk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240814153608-54274089671b/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240814153608-54274089671b h1:NaYkiGyHvYq2MTxIzxv6QzUQTF7RRM2EiRoBYGtUseU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240814153608-54274089671b/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240814153608-54274089671b h1:tzF6mPXvUC90pEfo/QMccLMgAnBMHusijIFokYrhHnk= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240814153608-54274089671b/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240814153608-54274089671b h1:SkjMiyw45LTlQuT+wFdPAxv13PrLyDi5yEES9yppHqU= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240814153608-54274089671b/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240814153608-54274089671b h1:m93kR04JHmRxOn7WUfQoij0d/Xbha7VptQhhxTeszew= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240814153608-54274089671b/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240814153608-54274089671b h1:SlUveg6cAwzgV9SqsneTsQTjyMeGINl8k8UrY05iCJo= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240814153608-54274089671b/go.mod h1:TgRVPbdaFu8pWg4H5yCqVznsRVe8wQJRfEeUpduTKT8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240814153608-54274089671b h1:n1wCD/AzsThTtVzQW/aXcK1YFgu4QGc6YCpfa3hs0hs= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240814153608-54274089671b/go.mod h1:tvoacZuBVf9lftcH2O6rKjumRCFAy+ycjKk3QJFaFXQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240814153608-54274089671b h1:Sd9y9VrSo6enRQytIQ7FBpnoZIReLPgNtZSeudV0p5E= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240814153608-54274089671b/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240814153608-54274089671b h1:M1mSY/iGM8t+ypVmPT2Ldcr5w13/FHlx148g6Wtf9do= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240814153608-54274089671b/go.mod h1:NfNPpD1AYb1Z8C/0iNtViQUmI8Nzxnr3Q4RY9EreG5c= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240814153608-54274089671b h1:mX7AL5Th74XOfAFKaPMHjStx7DF/mBAbim9SzZr/RME= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240814153608-54274089671b/go.mod h1:FMPwht01yV4UvBAWkPFO/5jAkGFtfsmz1TRaoYgWeqU= 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/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml index ee366f4ba2..d0cf90c564 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml @@ -144,6 +144,10 @@ exporters: - pod_container_status_waiting_reason_create_container_error - pod_container_status_waiting_reason_create_container_config_error - pod_container_status_terminated_reason_oom_killed + - pod_gpu_usage_total + - pod_gpu_request + - pod_gpu_limit + - pod_gpu_reserved_capacity - dimensions: - - ClusterName - InstanceId @@ -169,6 +173,9 @@ exporters: - node_status_condition_unknown - node_status_capacity_pods - node_status_allocatable_pods + - node_gpu_usage_total + - node_gpu_limit + - node_gpu_reserved_capacity - dimensions: - - ClusterName - InstanceId @@ -369,39 +376,6 @@ exporters: - node_gpu_memory_used - node_gpu_power_draw - node_gpu_temperature - - dimensions: - - - ClusterName - - - ClusterName - - Namespace - - - ClusterName - - Namespace - - Service - - - ClusterName - - Namespace - - PodName - - - ClusterName - - FullPodName - - Namespace - - PodName - metric_name_selectors: - - pod_gpu_total - - pod_gpu_request - - pod_gpu_limit - - dimensions: - - - ClusterName - - - ClusterName - - InstanceId - - InstanceType - - NodeName - metric_name_selectors: - - node_gpu_total - - node_gpu_request - - node_gpu_limit - - dimensions: - - - ClusterName - metric_name_selectors: - - cluster_gpu_total - - cluster_gpu_request - dimensions: - - ClusterName - - ClusterName @@ -1013,90 +987,6 @@ processors: new_label: "" new_value: "" submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_limit - match_type: "" - new_name: node_gpu_limit - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: NodeGPU - submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_limit - match_type: "" - new_name: cluster_gpu_limit - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: ClusterGPU - submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_request - match_type: "" - new_name: node_gpu_request - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: NodeGPU - submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_request - match_type: "" - new_name: cluster_gpu_request - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: ClusterGPU - submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_total - match_type: "" - new_name: node_gpu_total - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: NodeGPU - submatch_case: "" - - action: insert - aggregation_type: "" - include: pod_gpu_total - match_type: "" - new_name: cluster_gpu_total - operations: - - action: add_label - aggregation_type: "" - experimental_scale: 0 - label: "" - label_value: "" - new_label: Type - new_value: ClusterGPU - submatch_case: "" - action: update aggregation_type: "" include: neuron_hardware diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go index 25367d7d0e..9d8fa1bedd 100644 --- a/translator/translate/otel/exporter/awsemf/kubernetes.go +++ b/translator/translate/otel/exporter/awsemf/kubernetes.go @@ -104,7 +104,9 @@ func getPodMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar "pod_container_status_waiting_reason_image_pull_error", "pod_container_status_waiting_reason_start_error", "pod_container_status_waiting_reason_create_container_error", "pod_container_status_waiting_reason_create_container_config_error", "pod_container_status_terminated_reason_oom_killed", }...) - + if awscontainerinsight.AcceleratedComputeMetricsEnabled(conf) { + selectors = append(selectors, "pod_gpu_request", "pod_gpu_limit", "pod_gpu_usage_total", "pod_gpu_reserved_capacity") + } } metricDeclaration := awsemfexporter.MetricDeclaration{ @@ -138,20 +140,25 @@ func getPodMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar return podMetricDeclarations } + func getNodeMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclaration { enhancedContainerInsightsEnabled := awscontainerinsight.EnhancedContainerInsightsEnabled(conf) + nodeMetrics := []string{ + "node_cpu_utilization", "node_memory_utilization", "node_network_total_bytes", "node_cpu_reserved_capacity", + "node_memory_reserved_capacity", "node_number_of_running_pods", "node_number_of_running_containers", + "node_cpu_usage_total", "node_cpu_limit", "node_memory_working_set", "node_memory_limit", + "node_status_condition_ready", "node_status_condition_disk_pressure", "node_status_condition_memory_pressure", + "node_status_condition_pid_pressure", "node_status_condition_network_unavailable", "node_status_condition_unknown", + "node_status_capacity_pods", "node_status_allocatable_pods", + } + if awscontainerinsight.AcceleratedComputeMetricsEnabled(conf) { + nodeMetrics = append(nodeMetrics, "node_gpu_limit", "node_gpu_usage_total", "node_gpu_reserved_capacity") + } if enhancedContainerInsightsEnabled { return []*awsemfexporter.MetricDeclaration{ { - Dimensions: [][]string{{"NodeName", "InstanceId", "ClusterName"}, {"ClusterName"}}, - MetricNameSelectors: []string{ - "node_cpu_utilization", "node_memory_utilization", "node_network_total_bytes", "node_cpu_reserved_capacity", - "node_memory_reserved_capacity", "node_number_of_running_pods", "node_number_of_running_containers", - "node_cpu_usage_total", "node_cpu_limit", "node_memory_working_set", "node_memory_limit", - "node_status_condition_ready", "node_status_condition_disk_pressure", "node_status_condition_memory_pressure", - "node_status_condition_pid_pressure", "node_status_condition_network_unavailable", "node_status_condition_unknown", - "node_status_capacity_pods", "node_status_allocatable_pods", - }, + Dimensions: [][]string{{"NodeName", "InstanceId", "ClusterName"}, {"ClusterName"}}, + MetricNameSelectors: nodeMetrics, }, { Dimensions: [][]string{ @@ -504,29 +511,6 @@ func getGPUMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar "node_gpu_temperature", }, }, - { - Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace"}, {"ClusterName", "Namespace", "Service"}, {"ClusterName", "Namespace", "PodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName"}}, - MetricNameSelectors: []string{ - "pod_gpu_total", - "pod_gpu_request", - "pod_gpu_limit", - }, - }, - { - Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "NodeName", "InstanceId", "InstanceType"}}, - MetricNameSelectors: []string{ - "node_gpu_total", - "node_gpu_request", - "node_gpu_limit", - }, - }, - { - Dimensions: [][]string{{"ClusterName"}}, - MetricNameSelectors: []string{ - "cluster_gpu_total", - "cluster_gpu_request", - }, - }, }...) } return metricDeclarations diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go index aeeaed3abe..0b89a6ac9f 100644 --- a/translator/translate/otel/exporter/awsemf/translator_test.go +++ b/translator/translate/otel/exporter/awsemf/translator_test.go @@ -310,6 +310,7 @@ func TestTranslator(t *testing.T) { "pod_container_status_running", "pod_container_status_terminated", "pod_container_status_waiting", "pod_container_status_waiting_reason_crash_loop_back_off", "pod_container_status_waiting_reason_image_pull_error", "pod_container_status_waiting_reason_start_error", "pod_container_status_waiting_reason_create_container_error", "pod_container_status_waiting_reason_create_container_config_error", "pod_container_status_terminated_reason_oom_killed", + "pod_gpu_request", "pod_gpu_limit", "pod_gpu_usage_total", "pod_gpu_reserved_capacity", }, }, { @@ -319,7 +320,7 @@ func TestTranslator(t *testing.T) { "node_cpu_usage_total", "node_cpu_limit", "node_memory_working_set", "node_memory_limit", "node_status_condition_ready", "node_status_condition_disk_pressure", "node_status_condition_memory_pressure", "node_status_condition_pid_pressure", "node_status_condition_network_unavailable", "node_status_condition_unknown", - "node_status_capacity_pods", "node_status_allocatable_pods"}, + "node_status_capacity_pods", "node_status_allocatable_pods", "node_gpu_limit", "node_gpu_usage_total", "node_gpu_reserved_capacity"}, }, { Dimensions: [][]string{ @@ -416,24 +417,6 @@ func TestTranslator(t *testing.T) { "node_gpu_utilization", "node_gpu_memory_utilization", "node_gpu_memory_total", "node_gpu_memory_used", "node_gpu_power_draw", "node_gpu_temperature", }, }, - { - Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace"}, {"ClusterName", "Namespace", "Service"}, {"ClusterName", "Namespace", "PodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName"}}, - MetricNameSelectors: []string{ - "pod_gpu_total", "pod_gpu_request", "pod_gpu_limit", - }, - }, - { - Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "NodeName", "InstanceId", "InstanceType"}}, - MetricNameSelectors: []string{ - "node_gpu_total", "node_gpu_request", "node_gpu_limit", - }, - }, - { - Dimensions: [][]string{{"ClusterName"}}, - MetricNameSelectors: []string{ - "cluster_gpu_total", "cluster_gpu_request", - }, - }, { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace", "PodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName", "NeuronDevice", "NeuronCore"}}, MetricNameSelectors: []string{ diff --git a/translator/translate/otel/processor/metricstransformprocessor/translator.go b/translator/translate/otel/processor/metricstransformprocessor/translator.go index e76a21d0cd..4b83e190fc 100644 --- a/translator/translate/otel/processor/metricstransformprocessor/translator.go +++ b/translator/translate/otel/processor/metricstransformprocessor/translator.go @@ -119,36 +119,6 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) { } } - // replicate pod level nvidia gpu count metrics _limit, _request and _total for node and cluster - for _, m := range []string{containerinsightscommon.GpuLimit, containerinsightscommon.GpuRequest, containerinsightscommon.GpuTotal} { - transformRules = append(transformRules, []map[string]interface{}{ - { - "include": containerinsightscommon.MetricName(containerinsightscommon.TypePod, m), - "action": "insert", - "new_name": containerinsightscommon.MetricName(containerinsightscommon.TypeNode, m), - "operations": append([]map[string]interface{}{ - { - "action": "add_label", - "new_label": containerinsightscommon.MetricType, - "new_value": containerinsightscommon.TypeGpuNode, - }, - }), - }, - { - "include": containerinsightscommon.MetricName(containerinsightscommon.TypePod, m), - "action": "insert", - "new_name": containerinsightscommon.MetricName(containerinsightscommon.TypeCluster, m), - "operations": append([]map[string]interface{}{ - { - "action": "add_label", - "new_label": containerinsightscommon.MetricType, - "new_value": containerinsightscommon.TypeGpuCluster, - }, - }), - }, - }...) - } - for oldName, newName := range renameMapForNeuronMonitor { var operations []map[string]interface{} if newName == containerinsightscommon.NeuronCoreUtilization {