diff --git a/go.mod b/go.mod index c61de167af..0589803400 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-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 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240819205202-d503b27f9cb8 ) -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/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240819205202-d503b27f9cb8 replace ( - 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 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240819205202-d503b27f9cb8 ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240819205202-d503b27f9cb8 // 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-20240814153608-54274089671b + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240819205202-d503b27f9cb8 ) -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/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240819205202-d503b27f9cb8 replace ( - 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 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240819205202-d503b27f9cb8 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240819205202-d503b27f9cb8 ) // 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-20240814153608-54274089671b + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240819205202-d503b27f9cb8 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-20240814153608-54274089671b // indirect + github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240819205202-d503b27f9cb8 // 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 7be028f49a..40cdce12a9 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-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/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240819205202-d503b27f9cb8 h1:3lU5iw2cZL2k13tY8N9amCklqFDtSCKRszsdp0IPxYo= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:f9JwM/LQdKH8ZbYoH9TO35rmjM6WoTNlhWtYJ3YZucc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240819205202-d503b27f9cb8 h1:iNPBQIxYZjNzyFnV4TwFsuD/Qwr8qzyk4BuQ2O4UREA= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:LPWBVdTSNbZkk80v6aCUthS59cnR4VauVRdAIE3ifaY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240819205202-d503b27f9cb8 h1:8hjO3eKUkaEAsrVJs++xIS05o7ZAC4CakytzD61z9RY= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:GNeNylfr5KMt55XowzSdgbP7z8CkIAfIHtWSd+xxtws= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240819205202-d503b27f9cb8 h1:/tRumIT8yfxXGNnIQP1oYle4nafoNS4HypY/xPSlfSo= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:/RaNSxxO06niapGT00snMdgFfjjjW/kV3TZGX8kHuwM= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240819205202-d503b27f9cb8 h1:NWvIgaAwIh7AsD9s7XOVqRWpPdOdq19vVzORhuR+KKk= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:hRZt1DsvoLDIYBwjFvjwg/9IkaBXeCPG0QI57wbj98Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240819205202-d503b27f9cb8 h1:7i5NK+xo4FmlFxKlrR2n9dDrQlB3cE22ZLyiTuvDgFM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:YL1Y62PxJ7dem1ZBUqCfvbnePaGr5p7DTSyOXSCi6O4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240819205202-d503b27f9cb8 h1:NCCxvKXUpEOv4q+vtsMmjoqWgXEZnuIqAdzbLkqH4wo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:LT+qAyMutoADv2qezO+vkm/BkxR88qEfXdF2d13mV+E= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240819205202-d503b27f9cb8 h1:N0bvSPyd+i0i1NUHrL8Z0ZsvtPD3Hd2DsoEn3lbYciQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:SkscNdWANcuDJ7PkjS5wurSTAuY69nqP0I+cEVY9Ryw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240819205202-d503b27f9cb8 h1:keUgEdagulbdO1Q/a60RAoJvi6RRirTIL3bwAzosO1g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:/TOECDME2jYRPY21CrpTX2eMADJdkmBFBXc1lV/nRZA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240819205202-d503b27f9cb8 h1:h5P0I+hC1KY0P5J3rbrcLXtUlERqmUdUbgSivLKnxx0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:J08A2gx8VFQfuoBiEfZ6uHIkMtVLd0OuRe5pP88b3I0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240819205202-d503b27f9cb8 h1:PzpYJPmH8aUw7q4XTJF4BUq1l2y/vU4upP06KpCTbuU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:+w647+1nLYvZWdk24gZWvdl/kFowbe2iDyISXLDYdmQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240819205202-d503b27f9cb8 h1:0IyQL+TYpd8CWyRmyyIDZdGRpXBSQUx04MIcpcl4Fh0= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:WkLIVRD7DNz7zNXQ6CyTajsJFhsV52hgNovjr6fVm1g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240819205202-d503b27f9cb8 h1:6190sM6EhAG8ujQQeKYdCgIDaTgR6YYw3vUlFzEYfeI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:VS66oUydCMwiWl1BFmLs7iNy4lGsfVYsriXr/d1fpAk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240819205202-d503b27f9cb8 h1:9JBb8DQ54mCz+IRnBXHRXp9aqZRxonUkMYunBEziLzA= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:4qvmHiXPOkOXJdpmmxMqprb2BXxOGPgOG45BwLdipUM= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240819205202-d503b27f9cb8 h1:5j4+YkIazcy86LWbRuipRiMlA65za/lpRIgrXo97j3I= +github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:t/hYoRTnlPuRjh8y0BwVGgNvNIXpU2QJME5YVppUUHQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240819205202-d503b27f9cb8 h1:HwZu8HMEAaPkPnBmMzu0ULabw8gHkXDA4iRzbe/ffW0= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:2NSghK+mafMGxM8c4Gff8qcprdMD3YQebZtD9UAdB3E= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240819205202-d503b27f9cb8 h1:Bo1Z7YuN7eou75S6sygp0246mnxS0K5vacQtVmwqDCU= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:21nuEQl7YYeLkVrGGvxPXkljqjR40teBCG5trGZ5LxM= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240819205202-d503b27f9cb8 h1:JD5Z5wRQmrN5DDX4nFlX2l/ag6zg8M2PwnKi+zpuHQw= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:TgRVPbdaFu8pWg4H5yCqVznsRVe8wQJRfEeUpduTKT8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240819205202-d503b27f9cb8 h1:ovFHFRDMGc7+D3uo7v/bzKnber2SD4mbDUaU05KTuFo= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:tvoacZuBVf9lftcH2O6rKjumRCFAy+ycjKk3QJFaFXQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240819205202-d503b27f9cb8 h1:1SjHVUpH/bF+1fvNpZZpDv61G08U9B+548OHwsE18nE= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:igQaQJt7eA/y3dZ2VLXVql+6k/ZXBgrAa2y9FrMMIKQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240819205202-d503b27f9cb8 h1:dAA0qSsKEL3knhniA7RHCwF5z7pLcFPaHIPpD4pEciE= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20240819205202-d503b27f9cb8/go.mod h1:NfNPpD1AYb1Z8C/0iNtViQUmI8Nzxnr3Q4RY9EreG5c= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240819205202-d503b27f9cb8 h1:W6j8bMKOPNfQh3Yq7xZnMZHHcRuoISIrZ9SjuNcIgg8= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20240819205202-d503b27f9cb8/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_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml index 9de5eab73d..4e708dc83a 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_config.yaml @@ -181,6 +181,10 @@ exporters: - node_interface_network_tx_dropped - node_diskio_io_service_bytes_total - node_diskio_io_serviced_total + - hyper_pod_node_health_status_schedulable + - hyper_pod_node_health_status_unschedulable_pending_replacement + - hyper_pod_node_health_status_unschedulable_pending_reboot + - hyper_pod_node_health_status_unschedulable - dimensions: - - ClusterName - InstanceId 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 bce07e028b..b87af1cda9 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml @@ -188,6 +188,10 @@ exporters: - node_interface_network_tx_dropped - node_diskio_io_service_bytes_total - node_diskio_io_serviced_total + - hyper_pod_node_health_status_schedulable + - hyper_pod_node_health_status_unschedulable_pending_replacement + - hyper_pod_node_health_status_unschedulable_pending_reboot + - hyper_pod_node_health_status_unschedulable - dimensions: - - ClusterName - InstanceId diff --git a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml index f08832cedf..c01e8fbe00 100644 --- a/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml +++ b/translator/tocwconfig/sampleConfig/kubernetes_on_prem_config.yaml @@ -148,6 +148,10 @@ exporters: - node_interface_network_tx_dropped - node_diskio_io_service_bytes_total - node_diskio_io_serviced_total + - hyper_pod_node_health_status_schedulable + - hyper_pod_node_health_status_unschedulable_pending_replacement + - hyper_pod_node_health_status_unschedulable_pending_reboot + - hyper_pod_node_health_status_unschedulable - dimensions: - - ClusterName - InstanceId diff --git a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml index 0e8e1011c1..dfe8901351 100644 --- a/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml +++ b/translator/tocwconfig/sampleConfig/logs_and_kubernetes_config.yaml @@ -179,6 +179,10 @@ exporters: - node_interface_network_tx_dropped - node_diskio_io_service_bytes_total - node_diskio_io_serviced_total + - hyper_pod_node_health_status_schedulable + - hyper_pod_node_health_status_unschedulable_pending_replacement + - hyper_pod_node_health_status_unschedulable_pending_reboot + - hyper_pod_node_health_status_unschedulable - dimensions: - - ClusterName - InstanceId diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go index 0fc5c79ad5..a98835932c 100644 --- a/translator/translate/otel/exporter/awsemf/kubernetes.go +++ b/translator/translate/otel/exporter/awsemf/kubernetes.go @@ -168,6 +168,8 @@ func getNodeMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDecla MetricNameSelectors: []string{ "node_interface_network_rx_dropped", "node_interface_network_tx_dropped", "node_diskio_io_service_bytes_total", "node_diskio_io_serviced_total", + "hyper_pod_node_health_status_schedulable", "hyper_pod_node_health_status_unschedulable_pending_replacement", + "hyper_pod_node_health_status_unschedulable_pending_reboot", "hyper_pod_node_health_status_unschedulable", }, }, } diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go index b90367039c..a038b8e561 100644 --- a/translator/translate/otel/exporter/awsemf/translator_test.go +++ b/translator/translate/otel/exporter/awsemf/translator_test.go @@ -329,7 +329,10 @@ func TestTranslator(t *testing.T) { }, MetricNameSelectors: []string{ "node_interface_network_rx_dropped", "node_interface_network_tx_dropped", - "node_diskio_io_service_bytes_total", "node_diskio_io_serviced_total"}, + "node_diskio_io_service_bytes_total", "node_diskio_io_serviced_total", + "hyper_pod_node_health_status_schedulable", "hyper_pod_node_health_status_unschedulable_pending_replacement", + "hyper_pod_node_health_status_unschedulable_pending_reboot", + "hyper_pod_node_health_status_unschedulable"}, }, { Dimensions: [][]string{{"NodeName", "InstanceId", "ClusterName"}, {"ClusterName"}},