Skip to content

fix(coderd): use stable sorting for insights and improve test coverage #9250

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 33 commits into from
Aug 24, 2023
Merged

fix(coderd): use stable sorting for insights and improve test coverage #9250

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ffc7391
test(coderd): add extended template insights test suite
mafredri Aug 22, 2023
95ad848
add initial golden files
mafredri Aug 22, 2023
d4d58cf
add some more usage and verify golden
mafredri Aug 22, 2023
e4f901a
fixes
mafredri Aug 22, 2023
f333170
add an hour of app usage
mafredri Aug 22, 2023
6fb49a9
add 15 min of app usage -> active user on last day
mafredri Aug 22, 2023
e9a967e
add placeholder data
mafredri Aug 22, 2023
9879462
add identical usage in two templates for one user
mafredri Aug 22, 2023
fc1a98d
test app merging
mafredri Aug 22, 2023
f14ddf6
fix(codersdk): use url values for query params
mafredri Aug 22, 2023
8a60568
improve stability of template id
mafredri Aug 22, 2023
7d93d13
add sao paulo tz test (invalid interval times)
mafredri Aug 22, 2023
f9fdb47
fix start/end time tz returned in interval report
mafredri Aug 22, 2023
54638b0
cleanup
mafredri Aug 22, 2023
7b0ac4c
refactor template creation with stable IDs
mafredri Aug 23, 2023
1e7d860
add parameter test
mafredri Aug 23, 2023
9d96052
refactor
mafredri Aug 23, 2023
930d7ef
add parameter no data test
mafredri Aug 23, 2023
07cdc0b
add 1h usage to other user
mafredri Aug 23, 2023
73367d1
add usage outside of utc timeframe
mafredri Aug 23, 2023
c2a0496
add third user with ssh and web term usage
mafredri Aug 23, 2023
b738799
add third user app usage
mafredri Aug 23, 2023
79bdbf9
add webterminal app usage
mafredri Aug 23, 2023
ce2bb78
use stable sorting in Go and minor query tweaks and fakedb fixes
mafredri Aug 23, 2023
0896439
use github.com/google/go-cmp/cmp for diffs
mafredri Aug 23, 2023
5b4733a
restructure
mafredri Aug 23, 2023
3607a80
more fakedb fixes
mafredri Aug 23, 2023
688e1d0
fix fakedb logic bugs
mafredri Aug 23, 2023
8c294d0
fix commented code
mafredri Aug 23, 2023
decbdfe
fix test bug
mafredri Aug 24, 2023
870aff1
add test for tpl1 param4 option2
mafredri Aug 24, 2023
75a96d7
add outside timeframe tests for apps
mafredri Aug 24, 2023
e72e265
remove previous insights test in favor of new one
mafredri Aug 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
fix(codersdk): use url values for query params
  • Loading branch information
@mafredri
mafredri committed Aug 23, 2023
commit f14ddf6beeb509979839cc95322a2166fabafdd7
23 changes: 12 additions & 11 deletions codersdk/insights.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"strings"
"time"

Expand Down Expand Up @@ -61,18 +62,18 @@ type UserLatencyInsightsRequest struct {
}

func (c *Client) UserLatencyInsights(ctx context.Context, req UserLatencyInsightsRequest) (UserLatencyInsightsResponse, error) {
var qp []string
qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(insightsTimeLayout)))
qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(insightsTimeLayout)))
qp := url.Values{}
qp.Add("start_time", req.StartTime.Format(insightsTimeLayout))
qp.Add("end_time", req.EndTime.Format(insightsTimeLayout))
if len(req.TemplateIDs) > 0 {
var templateIDs []string
for _, id := range req.TemplateIDs {
templateIDs = append(templateIDs, id.String())
}
qp = append(qp, fmt.Sprintf("template_ids=%s", strings.Join(templateIDs, ",")))
qp.Add("template_ids", strings.Join(templateIDs, ","))
}

reqURL := fmt.Sprintf("/api/v2/insights/user-latency?%s", strings.Join(qp, "&"))
reqURL := fmt.Sprintf("/api/v2/insights/user-latency?%s", qp.Encode())
resp, err := c.Request(ctx, http.MethodGet, reqURL, nil)
if err != nil {
return UserLatencyInsightsResponse{}, xerrors.Errorf("make request: %w", err)
Expand Down Expand Up @@ -158,21 +159,21 @@ type TemplateInsightsRequest struct {
}

func (c *Client) TemplateInsights(ctx context.Context, req TemplateInsightsRequest) (TemplateInsightsResponse, error) {
var qp []string
qp = append(qp, fmt.Sprintf("start_time=%s", req.StartTime.Format(insightsTimeLayout)))
qp = append(qp, fmt.Sprintf("end_time=%s", req.EndTime.Format(insightsTimeLayout)))
qp := url.Values{}
qp.Add("start_time", req.StartTime.Format(insightsTimeLayout))
qp.Add("end_time", req.EndTime.Format(insightsTimeLayout))
if len(req.TemplateIDs) > 0 {
var templateIDs []string
for _, id := range req.TemplateIDs {
templateIDs = append(templateIDs, id.String())
}
qp = append(qp, fmt.Sprintf("template_ids=%s", strings.Join(templateIDs, ",")))
qp.Add("template_ids", strings.Join(templateIDs, ","))
}
if req.Interval != "" {
qp = append(qp, fmt.Sprintf("interval=%s", req.Interval))
qp.Add("interval", string(req.Interval))
}

reqURL := fmt.Sprintf("/api/v2/insights/templates?%s", strings.Join(qp, "&"))
reqURL := fmt.Sprintf("/api/v2/insights/templates?%s", qp.Encode())
resp, err := c.Request(ctx, http.MethodGet, reqURL, nil)
if err != nil {
return TemplateInsightsResponse{}, xerrors.Errorf("make request: %w", err)
Expand Down