Skip to content

backend/instances.go: fix instance stats query #1356

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
t-lo merged 1 commit into from
Apr 10, 2026
Merged

backend/instances.go: fix instance stats query #1356

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 16 additions & 8 deletions backend/pkg/api/instances.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const (
)

const (
validityInterval postgresDuration = "1 days"
defaultInterval time.Duration = 2 * time.Hour
validityInterval postgresDuration = "1 days"
defaultStatsInterval time.Duration = 24 * time.Hour
)

// Instance represents an instance running one or more applications for which
Expand Down Expand Up @@ -646,19 +646,25 @@ func (api *API) instanceStatusHistoryQuery(instanceID, appID, groupID string, li

// GetDefaultInterval returns the default interval used for instance stats queries.
func (api *API) GetDefaultInterval() time.Duration {
return defaultInterval
return defaultStatsInterval
}

// instanceStatsQuery returns a SelectDataset prepared to return all instances
// that have been checked in during a given duration from a given time.
// instanceStatsQuery returns a SelectDataset to estimate the active fleet size at a given point in time.
// It answers "how many instances were part of the active fleet on day X",
// not "how many instances specifically checked in on day X".
//
// Since last_check_for_updates gets overwritten on every check-in, we cannot determine
// whether an instance was active on a specific past day. Instead, we count instances that:
// 1. existed at the time (created_ts <= timestamp)
// 2. are still alive (last_check_for_updates > timestamp - duration)
func (api *API) instanceStatsQuery(t *time.Time, duration *time.Duration) *goqu.SelectDataset {
if t == nil {
now := time.Now().UTC()
t = &now
}

if duration == nil {
d := defaultInterval
d := defaultStatsInterval
duration = &d
}

Expand Down Expand Up @@ -710,12 +716,14 @@ func (api *API) instanceStatsQuery(t *time.Time, duration *time.Duration) *goqu.
Else("").
As("arch"),
goqu.C("version").As("version"),
goqu.COUNT("*").As("instances")).
goqu.COUNT("*").As("instances")).Distinct().
Comment thread
ervcz marked this conversation as resolved.
Join(goqu.T("groups"), goqu.On(goqu.C("group_id").Eq(goqu.T("groups").Col("id")))).
Join(goqu.T("channel"), goqu.On(goqu.T("groups").Col("channel_id").Eq(goqu.T("channel").Col("id")))).
Join(goqu.T("instance"), goqu.On(goqu.T("instance_application").Col("instance_id").Eq(goqu.T("instance").Col("id")))).
Where(
goqu.C("last_check_for_updates").Gt(timestampMinusDuration),
Comment thread
t-lo marked this conversation as resolved.
goqu.C("last_check_for_updates").Lte(timestamp)).
goqu.L(ignoreFakeInstanceCondition("instance_id")),
goqu.T("instance").Col("created_ts").Lte(timestamp)).
GroupBy(timestamp,
goqu.T("channel").Col("name"),
goqu.T("channel").Col("arch"),
Expand Down
Loading