From 3cc6b58c6fb03238d353d13893fa64f60b244356 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Tue, 4 Nov 2025 16:15:44 -0500 Subject: [PATCH 01/12] use new efa metrics otel contrib --- go.mod | 15 ++++++++------- go.sum | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 0a2dc05b9a..284584cd72 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/amazon-cloudwatch-agent -go 1.24.7 +go 1.24.9 replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.20250113150713-a2dfaa4cdf6d @@ -9,9 +9,9 @@ replace collectd.org v0.4.0 => github.com/collectd/go-collectd v0.4.0 // 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-20251014190537-ae1729ad22c4 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251014190537-ae1729ad22c4 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251014190537-ae1729ad22c4 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251104203707-4b4b3ffe94a6 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251104203707-4b4b3ffe94a6 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251104203707-4b4b3ffe94a6 ) replace ( @@ -21,7 +21,7 @@ replace ( replace ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251014190537-ae1729ad22c4 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251014190537-ae1729ad22c4 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251104203707-4b4b3ffe94a6 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251014190537-ae1729ad22c4 @@ -47,7 +47,7 @@ replace ( ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251014190537-ae1729ad22c4 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251014190537-ae1729ad22c4 @@ -236,6 +236,8 @@ require ( k8s.io/klog/v2 v2.130.1 ) +require github.com/shirou/gopsutil/v4 v4.25.3 + require ( cloud.google.com/go/auth v0.15.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect @@ -497,7 +499,6 @@ require ( github.com/rs/cors v1.11.1 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32 // indirect - github.com/shirou/gopsutil/v4 v4.25.3 // indirect github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect diff --git a/go.sum b/go.sum index 19c70558cd..06fd230dfd 100644 --- a/go.sum +++ b/go.sum @@ -185,20 +185,20 @@ github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vS github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs= 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-20251014190537-ae1729ad22c4 h1:0gvkXM8HrRo9fu+34OYLVngN87FtstrYjhIjAcOyfTA= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:8dL1mhunGsDXn59xUlnNn1ydT5wp6Fh5KTvlBEaN2Po= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251014190537-ae1729ad22c4 h1:XLDJlsz7glQ0PcWYZ9S664H2Hyy/xaRHIT5gGlQFtEk= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:dSu6d3FZqrAECatXDhvYsQIEAaL1iF+fokrPwCjxhC8= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251014190537-ae1729ad22c4 h1:jn9YrkY2ZLbpT4n6q/EkfSwGH0cx/diKBmlQcYvLTJ8= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:b9TxHHL62ladWlbU6klYIvDjCN3Ee31oWrKlF50fQns= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251104203707-4b4b3ffe94a6 h1:l1ZtspdmO2BHmINKqZRAyzd2ak8Ygjr+uppHfd8Kpas= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:h/y8k16N0t89KjloCpZS8ow/H3sd4iU4w7U7anygxcc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251104203707-4b4b3ffe94a6 h1:1mv/QrCY5c+Rr7+kt0oFwRyUzXM/SCYdcik/ZJxbGmg= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:+cEFxvejxnFAPRum2td5Ai/MbtPlMzqcMfitbNbAfCo= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251104203707-4b4b3ffe94a6 h1:rZDkYihomloh7YMF850CBDHw1ln/2GQujwQOvHA6Q74= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:UAZddgM5NKCnsVmx4msXHV3jTaJLD9LqbPmV5TctK4k= github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251014190537-ae1729ad22c4 h1:YQkkr7FxnF52KvG4CIM8a0A/7m6CIQMmtFHqfd8D/PA= github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:R66U9I7kIXbVRsxM2gzH9bbWf7YzVvsa1um7GT+6loA= github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251014190537-ae1729ad22c4 h1:TugvEECBEMzbtRq8lvaSpI3LXohMvFeYwua+R6jRi/U= github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:7q+XtzB3gsAqzQtQW4BmvufOJg4QfC7D3iuA4Qmublg= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251014190537-ae1729ad22c4 h1:pk1XtdbbpsiUcpdIOGFQUiknwhCbhz1MxEqkbPSwfXM= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:JLn0paY8Ig72gsWixOBeycpgUO96jl/GYisvxfYoFiA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251014190537-ae1729ad22c4 h1:NLJ568FXCs5tKlCs3t9qqU/oInSxjt3L7i1Tt4yxHAk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:RfV8eTcty9NU2j06sjXDD452gQt/Ug06go70E18cvOo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251104203707-4b4b3ffe94a6 h1:9RXPQsJ5t0Gsyt2j00tDzuNP0JngR2JArgaEolrTOaI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:UhjJJwNhJ2cQ1tQbFXgw3KVE4FsSp/C7KgJMr5c7Nvo= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251014190537-ae1729ad22c4 h1:1cf+GEG/X8Nnij2LOSr+PFG3JXUEvNfnHg+8pR7HbXk= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:+EUth6yb4uP18ks0zbNZCOeuQfBxpn/NBHCTmnPP9oU= github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251014190537-ae1729ad22c4 h1:JEw+nvfjnw+8MK05tOrc6IO8XCjEIG7Ek+sr6q/V5CQ= @@ -229,8 +229,8 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulat github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:Wvs2QPuB4ngUiOjrJpYWLqfU8X0Z27s33uMKP4YHQmE= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251014190537-ae1729ad22c4 h1:AbFzE4JNvrwGoyDCgmg3WiTaA1bxPc6xzJCwgHEtzNw= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:idk0SX/ZWccyRfPyAKPu1uVvd+KBMT0pE75HHFogitY= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251014190537-ae1729ad22c4 h1:kMAB6h54Q/OJDQEP+XCxjcGnyOHq/KuyGiUliGsUFJI= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:2/Yuy1ePzxKLoHdJIS/BBdWfMD+wpkudvxe1HXZuMAM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6 h1:0mNohyEAzxbfExwJjgnPcAPfuy209IzlzVQ9eWNvYsg= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4 h1:2YfnGwsnhAqUNrOsye+w2xI9rya3KT7RucYFwDDAs30= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:431fc3JgruV7R3yhAzu7w0fdPaBp1Tbn4RV+8R4Dtdw= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251014190537-ae1729ad22c4 h1:81WCB7g7vOUGs5HSNpuHrzMCXXH+XyOJHju/NkygKms= From cc6b329fa13690ea72802b970cde92291291c406 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 12 Nov 2025 11:16:11 -0500 Subject: [PATCH 02/12] add new efa metrics to metric declarations --- .../translate/otel/exporter/awsemf/kubernetes.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/translator/translate/otel/exporter/awsemf/kubernetes.go b/translator/translate/otel/exporter/awsemf/kubernetes.go index d74597bd6f..6a2137bb30 100644 --- a/translator/translate/otel/exporter/awsemf/kubernetes.go +++ b/translator/translate/otel/exporter/awsemf/kubernetes.go @@ -624,6 +624,11 @@ func getEFAMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar "container_efa_rdma_read_bytes", "container_efa_rdma_write_bytes", "container_efa_rdma_write_recv_bytes", + "container_efa_retrans_bytes", + "container_efa_retrans_pkts", + "container_efa_retrans_timeout_events", + "container_efa_impaired_remote_conn_events", + "container_efa_unresponsive_remote_events", }, }, { @@ -642,6 +647,11 @@ func getEFAMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar "pod_efa_rdma_read_bytes", "pod_efa_rdma_write_bytes", "pod_efa_rdma_write_recv_bytes", + "pod_efa_retrans_bytes", + "pod_efa_retrans_pkts", + "pod_efa_retrans_timeout_events", + "pod_efa_impaired_remote_conn_events", + "pod_efa_unresponsive_remote_events", }, }, { @@ -657,6 +667,11 @@ func getEFAMetricDeclarations(conf *confmap.Conf) []*awsemfexporter.MetricDeclar "node_efa_rdma_read_bytes", "node_efa_rdma_write_bytes", "node_efa_rdma_write_recv_bytes", + "node_efa_retrans_bytes", + "node_efa_retrans_pkts", + "node_efa_retrans_timeout_events", + "node_efa_impaired_remote_conn_events", + "node_efa_unresponsive_remote_events", }, }, } From 750b3b04afbe0c1c9022bdcaac32b8639659f33f Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 12 Nov 2025 11:33:17 -0500 Subject: [PATCH 03/12] add new efa metrics to metric declarations --- translator/translate/otel/exporter/awsemf/translator_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go index a73936d2a2..68cae22c95 100644 --- a/translator/translate/otel/exporter/awsemf/translator_test.go +++ b/translator/translate/otel/exporter/awsemf/translator_test.go @@ -494,18 +494,21 @@ func TestTranslator(t *testing.T) { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace", "PodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ "container_efa_rx_bytes", "container_efa_tx_bytes", "container_efa_rx_dropped", "container_efa_rdma_read_bytes", "container_efa_rdma_write_bytes", "container_efa_rdma_write_recv_bytes", + "container_efa_retrans_bytes", "container_efa_retrans_pkts", "container_efa_retrans_timeout_events", "container_efa_impaired_remote_conn_events", "container_efa_unresponsive_remote_events", }, }, { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace"}, {"ClusterName", "Namespace", "Service"}, {"ClusterName", "Namespace", "PodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ "pod_efa_rx_bytes", "pod_efa_tx_bytes", "pod_efa_rx_dropped", "pod_efa_rdma_read_bytes", "pod_efa_rdma_write_bytes", "pod_efa_rdma_write_recv_bytes", + "pod_efa_retrans_bytes", "pod_efa_retrans_pkts", "pod_efa_retrans_timeout_events", "pod_efa_impaired_remote_conn_events", "pod_efa_unresponsive_remote_events", }, }, { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "NodeName", "InstanceId"}, {"ClusterName", "NodeName", "InstanceId", "InstanceType", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ "node_efa_rx_bytes", "node_efa_tx_bytes", "node_efa_rx_dropped", "node_efa_rdma_read_bytes", "node_efa_rdma_write_bytes", "node_efa_rdma_write_recv_bytes", + "node_efa_retrans_bytes", "node_efa_retrans_pkts", "node_efa_retrans_timeout_events", "node_efa_impaired_remote_conn_events", "node_efa_unresponsive_remote_events", }, }, { From 8c44f49c4f95ba1a7bb9ef44d939c25c8f78182d Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Fri, 21 Nov 2025 12:46:24 -0500 Subject: [PATCH 04/12] add new efa metrics to metric declarations --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 284584cd72..ed13e9a4f2 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ replace ( ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251121173134-063b9391728f github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251014190537-ae1729ad22c4 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251014190537-ae1729ad22c4 diff --git a/go.sum b/go.sum index 06fd230dfd..5a133a61ba 100644 --- a/go.sum +++ b/go.sum @@ -231,6 +231,7 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourc github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:idk0SX/ZWccyRfPyAKPu1uVvd+KBMT0pE75HHFogitY= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6 h1:0mNohyEAzxbfExwJjgnPcAPfuy209IzlzVQ9eWNvYsg= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251121173134-063b9391728f/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4 h1:2YfnGwsnhAqUNrOsye+w2xI9rya3KT7RucYFwDDAs30= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:431fc3JgruV7R3yhAzu7w0fdPaBp1Tbn4RV+8R4Dtdw= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251014190537-ae1729ad22c4 h1:81WCB7g7vOUGs5HSNpuHrzMCXXH+XyOJHju/NkygKms= From 869a580e1f17d42d44da380d7ed83613101f2998 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Fri, 21 Nov 2025 12:51:30 -0500 Subject: [PATCH 05/12] add new efa metrics to metric declarations --- go.sum | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 5a133a61ba..81f24a97b1 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,7 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulat github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:Wvs2QPuB4ngUiOjrJpYWLqfU8X0Z27s33uMKP4YHQmE= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251014190537-ae1729ad22c4 h1:AbFzE4JNvrwGoyDCgmg3WiTaA1bxPc6xzJCwgHEtzNw= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:idk0SX/ZWccyRfPyAKPu1uVvd+KBMT0pE75HHFogitY= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6 h1:0mNohyEAzxbfExwJjgnPcAPfuy209IzlzVQ9eWNvYsg= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251104203707-4b4b3ffe94a6/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251121173134-063b9391728f h1:l9EQC8h2xmFzBEipjFy9exp6ySd3BplTijwUGna7EFg= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251121173134-063b9391728f/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4 h1:2YfnGwsnhAqUNrOsye+w2xI9rya3KT7RucYFwDDAs30= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251014190537-ae1729ad22c4/go.mod h1:431fc3JgruV7R3yhAzu7w0fdPaBp1Tbn4RV+8R4Dtdw= From a4e735925806a581ebbec14dc4aed9ea76a2c52f Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 10 Dec 2025 11:24:42 -0500 Subject: [PATCH 06/12] added new container metrics to `emf_and_kubernetes_with_gpu_config.yaml` --- .../sampleConfig/emf_and_kubernetes_with_gpu_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) 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 2777967e14..d2a9156134 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml @@ -576,6 +576,11 @@ exporters: - container_efa_rdma_read_bytes - container_efa_rdma_write_bytes - container_efa_rdma_write_recv_bytes + - container_efa_retrans_bytes + - container_efa_retrans_pkts + - container_efa_retrans_timeout_events + - container_efa_impaired_remote_conn_events + - container_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName From 30f09000bfe948234c2734c343f1d59e6014ead7 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 10 Dec 2025 11:36:07 -0500 Subject: [PATCH 07/12] added new container metrics to `emf_and_kubernetes_with_gpu_config.yaml` --- .../emf_and_kubernetes_with_gpu_config.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 ea2103ad43..f51504b054 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml @@ -607,6 +607,11 @@ exporters: - pod_efa_rdma_read_bytes - pod_efa_rdma_write_bytes - pod_efa_rdma_write_recv_bytes + - pod_efa_retrans_bytes + - pod_efa_retrans_pkts + - pod_efa_retrans_timeout_events + - pod_efa_impaired_remote_conn_events + - pod_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName @@ -624,6 +629,11 @@ exporters: - node_efa_rdma_read_bytes - node_efa_rdma_write_bytes - node_efa_rdma_write_recv_bytes + - node_efa_retrans_bytes + - node_efa_retrans_pkts + - node_efa_retrans_timeout_events + - node_efa_impaired_remote_conn_events + - node_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName From c39c30d4f803ff29ca403fc3e5f4f64b7a64758d Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 10 Dec 2025 11:36:26 -0500 Subject: [PATCH 08/12] update go.mod to point at aws-cwa-dev --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 10387bf4cd..9966684f45 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ replace ( ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251120035228-2492d12f5d81 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251120035228-2492d12f5d81 diff --git a/go.sum b/go.sum index 0824fc5608..9021043019 100644 --- a/go.sum +++ b/go.sum @@ -231,6 +231,7 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourc github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81/go.mod h1:I41hi6XJwoAAauMtkaCQBtn0Fom+HE2KbIZjxauVavU= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251120035228-2492d12f5d81 h1:DnZzlC6/znUpF3NIJhqohiS9aujUoohoHWJRVbQOYeI= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81 h1:IkRdV7B459uKNLvh4PJ0Op2w9odeqvVJRuFp5raAV0U= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:dnhJ7NI0b85XA4yBAHgkTqnC7x4LDeAIjg6I435n0Jc= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251120035228-2492d12f5d81 h1:YQnoL+5YKorzQowCyjxFdlK/6zu9B6ggAOJyTTUqw4M= From d3003b278360ef06085463c54cceb4cabae79030 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Wed, 10 Dec 2025 13:27:24 -0500 Subject: [PATCH 09/12] update go.mod to point at aws-cwa-dev --- go.sum | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.sum b/go.sum index 9021043019..a1a649ef49 100644 --- a/go.sum +++ b/go.sum @@ -229,8 +229,7 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulat github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251120035228-2492d12f5d81/go.mod h1:YTEg21QFJQ1HP9c+w1qnORKd0cLjFqlNONO4GE4RJz4= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81 h1:KrIvKabJgtBz4uoYvcL/rdexUzU4ZMnDKdLDl/pwX/E= github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81/go.mod h1:I41hi6XJwoAAauMtkaCQBtn0Fom+HE2KbIZjxauVavU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251120035228-2492d12f5d81 h1:DnZzlC6/znUpF3NIJhqohiS9aujUoohoHWJRVbQOYeI= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589 h1:no7oYyHYQkLQDYcw7LKumepGwrYqiiIy9vHmFF5XO2s= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81 h1:IkRdV7B459uKNLvh4PJ0Op2w9odeqvVJRuFp5raAV0U= github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:dnhJ7NI0b85XA4yBAHgkTqnC7x4LDeAIjg6I435n0Jc= From 4562e3eb1d03c6e78451c0f0d0fb9b9fae1eb63b Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Thu, 11 Dec 2025 13:44:03 -0500 Subject: [PATCH 10/12] Updated otel dependencies --- go.mod | 68 ++++++++++++++-------------- go.sum | 140 +++++++++++++++++++++++++++++---------------------------- 2 files changed, 106 insertions(+), 102 deletions(-) diff --git a/go.mod b/go.mod index 9966684f45..3668cd41cf 100644 --- a/go.mod +++ b/go.mod @@ -9,49 +9,49 @@ replace collectd.org v0.4.0 => github.com/collectd/go-collectd v0.4.0 // 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-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter => github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251211175346-5faee86d9fde ) replace ( - github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251120035228-2492d12f5d81 + github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy => github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251211175346-5faee86d9fde ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders => github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251211175346-5faee86d9fde ) replace ( // For clear resource attributes after copy functionality https://github.com/amazon-contributing/opentelemetry-collector-contrib/pull/148 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251211175346-5faee86d9fde // 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-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus => github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20251211175346-5faee86d9fde ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor => github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251211175346-5faee86d9fde ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251120035228-2492d12f5d81 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251120035228-2492d12f5d81 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251211175346-5faee86d9fde + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251211175346-5faee86d9fde ) // Temporary fix, pending PR https://github.com/shirou/gopsutil/pull/957 @@ -223,10 +223,10 @@ require ( go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 - golang.org/x/net v0.39.0 - golang.org/x/sync v0.13.0 - golang.org/x/sys v0.32.0 - golang.org/x/text v0.24.0 + golang.org/x/net v0.47.0 + golang.org/x/sync v0.19.0 + golang.org/x/sys v0.39.0 + golang.org/x/text v0.32.0 gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 @@ -592,12 +592,12 @@ require ( go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/zap/exp v0.3.0 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/crypto v0.37.0 // indirect - golang.org/x/mod v0.24.0 // indirect + golang.org/x/crypto v0.46.0 // indirect + golang.org/x/mod v0.30.0 // indirect golang.org/x/oauth2 v0.28.0 // indirect - golang.org/x/term v0.31.0 // indirect + golang.org/x/term v0.38.0 // indirect golang.org/x/time v0.11.0 // indirect - golang.org/x/tools v0.32.0 // indirect + golang.org/x/tools v0.39.0 // indirect gonum.org/v1/gonum v0.16.0 // indirect google.golang.org/api v0.226.0 // indirect google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 // indirect diff --git a/go.sum b/go.sum index a1a649ef49..88250eb441 100644 --- a/go.sum +++ b/go.sum @@ -185,60 +185,60 @@ github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b h1:mimo19zliBX/vS github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs= 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-20251120035228-2492d12f5d81 h1:700g7RXb839DLDU6dStnAfZGDyFoaWKKrdUohuf2gEQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251120035228-2492d12f5d81/go.mod h1:h/y8k16N0t89KjloCpZS8ow/H3sd4iU4w7U7anygxcc= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251120035228-2492d12f5d81 h1:DKWTnySqwmPXqFUbU+ySMZn2Wx1B7s/gu5hvc1W2GDw= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251120035228-2492d12f5d81/go.mod h1:+cEFxvejxnFAPRum2td5Ai/MbtPlMzqcMfitbNbAfCo= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251120035228-2492d12f5d81 h1:SQxGihFFHOLQdTSLTdKcS96ies05HnEHmRVyLVpYdus= -github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251120035228-2492d12f5d81/go.mod h1:UAZddgM5NKCnsVmx4msXHV3jTaJLD9LqbPmV5TctK4k= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251120035228-2492d12f5d81 h1:qQCl4NIlOOg8/Hxy7FZRhm9LPtcbzWDl5gh8pShK91M= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251120035228-2492d12f5d81/go.mod h1:SpBtq2f0PclYNg6612tjc5MIZFUykEYyND0Tq7l0mzM= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251120035228-2492d12f5d81 h1:1uL0RCG1K9OpofH/F9qhNvFiubJk9/Ci1lu0+CdKTxg= -github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251120035228-2492d12f5d81/go.mod h1:orUknJg46Fszwz8LI733CI3uyku80NBdWqzzSgyzWKc= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251120035228-2492d12f5d81 h1:wc4nhvVnRqwraZE7RybwLxu6hlXAhzUMBv3R+SoPK5o= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251120035228-2492d12f5d81/go.mod h1:uQv03B/EZ5CVsYWrKqaJbiIMOY2DK6Ox2xjCved+YSM= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251120035228-2492d12f5d81 h1:Clya/OfHwWuYz4L6x11E8f0/DemkOVaN+bVBxtX7rC4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251120035228-2492d12f5d81/go.mod h1:UhjJJwNhJ2cQ1tQbFXgw3KVE4FsSp/C7KgJMr5c7Nvo= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251120035228-2492d12f5d81 h1:TW81Hk0WO2TxwROyg3mJNI7X9ToubeMmfPskDwtorkA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251120035228-2492d12f5d81/go.mod h1:CdK/SDdJRDrk4G3YvlOWjbMR7BGAUUWEquHqVDLTzA4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251120035228-2492d12f5d81 h1:58CEie9i03rHS4xAy4GWQGj7QghgjPLTaZR4XvMi2es= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251120035228-2492d12f5d81/go.mod h1:Naqv+7HWtDgPbeT2CzUHStDFy3nQ55Y0WrtBPOvKp8Q= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251120035228-2492d12f5d81 h1:bZmi5E+iE1AXcT5yontldZodq5Pr9Wr+V22MpOtU3S0= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251120035228-2492d12f5d81/go.mod h1:+HNk4dUzu9Fy7FqxdfvxNOoMzvYgVTzUfzVh1ApTKmI= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251120035228-2492d12f5d81 h1:QK4pwXXkK7jgAjVaoM/QTkMBuU8cnr15xqDBXL+8tx8= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251120035228-2492d12f5d81/go.mod h1:cU6+bc9gLvH3AATXFf6dE5nEQZKeHXIlLiwTxDq3g7A= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251120035228-2492d12f5d81 h1:RiMhm11hjiPbElCsLJg79lR9YFEBeFmgjgHPFv49HI4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251120035228-2492d12f5d81/go.mod h1:9VGjgdnP8thnbUWzTzOKwv0Ae8Rv6X5rzFY5LqRqNQQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251120035228-2492d12f5d81 h1:ZOi2oz6qzXYaBwmejYGLdlBfQ9UHXKhV4ce8PlKqlGA= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251120035228-2492d12f5d81/go.mod h1:KB9LZl4Tk6EyP1cRmH8tubLIlpS2nF70qOWSY+b3vHw= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251120035228-2492d12f5d81 h1:7CQBv6wiKOJyxpkv8sZe1iWwsMR5fmdrWF/K+fufjCk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251120035228-2492d12f5d81/go.mod h1:DU5DozRx1wR9D4Vxwe/CRSNMwz15rub6r6TEo7rA2Fo= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251120035228-2492d12f5d81 h1:JaQUPjW4vXuat+9Xuqz05gOtzvLdPbRk5lBDC5wlvfQ= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251120035228-2492d12f5d81/go.mod h1:VAIY5q8ntx1MZREDXmVsQp/qIyqx3vq6UaPeWldNuRk= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251120035228-2492d12f5d81 h1:N6u7SMgYNVaYIvxlB+Ihx8TT2Sfj5RAYgDx/N9ZP5o4= -github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251120035228-2492d12f5d81/go.mod h1:aYprF4me3eU4vuCY4RcMF2+9JIbHX6+qpCs2NSKKke8= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251211175346-5faee86d9fde h1:cAugYFiLHu2qB4fgJpNHA6xSIpHuJ1H3Z2K7maOHF7A= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.0.0-20251211175346-5faee86d9fde/go.mod h1:h/y8k16N0t89KjloCpZS8ow/H3sd4iU4w7U7anygxcc= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251211175346-5faee86d9fde h1:kxyYQtlLB6HHfTSKT5belwUAGdng8swPpJSQIdxdYxw= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsemfexporter v0.0.0-20251211175346-5faee86d9fde/go.mod h1:7ZWp3GCphI1A5TKBEzzl7kg6QukzNd9SQV4nQ2C6Teg= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251211175346-5faee86d9fde h1:kOnIXGw2HmwMvdRx3/vvKIN8P9wpz4sdboFpFs/uS/c= +github.com/amazon-contributing/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0-20251211175346-5faee86d9fde/go.mod h1:BAShbIsZmq4pndaVp6XfpS3ijVYHXkQhr4I89kQonTQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251211175346-5faee86d9fde h1:fsUkuP9qi6nzsGhq61QJV75CgV7+OnH5DaHK7+ZplUw= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsmiddleware v0.0.0-20251211175346-5faee86d9fde/go.mod h1:SpBtq2f0PclYNg6612tjc5MIZFUykEYyND0Tq7l0mzM= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251211175346-5faee86d9fde h1:oySvdaLIYYpN/aJ5vXHetRaqggZndLgD2gUrQ9P9LG0= +github.com/amazon-contributing/opentelemetry-collector-contrib/extension/awsproxy v0.0.0-20251211175346-5faee86d9fde/go.mod h1:orUknJg46Fszwz8LI733CI3uyku80NBdWqzzSgyzWKc= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251211175346-5faee86d9fde h1:iV8PHkEDby6DJkxMvbomJvuJeeq83wE/2/9O8C2iSm4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-20251211175346-5faee86d9fde/go.mod h1:uQv03B/EZ5CVsYWrKqaJbiIMOY2DK6Ox2xjCved+YSM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251211175346-5faee86d9fde h1:KmaNFqKwC0Ssg9PZI7kCK1wFzSWYFo3F28/1FvQf/Pc= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/containerinsight v0.0.0-20251211175346-5faee86d9fde/go.mod h1:UhjJJwNhJ2cQ1tQbFXgw3KVE4FsSp/C7KgJMr5c7Nvo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251211175346-5faee86d9fde h1:3h3/w458M9galLVsAK1qWzCXIGz+Ep4PlnKZ67GRG2M= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/cwlogs v0.0.0-20251211175346-5faee86d9fde/go.mod h1:CdK/SDdJRDrk4G3YvlOWjbMR7BGAUUWEquHqVDLTzA4= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251211175346-5faee86d9fde h1:AAzx4RHgZFDG5cvkjsMpuXlmKNunPDKeB4Ui2ag78iw= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/k8s v0.0.0-20251211175346-5faee86d9fde/go.mod h1:Naqv+7HWtDgPbeT2CzUHStDFy3nQ55Y0WrtBPOvKp8Q= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251211175346-5faee86d9fde h1:ar0RpPhTG9qQNTZZwSKCeYXxjWet+slVYC7ACy9Kl+g= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-20251211175346-5faee86d9fde/go.mod h1:+HNk4dUzu9Fy7FqxdfvxNOoMzvYgVTzUfzVh1ApTKmI= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251211175346-5faee86d9fde h1:LwVQhG+c+PxZSTl+CPwqrnMuEFbftaM1oIsL0V8JzDg= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/proxy v0.0.0-20251211175346-5faee86d9fde/go.mod h1:cU6+bc9gLvH3AATXFf6dE5nEQZKeHXIlLiwTxDq3g7A= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251211175346-5faee86d9fde h1:exdzXTEAbek2pLIms/JJgSVqfn+U53lojDs2w2gRSpU= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/aws/xray v0.0.0-20251211175346-5faee86d9fde/go.mod h1:9VGjgdnP8thnbUWzTzOKwv0Ae8Rv6X5rzFY5LqRqNQQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251211175346-5faee86d9fde h1:1887YwmM/JqUQrHjD3xuE/KTQtTLL8rPApo4eYazuCQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-20251211175346-5faee86d9fde/go.mod h1:d9+1Jn/duaOcDCGl1fHnAgiMuxpesVyD2LanEIswoIY= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251211175346-5faee86d9fde h1:iCBArvNHlGW6Lj6rwKb6WTSUZWKnJrbDK4VVtecAb+c= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-20251211175346-5faee86d9fde/go.mod h1:DU5DozRx1wR9D4Vxwe/CRSNMwz15rub6r6TEo7rA2Fo= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251211175346-5faee86d9fde h1:LFlw3yiJYZ9VXKjmw3OBzpry3OXwX0w6GQ4mN58wgZ8= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/kubelet v0.0.0-20251211175346-5faee86d9fde/go.mod h1:VAIY5q8ntx1MZREDXmVsQp/qIyqx3vq6UaPeWldNuRk= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251211175346-5faee86d9fde h1:J+PntymXeKh7rCUeHShyrMI+Ee7r+meEQQIcQWSipSM= +github.com/amazon-contributing/opentelemetry-collector-contrib/internal/metadataproviders v0.0.0-20251211175346-5faee86d9fde/go.mod h1:aYprF4me3eU4vuCY4RcMF2+9JIbHX6+qpCs2NSKKke8= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20251120035228-2492d12f5d81 h1:e4N1Akig4dxFupuYCSrz03HUSA9YLYuX4ZrnA3HJEQQ= github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20251120035228-2492d12f5d81/go.mod h1:TuE5ogQgw7qLh+Y+eKj3utx98fjnVZBNFb5P2C9pc+M= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251120035228-2492d12f5d81 h1:zVTTWdIFKj4cQfG1Ua3qqoJEc9BZMQKXxW+nnqfeRhY= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251120035228-2492d12f5d81/go.mod h1:ugjDletBT4ZGEWiDfMxYl0iP9ALOx4xawNXYOTxzyB8= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251120035228-2492d12f5d81 h1:Kwei8RB2TbHTNZqBCFyJWq1K9Y/tS5uA//5rfPfvZpU= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251120035228-2492d12f5d81/go.mod h1:pvsUAvdMnMMRXSLA3vdqM4CiGOF1xSMsiVstV80hXr8= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20251120035228-2492d12f5d81 h1:FydoASS/KJie3RhNA08ajZy3kmg698sjDfdxQOQ1PNg= -github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20251120035228-2492d12f5d81/go.mod h1:41eDZVHh5A1BLJ0Dy3oQIrS+du1Zu+rpKEijUazlnCI= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251120035228-2492d12f5d81 h1:69CKb3v18Dk8OhZR6KuVsoCYHndB67i1ZQjIL7rQIKE= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251120035228-2492d12f5d81/go.mod h1:YTEg21QFJQ1HP9c+w1qnORKd0cLjFqlNONO4GE4RJz4= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81 h1:KrIvKabJgtBz4uoYvcL/rdexUzU4ZMnDKdLDl/pwX/E= -github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251120035228-2492d12f5d81/go.mod h1:I41hi6XJwoAAauMtkaCQBtn0Fom+HE2KbIZjxauVavU= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589 h1:no7oYyHYQkLQDYcw7LKumepGwrYqiiIy9vHmFF5XO2s= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251210160859-693698d57589/go.mod h1:Yjm9Vh3sLSFKA7o28PAidnlioTWOyHvpQ9rsDR4lwNM= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81 h1:IkRdV7B459uKNLvh4PJ0Op2w9odeqvVJRuFp5raAV0U= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:dnhJ7NI0b85XA4yBAHgkTqnC7x4LDeAIjg6I435n0Jc= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251120035228-2492d12f5d81 h1:YQnoL+5YKorzQowCyjxFdlK/6zu9B6ggAOJyTTUqw4M= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:CEwLaA2QDABq95X2IgQkt2cB+vvlJbMrB64LnJwSKHA= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251120035228-2492d12f5d81 h1:6EOyAOXT/6YOYU/k/GA/PsEFxB5xMlenL7eY66MbRwY= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:SGDGG+izRRsBNyC3ws1v1ZPIHIPgry6O03UrtF7akgg= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251120035228-2492d12f5d81 h1:UX7npG8Gg2UHpu8Ab/SX1M+7hNTWiYJbfgaO2S//wQA= -github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251120035228-2492d12f5d81/go.mod h1:Qjc9QUa9UuVy+diYfC+hGcOZNt+4JPFqpqAzXlnuPQI= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251211175346-5faee86d9fde h1:CgxJU8pD5En7ziYW6BJwbmDqUk5nknMiFykVr0eEGbY= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.0.0-20251211175346-5faee86d9fde/go.mod h1:5F3wAhvG/R0QuE2G8523cXJ5d8s2Fs15dqcoL+jr8q8= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251211175346-5faee86d9fde h1:e2YUU2vIlenOrkDGoIwLirbWWLkMbBawZxe4u2cAvss= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/stanza v0.0.0-20251211175346-5faee86d9fde/go.mod h1:Gb2Ke8v8NMAJy/yz5QM+jb1XLBZQK4sHnIAQ6t/RodI= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20251211175346-5faee86d9fde h1:C6qi1qTlpL2sA3OpxUagwkal26/6Yg6xJ1n60Fl/ElU= +github.com/amazon-contributing/opentelemetry-collector-contrib/pkg/translator/prometheus v0.0.0-20251211175346-5faee86d9fde/go.mod h1:41eDZVHh5A1BLJ0Dy3oQIrS+du1Zu+rpKEijUazlnCI= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251211175346-5faee86d9fde h1:zdRTe+hAu6vqcslCXIPw3Hhm/1FZu/szBZK9OX6u3Gc= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.0.0-20251211175346-5faee86d9fde/go.mod h1:BlDVraekGuczBCDKtS2oFh9kKYcz2LOSNS8Z4vaPCgM= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251211175346-5faee86d9fde h1:6uI0KNbl7eBQDNwISWpiMFzDmTtvjZqxnx9/mJD0IfI= +github.com/amazon-contributing/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.0.0-20251211175346-5faee86d9fde/go.mod h1:I41hi6XJwoAAauMtkaCQBtn0Fom+HE2KbIZjxauVavU= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251211175346-5faee86d9fde h1:CkH9LExGkxV4NuEstRq3C7WTEfhMUWU2G5wikXLc0js= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.0.0-20251211175346-5faee86d9fde/go.mod h1:D6z1zvQUW1wqb8gLcMy5Ud2oKhTS7Thq7/yXERXWXyA= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251211175346-5faee86d9fde h1:8QnwbDUGO94UUn67Z95Hs8ElzC9VW2PguzFOoJvy1iM= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awscontainerinsightskueuereceiver v0.0.0-20251211175346-5faee86d9fde/go.mod h1:azh6UrFLEbpbmP3LJfaZW+hyiDykBg79KZAU4G6ICTE= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251211175346-5faee86d9fde h1:vIC9dkU4l7AsgvXDYawPZAs9W8bEOCU42MA8rpjmdUc= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251211175346-5faee86d9fde/go.mod h1:QogqM0I2YS5dR4AmjIquZMA+5RwoORbjV15uGRELuhQ= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251211175346-5faee86d9fde h1:zQbOQpuSA4zMeNUztXpqatP/1HMTMemHhn3hBYlb0NI= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20251211175346-5faee86d9fde/go.mod h1:TYYNI6gpWY3x3Cjx1oE3d5Zazd81dvQXe7ENjCADIV4= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251211175346-5faee86d9fde h1:N4rysf8R4P9zF7iAg3b/LNby8kwX0XYciOShLxX+GC0= +github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20251211175346-5faee86d9fde/go.mod h1:OYE9gY1A7SqPDdoLlAg72TWqi5yWSX2/czosSU2zypg= 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= @@ -1871,8 +1871,8 @@ golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE= -golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc= +golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= +golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1917,8 +1917,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU= -golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww= +golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk= +golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1970,8 +1970,8 @@ golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY= -golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1997,8 +1997,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= -golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -2083,9 +2083,11 @@ golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20= -golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= +golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= +golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54 h1:E2/AqCUMZGgd73TQkxUMcMla25GB9i/5HOdLr+uH7Vo= +golang.org/x/telemetry v0.0.0-20251111182119-bc8e575c7b54/go.mod h1:hKdjCMrbv9skySur+Nek8Hd0uJ0GuxJIoIX2payrIdQ= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -2097,8 +2099,8 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= -golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o= -golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw= +golang.org/x/term v0.38.0 h1:PQ5pkm/rLO6HnxFR7N2lJHOZX6Kez5Y1gDSJla6jo7Q= +golang.org/x/term v0.38.0/go.mod h1:bSEAKrOT1W+VSu9TSCMtoGEOUcKxOKgl3LE5QEF/xVg= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2116,8 +2118,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= -golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= +golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -2185,8 +2187,10 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU= -golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s= +golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ= +golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ= +golang.org/x/tools/godoc v0.1.0-deprecated h1:o+aZ1BOj6Hsx/GBdJO/s815sqftjSnrZZwyYTHODvtk= +golang.org/x/tools/godoc v0.1.0-deprecated/go.mod h1:qM63CriJ961IHWmnWa9CjZnBndniPt4a3CK0PVB9bIg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From e9e1ba83d7ab4a27a6483329e569b00204751d62 Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Thu, 11 Dec 2025 15:52:27 -0500 Subject: [PATCH 11/12] Fix TestEmfAndKubernetesWithGpuHighFrequencyConfig by adding missing EFA retrans metrics - Add container_efa_retrans_bytes, container_efa_retrans_pkts, container_efa_retrans_timeout_events, container_efa_impaired_remote_conn_events, container_efa_unresponsive_remote_events - Add corresponding pod and node EFA retrans metrics - Updates expected config to match recent EFA retrans metrics added in commit 30f09000 --- ...kubernetes_with_gpu_high_frequency_config.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_high_frequency_config.yaml b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_high_frequency_config.yaml index fd808035c4..be83d16be7 100644 --- a/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_high_frequency_config.yaml +++ b/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_high_frequency_config.yaml @@ -598,6 +598,11 @@ exporters: - container_efa_rdma_read_bytes - container_efa_rdma_write_bytes - container_efa_rdma_write_recv_bytes + - container_efa_retrans_bytes + - container_efa_retrans_pkts + - container_efa_retrans_timeout_events + - container_efa_impaired_remote_conn_events + - container_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName @@ -624,6 +629,11 @@ exporters: - pod_efa_rdma_read_bytes - pod_efa_rdma_write_bytes - pod_efa_rdma_write_recv_bytes + - pod_efa_retrans_bytes + - pod_efa_retrans_pkts + - pod_efa_retrans_timeout_events + - pod_efa_impaired_remote_conn_events + - pod_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName @@ -641,6 +651,11 @@ exporters: - node_efa_rdma_read_bytes - node_efa_rdma_write_bytes - node_efa_rdma_write_recv_bytes + - node_efa_retrans_bytes + - node_efa_retrans_pkts + - node_efa_retrans_timeout_events + - node_efa_impaired_remote_conn_events + - node_efa_unresponsive_remote_events - dimensions: - - ClusterName - - ClusterName From cbd0e287ce4bfdcee1f1224bffd18fe8e40b778b Mon Sep 17 00:00:00 2001 From: Marcus Mann Date: Thu, 11 Dec 2025 16:31:59 -0500 Subject: [PATCH 12/12] Update awsemf translator test to include EFA retrans metrics - Add container_efa_retrans_bytes, container_efa_retrans_pkts, container_efa_retrans_timeout_events, container_efa_impaired_remote_conn_events, container_efa_unresponsive_remote_events - Add corresponding pod and node EFA retrans metrics to test expectations - Fixes GenerateAwsEmfExporterConfigKubernetesWithHighFrequencyGPUMetrics test failure - Aligns test with EFA retrans metrics added in commit 30f09000 --- .../translate/otel/exporter/awsemf/translator_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go index 77f434aa83..2594c9b438 100644 --- a/translator/translate/otel/exporter/awsemf/translator_test.go +++ b/translator/translate/otel/exporter/awsemf/translator_test.go @@ -1157,19 +1157,19 @@ func TestTranslator(t *testing.T) { { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace", "PodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "ContainerName", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ - "container_efa_rx_bytes", "container_efa_tx_bytes", "container_efa_rx_dropped", "container_efa_rdma_read_bytes", "container_efa_rdma_write_bytes", "container_efa_rdma_write_recv_bytes", + "container_efa_rx_bytes", "container_efa_tx_bytes", "container_efa_rx_dropped", "container_efa_rdma_read_bytes", "container_efa_rdma_write_bytes", "container_efa_rdma_write_recv_bytes", "container_efa_retrans_bytes", "container_efa_retrans_pkts", "container_efa_retrans_timeout_events", "container_efa_impaired_remote_conn_events", "container_efa_unresponsive_remote_events", }, }, { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "Namespace"}, {"ClusterName", "Namespace", "Service"}, {"ClusterName", "Namespace", "PodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName"}, {"ClusterName", "Namespace", "PodName", "FullPodName", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ - "pod_efa_rx_bytes", "pod_efa_tx_bytes", "pod_efa_rx_dropped", "pod_efa_rdma_read_bytes", "pod_efa_rdma_write_bytes", "pod_efa_rdma_write_recv_bytes", + "pod_efa_rx_bytes", "pod_efa_tx_bytes", "pod_efa_rx_dropped", "pod_efa_rdma_read_bytes", "pod_efa_rdma_write_bytes", "pod_efa_rdma_write_recv_bytes", "pod_efa_retrans_bytes", "pod_efa_retrans_pkts", "pod_efa_retrans_timeout_events", "pod_efa_impaired_remote_conn_events", "pod_efa_unresponsive_remote_events", }, }, { Dimensions: [][]string{{"ClusterName"}, {"ClusterName", "NodeName", "InstanceId"}, {"ClusterName", "NodeName", "InstanceId", "InstanceType", "NetworkInterfaceId"}}, MetricNameSelectors: []string{ - "node_efa_rx_bytes", "node_efa_tx_bytes", "node_efa_rx_dropped", "node_efa_rdma_read_bytes", "node_efa_rdma_write_bytes", "node_efa_rdma_write_recv_bytes", + "node_efa_rx_bytes", "node_efa_tx_bytes", "node_efa_rx_dropped", "node_efa_rdma_read_bytes", "node_efa_rdma_write_bytes", "node_efa_rdma_write_recv_bytes", "node_efa_retrans_bytes", "node_efa_retrans_pkts", "node_efa_retrans_timeout_events", "node_efa_impaired_remote_conn_events", "node_efa_unresponsive_remote_events", }, }, {