Skip to content

feat: Fix Deployment DAUs to work with local timezones #7647

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 18 commits into from
May 30, 2023
Merged

feat: Fix Deployment DAUs to work with local timezones #7647

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f7f5d66
chore: Add timezone param to DAU SQL query
Emyrk May 23, 2023
45e8342
Merge DAUs response
Emyrk May 23, 2023
b502940
Pass time offsets to metricscache
Emyrk May 23, 2023
9b970ae
Fix unit tests
Emyrk May 23, 2023
4eb43c1
Add unit tests for tzs to offsets
Emyrk May 23, 2023
1949217
Add unit test for closest
Emyrk May 23, 2023
b5b5824
Return after http error
Emyrk May 23, 2023
448d5fb
make gen
Emyrk May 23, 2023
5976ac4
add comments
Emyrk May 23, 2023
6ff576b
Fix imports
Emyrk May 23, 2023
a91debd
missing import
Emyrk May 23, 2023
0d19300
add unit test
Emyrk May 23, 2023
d7e8b25
Formatting
Emyrk May 23, 2023
bf1bd47
Fix FE to use singulare DAUsResponse
Emyrk May 23, 2023
dc324a8
Fix unit test
Emyrk May 23, 2023
bb7c392
Make gen
Emyrk May 23, 2023
16c9c8f
Format
Emyrk May 24, 2023
a86bcd6
Format
Emyrk May 24, 2023
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
add unit test
  • Loading branch information
@Emyrk
Emyrk committed May 23, 2023
commit 0d19300a2cf2ed3499a31e749c35a233cbb19d5b
190 changes: 110 additions & 80 deletions coderd/metricscache/metricscache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,22 @@ import (
"github.com/coder/coder/testutil"
)

func dateH(year, month, day, hour int) time.Time {
return time.Date(year, time.Month(month), day, hour, 0, 0, 0, time.UTC)
}

func date(year, month, day int) time.Time {
return time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
}

func TestCache_TemplateUsers(t *testing.T) {
t.Parallel()
statRow := func(user uuid.UUID, date time.Time) database.InsertWorkspaceAgentStatParams {
return database.InsertWorkspaceAgentStatParams{
CreatedAt: date,
UserID: user,
}
}

var (
zebra = uuid.UUID{1}
Expand All @@ -38,24 +48,21 @@ func TestCache_TemplateUsers(t *testing.T) {
uniqueUsers int
}
tests := []struct {
name string
args args
want want
name string
args args
want want
tzOffset int
}{
{"empty", args{}, want{nil, 0}},
{name: "empty", args: args{}, want: want{nil, 0}},
{
"one hole", args{
name: "one hole",
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
{
CreatedAt: date(2022, 8, 27),
UserID: zebra,
},
{
CreatedAt: date(2022, 8, 30),
UserID: zebra,
},
statRow(zebra, dateH(2022, 8, 27, 0)),
statRow(zebra, dateH(2022, 8, 30, 0)),
},
}, want{[]codersdk.DAUEntry{
},
want: want{[]codersdk.DAUEntry{
{
Date: date(2022, 8, 27),
Amount: 1,
Expand All @@ -74,88 +81,111 @@ func TestCache_TemplateUsers(t *testing.T) {
},
}, 1},
},
{"no holes", args{
rows: []database.InsertWorkspaceAgentStatParams{
{
name: "no holes",
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
statRow(zebra, dateH(2022, 8, 27, 0)),
statRow(zebra, dateH(2022, 8, 28, 0)),
statRow(zebra, dateH(2022, 8, 29, 0)),
},
},
want: want{[]codersdk.DAUEntry{
{
CreatedAt: date(2022, 8, 27),
UserID: zebra,
Date: date(2022, 8, 27),
Amount: 1,
},
{
CreatedAt: date(2022, 8, 28),
UserID: zebra,
Date: date(2022, 8, 28),
Amount: 1,
},
{
CreatedAt: date(2022, 8, 29),
UserID: zebra,
Date: date(2022, 8, 29),
Amount: 1,
},
}, 1}},
{
name: "holes",
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
statRow(zebra, dateH(2022, 1, 1, 0)),
statRow(tiger, dateH(2022, 1, 1, 0)),
statRow(zebra, dateH(2022, 1, 4, 0)),
statRow(zebra, dateH(2022, 1, 7, 0)),
statRow(tiger, dateH(2022, 1, 7, 0)),
},
},
}, want{[]codersdk.DAUEntry{
{
Date: date(2022, 8, 27),
Amount: 1,
},
{
Date: date(2022, 8, 28),
Amount: 1,
},
{
Date: date(2022, 8, 29),
Amount: 1,
},
}, 1}},
{"holes", args{
rows: []database.InsertWorkspaceAgentStatParams{
want: want{[]codersdk.DAUEntry{
{
Date: date(2022, 1, 1),
Amount: 2,
},
{
CreatedAt: date(2022, 1, 1),
UserID: zebra,
Date: date(2022, 1, 2),
Amount: 0,
},
{
CreatedAt: date(2022, 1, 1),
UserID: tiger,
Date: date(2022, 1, 3),
Amount: 0,
},
{
CreatedAt: date(2022, 1, 4),
UserID: zebra,
Date: date(2022, 1, 4),
Amount: 1,
},
{
CreatedAt: date(2022, 1, 7),
UserID: zebra,
Date: date(2022, 1, 5),
Amount: 0,
},
{
CreatedAt: date(2022, 1, 7),
UserID: tiger,
Date: date(2022, 1, 6),
Amount: 0,
},
{
Date: date(2022, 1, 7),
Amount: 2,
},
}, 2}},
{
name: "tzOffset",
tzOffset: -1,
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
statRow(zebra, dateH(2022, 1, 2, 1)),
statRow(tiger, dateH(2022, 1, 2, 1)),
// With offset these should be in the previous day
statRow(zebra, dateH(2022, 1, 2, 0)),
statRow(tiger, dateH(2022, 1, 2, 0)),
},
},
}, want{[]codersdk.DAUEntry{
{
Date: date(2022, 1, 1),
Amount: 2,
},
{
Date: date(2022, 1, 2),
Amount: 0,
},
{
Date: date(2022, 1, 3),
Amount: 0,
},
{
Date: date(2022, 1, 4),
Amount: 1,
},
{
Date: date(2022, 1, 5),
Amount: 0,
},
{
Date: date(2022, 1, 6),
Amount: 0,
},
{
Date: date(2022, 1, 7),
Amount: 2,
want: want{[]codersdk.DAUEntry{
{
Date: date(2022, 1, 1),
Amount: 2,
},
{
Date: date(2022, 1, 2),
Amount: 2,
},
}, 2},
},
{
name: "tzOffsetPreviousDay",
tzOffset: -6,
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
statRow(zebra, dateH(2022, 1, 2, 1)),
statRow(tiger, dateH(2022, 1, 2, 1)),
statRow(zebra, dateH(2022, 1, 2, 0)),
statRow(tiger, dateH(2022, 1, 2, 0)),
},
},
}, 2}},
want: want{[]codersdk.DAUEntry{
{
Date: date(2022, 1, 1),
Amount: 2,
},
}, 2},
},
}

for _, tt := range tests {
Expand All @@ -182,7 +212,7 @@ func TestCache_TemplateUsers(t *testing.T) {
}

require.Eventuallyf(t, func() bool {
_, _, ok := cache.TemplateDAUs(template.ID, 0)
_, _, ok := cache.TemplateDAUs(template.ID, tt.tzOffset)
return ok
}, testutil.WaitShort, testutil.IntervalMedium,
"TemplateDAUs never populated",
Expand All @@ -191,9 +221,9 @@ func TestCache_TemplateUsers(t *testing.T) {
gotUniqueUsers, ok := cache.TemplateUniqueUsers(template.ID)
require.True(t, ok)

offset, gotEntries, ok := cache.TemplateDAUs(template.ID, 0)
offset, gotEntries, ok := cache.TemplateDAUs(template.ID, tt.tzOffset)
require.True(t, ok)
require.Equal(t, offset, 0)
require.Equal(t, offset, tt.tzOffset)
require.Equal(t, tt.want.entries, gotEntries.Entries)
require.Equal(t, tt.want.uniqueUsers, gotUniqueUsers)
})
Expand Down