Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 (
Expand All @@ -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
Expand All @@ -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-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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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-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=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20251014190537-ae1729ad22c4 h1:81WCB7g7vOUGs5HSNpuHrzMCXXH+XyOJHju/NkygKms=
Expand Down
15 changes: 15 additions & 0 deletions translator/translate/otel/exporter/awsemf/kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also need to update translation test aws/amazon-cloudwatch-agent/translator/tocwconfig/sampleConfig/emf_and_kubernetes_with_gpu_config.yaml

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does emf_and_kubernetes_with_gpu_high_frequency_config.yaml need to be updated too?

"container_efa_retrans_pkts",
"container_efa_retrans_timeout_events",
"container_efa_impaired_remote_conn_events",
"container_efa_unresponsive_remote_events",
},
},
{
Expand All @@ -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",
},
},
{
Expand All @@ -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",
},
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
{
Expand Down
Loading