fix network interfaces

Author: jinja2

.chloggen/kubeletstats-network-interfaces.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: kubeletstatsreceiver
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: scrape network metrics for all interfaces of k8s pods and nodes
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [30196]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [user]

receiver/kubeletstatsreceiver/internal/kubelet/network.go

@@ -10,18 +10,20 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver/internal/metadata"
 )
 
-type getNetworkDataFunc func(s *stats.NetworkStats) (rx *uint64, tx *uint64)
+type getNetworkDataFunc func(s *stats.InterfaceStats) (rx *uint64, tx *uint64)
 
 func addNetworkMetrics(mb *metadata.MetricsBuilder, networkMetrics metadata.NetworkMetrics, s *stats.NetworkStats, currentTime pcommon.Timestamp) {
 	if s == nil {
 		return
 	}
 
-	recordNetworkDataPoint(mb, networkMetrics.IO, s, getNetworkIO, currentTime)
-	recordNetworkDataPoint(mb, networkMetrics.Errors, s, getNetworkErrors, currentTime)
+	for i := range s.Interfaces {
+		recordNetworkDataPoint(mb, networkMetrics.IO, &s.Interfaces[i], getNetworkIO, currentTime)
+		recordNetworkDataPoint(mb, networkMetrics.Errors, &s.Interfaces[i], getNetworkErrors, currentTime)
+	}
 }
 
-func recordNetworkDataPoint(mb *metadata.MetricsBuilder, recordDataPoint metadata.RecordIntDataPointWithDirectionFunc, s *stats.NetworkStats, getData getNetworkDataFunc, currentTime pcommon.Timestamp) {
+func recordNetworkDataPoint(mb *metadata.MetricsBuilder, recordDataPoint metadata.RecordIntDataPointWithDirectionFunc, s *stats.InterfaceStats, getData getNetworkDataFunc, currentTime pcommon.Timestamp) {
 	rx, tx := getData(s)
 
 	if rx != nil {
@@ -33,10 +35,10 @@ func recordNetworkDataPoint(mb *metadata.MetricsBuilder, recordDataPoint metadat
 	}
 }
 
-func getNetworkIO(s *stats.NetworkStats) (*uint64, *uint64) {
+func getNetworkIO(s *stats.InterfaceStats) (*uint64, *uint64) {
 	return s.RxBytes, s.TxBytes
 }
 
-func getNetworkErrors(s *stats.NetworkStats) (*uint64, *uint64) {
+func getNetworkErrors(s *stats.InterfaceStats) (*uint64, *uint64) {
 	return s.RxErrors, s.TxErrors
 }

receiver/kubeletstatsreceiver/scraper_test.go

@@ -33,8 +33,8 @@ const (
 	numVolumes    = 8
 
 	// Number of metrics by resource
-	nodeMetrics      = 15
-	podMetrics       = 15
+	nodeMetrics      = 19
+	podMetrics       = 19
 	containerMetrics = 11
 	volumeMetrics    = 5
 )