@@ -325,6 +325,7 @@ func TestUpdateStates(t *testing.T) {
325325"dean" :2 ,
326326},
327327ConnectionCount :3 ,
328+ SessionCountSsh :3 ,
328329},
329330}
330331)
@@ -409,11 +410,7 @@ func TestUpdateStates(t *testing.T) {
409410}
410411batcher = & workspacestatstest.StatsBatcher {}
411412updateAgentMetricsFnCalled = false
412- tickCh = make (chan time.Time )
413- flushCh = make (chan int ,1 )
414- wut = workspacestats .NewTracker (dbM ,
415- workspacestats .TrackerWithTickFlush (tickCh ,flushCh ),
416- )
413+ wut = workspacestats .NewTracker (dbM )
417414
418415req = & agentproto.UpdateStatsRequest {
419416Stats :& agentproto.Stats {
@@ -479,53 +476,22 @@ func TestUpdateStates(t *testing.T) {
479476// Workspace gets fetched.
480477dbM .EXPECT ().GetWorkspaceByAgentID (gomock .Any (),agent .ID ).Return (workspace ,nil )
481478
482- // We expect an activity bump because ConnectionCount > 0.
483- dbM .EXPECT ().ActivityBumpWorkspace (gomock .Any (), database.ActivityBumpWorkspaceParams {
484- WorkspaceID :workspace .ID ,
485- NextAutostart : time.Time {}.UTC (),
486- }).Return (nil )
487-
488- // Workspace last used at gets bumped.
489- dbM .EXPECT ().BatchUpdateWorkspaceLastUsedAt (gomock .Any (), database.BatchUpdateWorkspaceLastUsedAtParams {
490- IDs : []uuid.UUID {workspace .ID },
491- LastUsedAt :now ,
492- }).Return (nil )
493-
494479// User gets fetched to hit the UpdateAgentMetricsFn.
495480dbM .EXPECT ().GetUserByID (gomock .Any (),user .ID ).Return (user ,nil )
496481
497- // Ensure that pubsub notifications are sent.
498- notifyDescription := make (chan []byte )
499- ps .Subscribe (codersdk .WorkspaceNotifyChannel (workspace .ID ),func (_ context.Context ,description []byte ) {
500- go func () {
501- notifyDescription <- description
502- }()
503- })
504-
505482resp ,err := api .UpdateStats (context .Background (),req )
506483require .NoError (t ,err )
507484require .Equal (t ,& agentproto.UpdateStatsResponse {
508485ReportInterval :durationpb .New (10 * time .Second ),
509486},resp )
510487
511- tickCh <- now
512- count := <- flushCh
513- require .Equal (t ,1 ,count ,"expected one flush with one id" )
514-
515488batcher .Mu .Lock ()
516489defer batcher .Mu .Unlock ()
517490require .EqualValues (t ,1 ,batcher .Called )
518491require .EqualValues (t ,0 ,batcher .LastStats .SessionCountSsh )
519492require .EqualValues (t ,0 ,batcher .LastStats .SessionCountJetbrains )
520493require .EqualValues (t ,0 ,batcher .LastStats .SessionCountVscode )
521494require .EqualValues (t ,0 ,batcher .LastStats .SessionCountReconnectingPty )
522- ctx := testutil .Context (t ,testutil .WaitShort )
523- select {
524- case <- ctx .Done ():
525- t .Error ("timed out while waiting for pubsub notification" )
526- case description := <- notifyDescription :
527- require .Equal (t ,description , []byte {})
528- }
529495require .True (t ,updateAgentMetricsFnCalled )
530496})
531497}