Skip to content

Fix undercounting of awsvpc network stats #4766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
+13 −14
Open

Fix undercounting of awsvpc network stats #4766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 10 additions & 11 deletions agent/stats/task_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,16 @@ func (taskStat *StatsTask) populateNIDeviceList(containerPID string) ([]string,
return deviceList, err
}

func linkStatsToDockerStats(netLinkStats *netlinklib.LinkStatistics, numberOfContainers uint64) dockerstats.NetworkStats {
func linkStatsToDockerStats(netLinkStats *netlinklib.LinkStatistics) dockerstats.NetworkStats {
networkStats := dockerstats.NetworkStats{
RxBytes: netLinkStats.RxBytes / numberOfContainers,
RxPackets: netLinkStats.RxPackets / numberOfContainers,
RxErrors: netLinkStats.RxErrors / numberOfContainers,
RxDropped: netLinkStats.RxDropped / numberOfContainers,
TxBytes: netLinkStats.TxBytes / numberOfContainers,
TxPackets: netLinkStats.TxPackets / numberOfContainers,
TxErrors: netLinkStats.TxErrors / numberOfContainers,
TxDropped: netLinkStats.TxDropped / numberOfContainers,
RxBytes: netLinkStats.RxBytes,
RxPackets: netLinkStats.RxPackets,
RxErrors: netLinkStats.RxErrors,
RxDropped: netLinkStats.RxDropped,
TxBytes: netLinkStats.TxBytes,
TxPackets: netLinkStats.TxPackets,
TxErrors: netLinkStats.TxErrors,
TxDropped: netLinkStats.TxDropped,
}
return networkStats
}
Expand Down Expand Up @@ -142,8 +142,7 @@ func (taskStat *StatsTask) retrieveNetworkStatistics() (map[string]dockerstats.N
return nil, err
}
netLinkStats := link.Attrs().Statistics
networkStats[link.Attrs().Name] = linkStatsToDockerStats(netLinkStats,
uint64(taskStat.TaskMetadata.NumberContainers))
networkStats[link.Attrs().Name] = linkStatsToDockerStats(netLinkStats)
}

return networkStats, nil
Expand Down
6 changes: 3 additions & 3 deletions agent/stats/task_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func TestTaskStatsCollection(t *testing.T) {

assert.NoError(t, err)
assert.NotNil(t, networkStatsSet)
rxSum := (*networkStatsSet.RxBytes.SampleCount * (int64(50))) / int64(numberOfContainers)
rxSum := *networkStatsSet.RxBytes.SampleCount * (int64(50))
assert.EqualValues(t, rxSum, *networkStatsSet.RxBytes.Sum)
}

Expand Down Expand Up @@ -157,8 +157,8 @@ func TestTaskStatsCollectionError(t *testing.T) {

networkStatsSet, err := taskStats.StatsQueue.GetNetworkStatsSet()
assert.NoError(t, err)
assert.EqualValues(t, 50, *networkStatsSet.RxBytes.Sum)
assert.EqualValues(t, 2, *networkStatsSet.RxPackets.Sum)
assert.EqualValues(t, 100, *networkStatsSet.RxBytes.Sum)
assert.EqualValues(t, 4, *networkStatsSet.RxPackets.Sum)
assert.EqualValues(t, 2, *networkStatsSet.RxPackets.SampleCount)
assert.EqualValues(t, 2, *networkStatsSet.TxPackets.SampleCount)
}
Expand Down