Skip to content

fix: accumulate agentstats until reported and fix insights DAU offset #15832

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

Merged
merged 9 commits into from
Dec 18, 2024
Merged

fix: accumulate agentstats until reported and fix insights DAU offset #15832

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e97f3a9
fix: accumulate agentstats until reported and fix insights DAU offset
mafredri Dec 11, 2024
bd4ae11
fix test
mafredri Dec 11, 2024
53f3275
fix comment
mafredri Dec 11, 2024
57fde09
add comment from PR review
mafredri Dec 11, 2024
7f7df65
refactor stats accumulation
mafredri Dec 11, 2024
ff236f0
Update coderd/insights_test.go
mafredri Dec 11, 2024
08dea24
fix format
mafredri Dec 11, 2024
3fc95da
fix failf
mafredri Dec 11, 2024
02bafec
Merge branch 'main' into mafredri-fix-agentstats-acc-and-dau-flake
mafredri Dec 16, 2024
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
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
@mafredri
mafredri committed Dec 11, 2024
commit bd4ae11eba268361d2571c98be876530dbaac3f9
16 changes: 14 additions & 2 deletions agent/stats_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func TestStatsReporter(t *testing.T) {
require.Equal(t, netStats, gotNetStats)

// while we are collecting the stats, send in two new netStats to simulate
// what happens if we don't keep up. Only the latest should be kept.
// what happens if we don't keep up. The stats should be accumulated.
netStats0 := map[netlogtype.Connection]netlogtype.Counts{
{
Proto: ipproto.TCP,
Expand Down Expand Up @@ -103,8 +103,20 @@ func TestStatsReporter(t *testing.T) {
testutil.RequireSendCtx(ctx, t, fDest.resps, &proto.UpdateStatsResponse{ReportInterval: durationpb.New(interval)})

// second update -- only netStats1 is reported
wantNetStats := map[netlogtype.Connection]netlogtype.Counts{
{
Proto: ipproto.TCP,
Src: netip.MustParseAddrPort("192.168.1.33:4887"),
Dst: netip.MustParseAddrPort("192.168.2.99:9999"),
}: {
TxPackets: 21,
TxBytes: 21,
RxPackets: 21,
RxBytes: 21,
},
}
gotNetStats = testutil.RequireRecvCtx(ctx, t, fCollector.calls)
require.Equal(t, netStats1, gotNetStats)
require.Equal(t, wantNetStats, gotNetStats)
stats = &proto.Stats{SessionCountJetbrains: 66}
testutil.RequireSendCtx(ctx, t, fCollector.stats, stats)
update = testutil.RequireRecvCtx(ctx, t, fDest.reqs)
Expand Down
Loading