Skip to content

Commit 7e9a5c9

Browse files
mafredrimafredri
committed
expand tests
1 parent a6e6b54 commit 7e9a5c9

File tree

2 files changed

+25
-23
lines changed

2 files changed

+25
-23
lines changed

‎coderd/prometheusmetrics/insights/metricscollector_test.go

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ func TestCollectInsights(t *testing.T) {
7878
{WorkspaceBuildID: build1.ID, Name: param2.Name, Value: "true"},
7979
{WorkspaceBuildID: build1.ID, Name: param3.Name, Value: "789"},
8080
})
81-
// _ = dbgen.WorkspaceBuildParameters(t, db, []database.WorkspaceBuildParameter{
82-
// {WorkspaceBuildID: build2.ID, Name: param1.Name, Value: "Baz"},
83-
// {WorkspaceBuildID: build2.ID, Name: param2.Name, Value: "false"},
84-
// {WorkspaceBuildID: build2.ID, Name: param3.Name, Value: "999"},
85-
// })
81+
_ = dbgen.WorkspaceBuildParameters(t, db, []database.WorkspaceBuildParameter{
82+
{WorkspaceBuildID: build2.ID, Name: param1.Name, Value: "Baz"},
83+
{WorkspaceBuildID: build2.ID, Name: param2.Name, Value: "true"},
84+
{WorkspaceBuildID: build2.ID, Name: param3.Name, Value: "999"},
85+
})
8686
)
8787

8888
// Start an agent so that we can generate stats.
@@ -96,13 +96,13 @@ func TestCollectInsights(t *testing.T) {
9696

9797
// Fake app stats
9898
_, err = agentClients[0].PostStats(context.Background(), &agentsdk.Stats{
99-
// ConnectionsByProto can't be nil, otherwise stats get rejected
100-
ConnectionsByProto: map[string]int64{"TCP": 1},
10199
// ConnectionCount must be positive as database query ignores stats with no active connections at the time frame
102-
ConnectionCount: 1,
103-
SessionCountSSH: 99,
104-
// SessionCountJetBrains, SessionCountVSCode must be positive, but the exact value is ignored.
100+
ConnectionsByProto: map[string]int64{"TCP": 1},
101+
ConnectionCount: 1,
102+
ConnectionMedianLatencyMS: 15,
103+
// Session counts must be positive, but the exact value is ignored.
105104
// Database query approximates it to 60s of usage.
105+
SessionCountSSH: 99,
106106
SessionCountJetBrains: 47,
107107
SessionCountVSCode: 34,
108108
})
@@ -137,17 +137,17 @@ func TestCollectInsights(t *testing.T) {
137137
SessionEndedAt: refTime.Add(2 * time.Minute).Add(-time.Second),
138138
Requests: 1,
139139
},
140-
// {
141-
// UserID: user.ID,
142-
// WorkspaceID: workspace2.ID,
143-
// AgentID: agent2.ID,
144-
// AccessMethod: "path",
145-
// SlugOrPort: app2.Slug,
146-
// SessionID: uuid.New(),
147-
// SessionStartedAt: time.Now().Add(-time.Minute),
148-
// SessionEndedAt: time.Now().Add(-time.Minute).Add(30 * time.Second),
149-
// Requests: 1,
150-
// },
140+
{
141+
UserID: user.ID,
142+
WorkspaceID: workspace2.ID,
143+
AgentID: agent2.ID,
144+
AccessMethod: "path",
145+
SlugOrPort: app2.Slug,
146+
SessionID: uuid.New(),
147+
SessionStartedAt: refTime.Add(2 * time.Minute),
148+
SessionEndedAt: refTime.Add(2 * time.Minute).Add(30 * time.Second),
149+
Requests: 1,
150+
},
151151
})
152152
require.NoError(t, err, "want no error inserting app stats")
153153

‎coderd/prometheusmetrics/insights/testdata/insights-metrics.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
"coderd_insights_applications_usage_seconds[application_name=Visual Studio Code,slug=,template_name=golden-template]": 60,
44
"coderd_insights_applications_usage_seconds[application_name=Web Terminal,slug=,template_name=golden-template]": 0,
55
"coderd_insights_applications_usage_seconds[application_name=SSH,slug=,template_name=golden-template]": 60,
6-
"coderd_insights_applications_usage_seconds[application_name=Golden Slug,slug=golden-slug,template_name=golden-template]": 120,
6+
"coderd_insights_applications_usage_seconds[application_name=Golden Slug,slug=golden-slug,template_name=golden-template]": 180,
77
"coderd_insights_parameters[parameter_name=first_parameter,parameter_type=string,parameter_value=Foobar,template_name=golden-template]": 1,
8-
"coderd_insights_parameters[parameter_name=second_parameter,parameter_type=bool,parameter_value=true,template_name=golden-template]": 1,
8+
"coderd_insights_parameters[parameter_name=first_parameter,parameter_type=string,parameter_value=Baz,template_name=golden-template]": 1,
9+
"coderd_insights_parameters[parameter_name=second_parameter,parameter_type=bool,parameter_value=true,template_name=golden-template]": 2,
910
"coderd_insights_parameters[parameter_name=third_parameter,parameter_type=number,parameter_value=789,template_name=golden-template]": 1,
11+
"coderd_insights_parameters[parameter_name=third_parameter,parameter_type=number,parameter_value=999,template_name=golden-template]": 1,
1012
"coderd_insights_templates_active_users[template_name=golden-template]": 1
1113
}

0 commit comments

Comments
 (0)