Skip to content

feat: use tz_offset when doing deployment dau query #7736

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 7 commits into from
Jun 1, 2023
Merged

feat: use tz_offset when doing deployment dau query #7736

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a419991
Have FE query correct tz_offset data
Emyrk May 31, 2023
9b008b6
Comment
Emyrk May 31, 2023
a241d07
facepalm, assign the int
Emyrk May 31, 2023
c28ddb1
Fix the fake
Emyrk May 31, 2023
3b00cd3
yarn fmt
Emyrk May 31, 2023
70f099b
fix dbfake deployment DAU
Emyrk May 31, 2023
594de68
Correct timezone
Emyrk Jun 1, 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
4 changes: 2 additions & 2 deletions coderd/database/dbfake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, arg database.GetTemplat
continue
}

date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour).Truncate(time.Hour * 24)
date := as.CreatedAt.UTC().Add(time.Duration(arg.TzOffset) * time.Hour * -1).Truncate(time.Hour * 24)
Copy link
Member

@johnstcn johnstcn May 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤔 This change didn't break anything... which means that our unit tests probably aren't checking something that they should.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are half right.

I forgot to change it in the Dau dbfake function, which does break the unit test.

The template test does not break because I reverted the Template DAU to only use UTC again for performance reasons. So this is always 0 as the offset.

tl;dr fixing it in the spot that is used does break the test


dateEntry := seens[date]
if dateEntry == nil {
Expand Down Expand Up @@ -492,7 +492,7 @@ func (q *fakeQuerier) GetDeploymentDAUs(_ context.Context, tzOffset int32) ([]da
if as.ConnectionCount == 0 {
continue
}
date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * time.Hour).Truncate(time.Hour * 24)
date := as.CreatedAt.UTC().Add(time.Duration(tzOffset) * -1 * time.Hour).Truncate(time.Hour * 24)

dateEntry := seens[date]
if dateEntry == nil {
Expand Down
2 changes: 1 addition & 1 deletion coderd/metricscache/metricscache_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func TestCache_TemplateUsers(t *testing.T) {
},
{
name: "tzOffset",
tzOffset: -1,
tzOffset: 1,
args: args{
rows: []database.InsertWorkspaceAgentStatParams{
statRow(zebra, dateH(2022, 1, 2, 1)),
Expand Down
7 changes: 5 additions & 2 deletions site/src/api/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -831,8 +831,11 @@ export const getTemplateDAUs = async (
return response.data
}

export const getDeploymentDAUs = async (): Promise<TypesGen.DAUsResponse> => {
const response = await axios.get(`/api/v2/insights/daus`)
export const getDeploymentDAUs = async (
// Default to user's local timezone
offset = new Date().getTimezoneOffset() / 60,
): Promise<TypesGen.DAUsResponse> => {
const response = await axios.get(`/api/v2/insights/daus?tz_offset=${offset}`)
return response.data
}

Expand Down
4 changes: 3 additions & 1 deletion site/src/xServices/deploymentConfig/deploymentConfigMachine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ export const deploymentConfigMachine = createMachine(
{
services: {
getDeploymentValues: getDeploymentValues,
getDeploymentDAUs: getDeploymentDAUs,
getDeploymentDAUs: async () => {
return getDeploymentDAUs()
},
},
actions: {
assignDeploymentValues: assign({
Expand Down