Skip to content

fix: stop activity bump if no tracked sessions #15237

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 11 commits into from
Oct 29, 2024
Merged

fix: stop activity bump if no tracked sessions #15237

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e07bb4
fix: stop activity bump if no tracked sessions
f0ssel Oct 25, 2024
d702dca
fix: do not bump activity with no sessions
f0ssel Oct 25, 2024
218f4b0
fix test
f0ssel Oct 28, 2024
56cfa17
fix
f0ssel Oct 28, 2024
d451924
Revert "fix"
f0ssel Oct 28, 2024
c0c0af5
Revert "fix test"
f0ssel Oct 28, 2024
be0bbb4
Revert "fix: do not bump activity with no sessions"
f0ssel Oct 28, 2024
5a50fc3
Revert "fix: stop activity bump if no tracked sessions"
f0ssel Oct 28, 2024
4f0e506
new way
f0ssel Oct 28, 2024
599d71f
lint
f0ssel Oct 28, 2024
79af2ba
lint
f0ssel Oct 29, 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
38 changes: 2 additions & 36 deletions coderd/agentapi/stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ func TestUpdateStates(t *testing.T) {
"dean": 2,
},
ConnectionCount: 3,
SessionCountSsh: 3,
},
}
)
Expand Down Expand Up @@ -409,11 +410,7 @@ func TestUpdateStates(t *testing.T) {
}
batcher = &workspacestatstest.StatsBatcher{}
updateAgentMetricsFnCalled = false
tickCh = make(chan time.Time)
flushCh = make(chan int, 1)
wut = workspacestats.NewTracker(dbM,
workspacestats.TrackerWithTickFlush(tickCh, flushCh),
)
wut = workspacestats.NewTracker(dbM)

req = &agentproto.UpdateStatsRequest{
Stats: &agentproto.Stats{
Expand Down Expand Up @@ -479,53 +476,22 @@ func TestUpdateStates(t *testing.T) {
// Workspace gets fetched.
dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)

// We expect an activity bump because ConnectionCount > 0.
dbM.EXPECT().ActivityBumpWorkspace(gomock.Any(), database.ActivityBumpWorkspaceParams{
WorkspaceID: workspace.ID,
NextAutostart: time.Time{}.UTC(),
}).Return(nil)

// Workspace last used at gets bumped.
dbM.EXPECT().BatchUpdateWorkspaceLastUsedAt(gomock.Any(), database.BatchUpdateWorkspaceLastUsedAtParams{
IDs: []uuid.UUID{workspace.ID},
LastUsedAt: now,
}).Return(nil)

// User gets fetched to hit the UpdateAgentMetricsFn.
dbM.EXPECT().GetUserByID(gomock.Any(), user.ID).Return(user, nil)

// Ensure that pubsub notifications are sent.
notifyDescription := make(chan []byte)
ps.Subscribe(codersdk.WorkspaceNotifyChannel(workspace.ID), func(_ context.Context, description []byte) {
go func() {
notifyDescription <- description
}()
})

resp, err := api.UpdateStats(context.Background(), req)
require.NoError(t, err)
require.Equal(t, &agentproto.UpdateStatsResponse{
ReportInterval: durationpb.New(10 * time.Second),
}, resp)

tickCh <- now
count := <-flushCh
require.Equal(t, 1, count, "expected one flush with one id")

batcher.Mu.Lock()
defer batcher.Mu.Unlock()
require.EqualValues(t, 1, batcher.Called)
require.EqualValues(t, 0, batcher.LastStats.SessionCountSsh)
require.EqualValues(t, 0, batcher.LastStats.SessionCountJetbrains)
require.EqualValues(t, 0, batcher.LastStats.SessionCountVscode)
require.EqualValues(t, 0, batcher.LastStats.SessionCountReconnectingPty)
ctx := testutil.Context(t, testutil.WaitShort)
select {
case <-ctx.Done():
t.Error("timed out while waiting for pubsub notification")
case description := <-notifyDescription:
require.Equal(t, description, []byte{})
}
require.True(t, updateAgentMetricsFnCalled)
})
}
Expand Down
4 changes: 2 additions & 2 deletions coderd/workspacestats/reporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ func (r *Reporter) ReportAgentStats(ctx context.Context, now time.Time, workspac
}, stats.Metrics)
}

// if no active connections we do not bump activity
if stats.ConnectionCount == 0 {
// if no active sessions we do not bump activity
if stats.SessionCountJetbrains == 0 && stats.SessionCountVscode == 0 && stats.SessionCountReconnectingPty == 0 && stats.SessionCountSsh == 0 {
return nil
}

Expand Down
Loading