Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions observability/sessiontimer.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,15 @@ func NewSessionTimer(startTime time.Time, opts ...SessionTimerOption) *SessionTi
return options.Apply(&SessionTimer{lastMilli: ts, lastSec: ts, lastMin: ts}, opts)
}

// Reset re-anchors the timer to startTime so that subsequent Advance calls
// measure elapsed time from startTime.
func (h *SessionTimer) Reset(startTime time.Time) {
ts := startTime.UnixMilli()
h.lastMilli = ts
h.lastSec = ts
h.lastMin = ts
}

func (h *SessionTimer) Advance(now time.Time) (millis, secs, mins int64) {
ts := now.UnixMilli()
if ts > h.lastMilli {
Expand Down
26 changes: 26 additions & 0 deletions observability/sessiontimer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,30 @@ func TestSessionTimer(t *testing.T) {
require.EqualValues(t, 45, secs)
require.EqualValues(t, 3, mins)
})

t.Run("Reset re-anchors so pre-reset time is not counted", func(t *testing.T) {
ts := time.Now()
st := NewSessionTimer(ts)

// 90s elapse before the participant actually joins; that time should not
// be billed once we re-anchor to the join time.
joinedAt := ts.Add(90 * time.Second)
st.Reset(joinedAt)

millis, secs, mins := st.Advance(joinedAt.Add(30 * time.Second))
require.EqualValues(t, 30000, millis)
require.EqualValues(t, 30, secs)
require.EqualValues(t, 1, mins)
})

t.Run("Reset preserves min-seconds option", func(t *testing.T) {
ts := time.Now()
st := NewSessionTimer(ts, WithMinSeconds(45))

joinedAt := ts.Add(10 * time.Second)
st.Reset(joinedAt)

_, secs, _ := st.Advance(joinedAt.Add(time.Second))
require.EqualValues(t, 45, secs)
})
}
2 changes: 1 addition & 1 deletion rpc/agent.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/agent_dispatch.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/egress.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/ingress.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/io.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/keepalive.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/participant.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/room.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/roommanager.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/signal.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/sip.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/whip_signal.psrpc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.