From afb710a526d8d60654552de0a8cdc1f18ef8f829 Mon Sep 17 00:00:00 2001 From: Sven van Ginkel Date: Mon, 19 Oct 2026 17:00:09 +0200 Subject: [PATCH] refactor(agent): stop sending deprecated container network fields (#2650) NetworkSent/NetworkRecv were deprecated in 0.18.3 in favor of Bandwidth. The hub already falls back to the old fields for older agents, so the agent no longer needs to populate them. --- agent/docker.go | 6 ------ agent/docker_test.go | 16 +++------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/agent/docker.go b/agent/docker.go index 8b669d14d..0ee826ed2 100644 --- a/agent/docker.go +++ b/agent/docker.go @@ -380,9 +380,6 @@ func updateContainerStatsValues(stats *container.Stats, cpuPct float64, usedMemo stats.Cpu = utils.TwoDecimals(cpuPct) stats.Mem = utils.BytesToMegabytes(float64(usedMemory)) stats.Bandwidth = [2]uint64{sent_delta, recv_delta} - // TODO(0.19+): stop populating NetworkSent/NetworkRecv (deprecated in 0.18.3) - stats.NetworkSent = utils.BytesToMegabytes(float64(sent_delta)) - stats.NetworkRecv = utils.BytesToMegabytes(float64(recv_delta)) stats.PrevReadTime = readTime } @@ -562,9 +559,6 @@ func (dm *dockerManager) updateContainerStats(ctr *container.ApiInfo, cacheTimeM stats.Cpu = 0 stats.Mem = 0 stats.Bandwidth = [2]uint64{0, 0} - // TODO(0.19+): stop populating NetworkSent/NetworkRecv (deprecated in 0.18.3) - stats.NetworkSent = 0 - stats.NetworkRecv = 0 // Initialize CPU tracking for this cache time interval dm.initializeCpuTracking(cacheTimeMs) diff --git a/agent/docker_test.go b/agent/docker_test.go index 8d182a205..b1132a143 100644 --- a/agent/docker_test.go +++ b/agent/docker_test.go @@ -302,8 +302,6 @@ func TestUpdateContainerStatsValues(t *testing.T) { Name: "test-container", Cpu: 0.0, Mem: 0.0, - NetworkSent: 0.0, - NetworkRecv: 0.0, PrevReadTime: time.Time{}, } @@ -319,9 +317,9 @@ func TestUpdateContainerStatsValues(t *testing.T) { // Check bandwidth (raw bytes) assert.Equal(t, [2]uint64{524288, 262144}, stats.Bandwidth) - // Deprecated fields still populated for backward compatibility with older hubs - assert.Equal(t, 0.5, stats.NetworkSent) // 524288 bytes = 0.5 MB - assert.Equal(t, 0.25, stats.NetworkRecv) // 262144 bytes = 0.25 MB + // Deprecated fields are no longer populated + assert.Zero(t, stats.NetworkSent) + assert.Zero(t, stats.NetworkRecv) // Check read time assert.Equal(t, testTime, stats.PrevReadTime) @@ -964,8 +962,6 @@ func TestContainerStatsInitialization(t *testing.T) { assert.Equal(t, "test-container", stats.Name) assert.Equal(t, 0.0, stats.Cpu) assert.Equal(t, 0.0, stats.Mem) - assert.Equal(t, 0.0, stats.NetworkSent) - assert.Equal(t, 0.0, stats.NetworkRecv) assert.Equal(t, time.Time{}, stats.PrevReadTime) // Test updating values @@ -975,9 +971,6 @@ func TestContainerStatsInitialization(t *testing.T) { assert.Equal(t, 45.67, stats.Cpu) assert.Equal(t, 2.0, stats.Mem) assert.Equal(t, [2]uint64{1048576, 524288}, stats.Bandwidth) - // Deprecated fields still populated for backward compatibility with older hubs - assert.Equal(t, 1.0, stats.NetworkSent) // 1048576 bytes = 1 MB - assert.Equal(t, 0.5, stats.NetworkRecv) // 524288 bytes = 0.5 MB assert.Equal(t, testTime, stats.PrevReadTime) } @@ -1391,9 +1384,6 @@ func TestContainerStatsEndToEndWithRealData(t *testing.T) { assert.Equal(t, cpuPct, testStats.Cpu) assert.Equal(t, utils.BytesToMegabytes(float64(usedMemory)), testStats.Mem) assert.Equal(t, [2]uint64{1000000, 500000}, testStats.Bandwidth) - // Deprecated fields still populated for backward compatibility with older hubs - assert.Equal(t, utils.BytesToMegabytes(1000000), testStats.NetworkSent) - assert.Equal(t, utils.BytesToMegabytes(500000), testStats.NetworkRecv) assert.Equal(t, testTime, testStats.PrevReadTime) }